Split CSQ in 2 communication techniques.

* Divide CSQ in 2 communication techniques: one with 2 slots (as in
  BatchQueue aka c_cache) and one with 64 slots (as in the article)
* Rename fake communication technique in none communication technique
  and disable any activity (send no longer does anything)

communication_techniques/Makefile

@@ -20,8 +20,8 @@ LDFLAGS:=-L$(LIBDIR) -lpthread -ldl
 CC=gcc
 
 # Files
-BINNAMES:=c_cache_comm lamport_comm shared_mem_opt_comm fake_comm csq_comm fast_forward_comm mcringbuffer_comm #pipe_comm jikes_barrier_comm asm_cache_comm
-CALCLIBSNAMES:=calc_mat calc_useless_loop
+BINNAMES:=c_cache_comm lamport_comm shared_mem_opt_comm none_comm csq_2_comm
+BINNAMES+=csq_64_comm fast_forward_comm mcringbuffer_comm #pipe_comm jikes_barrier_comm asm_cache_comm
 BINS:=$(patsubst %,$(BINDIR)/%,$(BINNAMES))
 CALCLIBS:=$(patsubst %,$(LIBDIR)/$(CALCDIR)/lib%.so.1,$(CALCLIBSNAMES))
 MAIN_OBJS:=main.o

communication_techniques/include/csq_2_comm.h

@@ -0,0 +1,7 @@
+#ifndef _SPECIFIC_COMM_H_
+#define _SPECIFIC_COMM_H_ 1
+
+#define SLOTS 2 /* Value used in the article, section V.A */
+#include <csq_common_comm.h>
+
+#endif

communication_techniques/include/csq_64_comm.h

@@ -0,0 +1,7 @@
+#ifndef _SPECIFIC_COMM_H_
+#define _SPECIFIC_COMM_H_ 1
+
+#define SLOTS 64 /* Value used in the article, section V.A */
+#include <csq_common_comm.h>
+
+#endif

communication_techniques/include/csq_common_comm.h

@@ -1,10 +1,12 @@
-#ifndef _SPECIFIC_COMM_H_
-#define _SPECIFIC_COMM_H_ 1
+#ifndef _CSQ_COMMON_COMM_H_
+#define _CSQ_COMMON_COMM_H_ 1
 
 /* Non standard include */
 #include <commtech.h>
 
+#ifndef SLOTS
 #define SLOTS 64 /* Value used in the article, section V.A */
+#endif
 #define SUB_SLOTS (BUF_SIZE / sizeof(void *))
 
 struct lvl_2

communication_techniques/include/fake_comm.h

@@ -1,17 +0,0 @@
-#ifndef _SPECIFIC_COMM_H_
-#define _SPECIFIC_COMM_H_ 1
-
-#define FAKE_NURSERY_START 1
-
-extern __thread void ** volatile store_var;
-
-__BEGIN_DECLS
-
-static inline void send(void **addr)
-{
-	store_var = addr;
-}
-
-__END_DECLS
-
-#endif

communication_techniques/include/none_comm.h

@@ -0,0 +1,10 @@
+#ifndef _SPECIFIC_COMM_H_
+#define _SPECIFIC_COMM_H_ 1
+
+__BEGIN_DECLS
+
+static inline void send(void **addr) {}
+
+__END_DECLS
+
+#endif

communication_techniques/src/communication/csq_2.c

@@ -0,0 +1 @@
+csq.c

communication_techniques/src/communication/csq_64.c

@@ -0,0 +1 @@
+csq.c