From 4914b0dcdd8f58e441bb6a7f5117b232ae66296d Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <robotux@celest.fr>
Date: Tue, 27 Mar 2012 00:31:16 +0200
Subject: [PATCH] Add CSQ (2/1) and CSQ (2/32), Del CSQ (2/2)

---
 communication_techniques/Makefile                         | 6 +++---
 .../include/{csq_2_2_comm.h => csq_2_1_comm.h}            | 2 +-
 communication_techniques/include/csq_2_32_comm.h          | 8 ++++++++
 .../src/communication/{csq_2_2.c => csq_2_1.c}            | 0
 communication_techniques/src/communication/csq_2_32.c     | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)
 rename communication_techniques/include/{csq_2_2_comm.h => csq_2_1_comm.h} (79%)
 create mode 100644 communication_techniques/include/csq_2_32_comm.h
 rename communication_techniques/src/communication/{csq_2_2.c => csq_2_1.c} (100%)
 create mode 120000 communication_techniques/src/communication/csq_2_32.c

diff --git a/communication_techniques/Makefile b/communication_techniques/Makefile
index 11ac462..e6d1e9b 100644
--- a/communication_techniques/Makefile
+++ b/communication_techniques/Makefile
@@ -24,9 +24,9 @@ BINNAMES:=batch_queue_2_comm batch_queue_4_comm batch_queue_8_comm
 BINNAMES+=batch_queue_16_comm batch_queue_32_comm batch_queue_64_comm
 BINNAMES+=batch_queue_128_comm batch_queue_256_comm batch_queue_512_comm
 BINNAMES+=batch_queue_1024_comm batch_queue_2048_comm batch_queue_4096_comm
-BINNAMES+=lamport_comm shared_mem_opt_comm none_comm csq_comm csq_2_2_comm
-BINNAMES+=csq_2_64_comm csq_64_1_comm fast_forward_comm mcringbuffer_comm
-BINNAMES+=pipe_comm gomp_stream_comm
+BINNAMES+=lamport_comm shared_mem_opt_comm none_comm csq_comm csq_2_1_comm
+BINNAMES+=csq_2_32_comm csq_2_64_comm csq_64_1_comm fast_forward_comm
+BINNAMES+=mcringbuffer_comm pipe_comm gomp_stream_comm
 #BINNAMES+=jikes_barrier_comm
 CALCLIBSNAMES:=calc_mat calc_line calc_useless_loop
 BINS:=$(patsubst %,$(BINDIR)/%,$(BINNAMES))
diff --git a/communication_techniques/include/csq_2_2_comm.h b/communication_techniques/include/csq_2_1_comm.h
similarity index 79%
rename from communication_techniques/include/csq_2_2_comm.h
rename to communication_techniques/include/csq_2_1_comm.h
index 0c12db0..973a2c0 100644
--- a/communication_techniques/include/csq_2_2_comm.h
+++ b/communication_techniques/include/csq_2_1_comm.h
@@ -2,7 +2,7 @@
 #define _SPECIFIC_COMM_H_ 1
 
 #define SLOTS 2 /* Value used in the article, section V.A */
-#define BUF_SIZE (2 * CACHE_LINE_SIZE)
+#define BUF_SIZE (1 * CACHE_LINE_SIZE)
 #include <csq_common.h>
 
 #endif
diff --git a/communication_techniques/include/csq_2_32_comm.h b/communication_techniques/include/csq_2_32_comm.h
new file mode 100644
index 0000000..63e09bb
--- /dev/null
+++ b/communication_techniques/include/csq_2_32_comm.h
@@ -0,0 +1,8 @@
+#ifndef _SPECIFIC_COMM_H_
+#define _SPECIFIC_COMM_H_ 1
+
+#define SLOTS 2 /* Value used in the article, section V.A */
+#define BUF_SIZE (32 * CACHE_LINE_SIZE)
+#include <csq_common.h>
+
+#endif
diff --git a/communication_techniques/src/communication/csq_2_2.c b/communication_techniques/src/communication/csq_2_1.c
similarity index 100%
rename from communication_techniques/src/communication/csq_2_2.c
rename to communication_techniques/src/communication/csq_2_1.c
diff --git a/communication_techniques/src/communication/csq_2_32.c b/communication_techniques/src/communication/csq_2_32.c
new file mode 120000
index 0000000..4b4d3d9
--- /dev/null
+++ b/communication_techniques/src/communication/csq_2_32.c
@@ -0,0 +1 @@
+csq.c
\ No newline at end of file