mpmc-queue: add "-noinit" builds

Build matching test cases where there is no initial element in the
queue.

diff --git a/mpmc-queue/Makefile b/mpmc-queue/Makefile
index 520fcf9aa39ab299a6bcf004a47cb6ce0aa6e2f1..472b7946ce29ee64a2cd46aebf1765904eb62d16 100644 (file)
--- a/mpmc-queue/Makefile
+++ b/mpmc-queue/Makefile
@@ -2,12 +2,16 @@ include ../benchmarks.mk
 
 TESTNAME = mpmc-queue
 TESTS = mpmc-queue mpmc-1r2w mpmc-2r1w
 
 TESTNAME = mpmc-queue
 TESTS = mpmc-queue mpmc-1r2w mpmc-2r1w

+TESTS += mpmc-queue-noinit mpmc-1r2w-noinit mpmc-2r1w-noinit

 
 all: $(TESTS)
 
 mpmc-queue: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=2
 mpmc-1r2w: CPPFLAGS += -DCONFIG_MPMC_READERS=1 -DCONFIG_MPMC_WRITERS=2
 mpmc-2r1w: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=1
 
 all: $(TESTS)
 
 mpmc-queue: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=2
 mpmc-1r2w: CPPFLAGS += -DCONFIG_MPMC_READERS=1 -DCONFIG_MPMC_WRITERS=2
 mpmc-2r1w: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=1

+mpmc-queue-noinit: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=2 -DCONFIG_MPMC_NO_INITIAL_ELEMENT
+mpmc-1r2w-noinit: CPPFLAGS += -DCONFIG_MPMC_READERS=1 -DCONFIG_MPMC_WRITERS=2 -DCONFIG_MPMC_NO_INITIAL_ELEMENT
+mpmc-2r1w-noinit: CPPFLAGS += -DCONFIG_MPMC_READERS=2 -DCONFIG_MPMC_WRITERS=1 -DCONFIG_MPMC_NO_INITIAL_ELEMENT

 
 $(TESTS): $(TESTNAME).cc $(TESTNAME).h
        $(CXX) -o $@ $< $(CPPFLAGS) $(LDFLAGS)
 
 $(TESTS): $(TESTNAME).cc $(TESTNAME).h
        $(CXX) -o $@ $< $(CPPFLAGS) $(LDFLAGS)

diff --git a/mpmc-queue/mpmc-queue.cc b/mpmc-queue/mpmc-queue.cc
index 53bc6134ea028c4e9e6d3addcd1d8685922eb3d1..baca598bfa49b39e70134672f12e67b9135a95f5 100644 (file)
--- a/mpmc-queue/mpmc-queue.cc
+++ b/mpmc-queue/mpmc-queue.cc
@@ -91,9 +91,12 @@ int user_main(int argc, char **argv)
        //process_params(argc, argv);
        printf("%d reader(s), %d writer(s)\n", readers, writers);
 
        //process_params(argc, argv);
        printf("%d reader(s), %d writer(s)\n", readers, writers);
 

+#ifndef CONFIG_MPMC_NO_INITIAL_ELEMENT
+       printf("Adding initial element\n");

        int32_t *bin = queue.write_prepare();
        store_32(bin, 17);
        queue.write_publish();
        int32_t *bin = queue.write_prepare();
        store_32(bin, 17);
        queue.write_publish();

+#endif

 
        printf("Start threads\n");
 
 
        printf("Start threads\n");