lib: Shared Memory

Updated tests. Added code to drop a corner case (packet where the tail
PCI would cross the edge of the ring buffer) because solving this very
rare case is not worth the performance hit on the ringbuffer the extra
code would incur. This means the ringbuffer might drop a very small
percentage of packets.

4 files changed, 50 insertions, 177 deletions

diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index d4bcb4e4..80834df8 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -1,27 +1,15 @@
 get_filename_component(tmp ".." ABSOLUTE)
 get_filename_component(src_folder "${tmp}" NAME)
 
-find_library(LIBRT_LIBRARIES rt)
-if(NOT LIBRT_LIBRARIES)
-       message(FATAL_ERROR "librt not found")
-endif()
-
-find_library(LIBPTHREAD_LIBRARIES pthread)
-if(NOT LIBPTHREAD_LIBRARIES)
-       message(FATAL_ERROR "libpthread not found")
-endif()
-
 create_test_sourcelist(${src_folder}_tests test_suite.c
                        # Add new tests here
                        bitmap_test.c
                        du_buff_test.c
-                       shm_du_map_test_create.c
-                       shm_du_map_test_du_buff_create.c
-                       shm_du_map_test_prod_cons.c
+                       shm_du_map_test.c
 )
 
 add_executable(${src_folder}_test EXCLUDE_FROM_ALL ${${src_folder}_tests})
-target_link_libraries(${src_folder}_test ouroboros rt pthread)
+target_link_libraries(${src_folder}_test ouroboros)
 
 add_dependencies(check ${src_folder}_test)
 
diff --git a/src/lib/tests/shm_du_map_test_prod_cons.c b/src/lib/tests/shm_du_map_test.c
index ff9dfb0a..d9b44732 100644
--- a/src/lib/tests/shm_du_map_test_prod_cons.c
+++ b/src/lib/tests/shm_du_map_test.c
@@ -24,10 +24,11 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/mman.h>
 #include <pthread.h>
-#include "shm_du_map.c"
 
-#define TEST_BUFF_SIZE (SHM_DU_BLOCK_DATA_SIZE)
+#define SIZE_OF_DU_BUFF 24
+#define TEST_BUFF_SIZE (SHM_DU_BUFF_BLOCK_SIZE - SIZE_OF_DU_BUFF)
 
 #define MAX(a,b) (a > b ? a : b)
 #define MIN(a,b) (a < b ? a : b)
@@ -48,8 +49,10 @@ void * produce()
         double              elapsed;
 
         dum = shm_du_map_open();
-        if (dum == NULL)
+        if (dum == NULL) {
+                LOG_ERR("Could not open shm.");
                 return (void *)-1;
+        }
 
         srand(time(NULL));
 
@@ -58,7 +61,7 @@ void * produce()
                 test_values[i] = 170;
 
         clock_gettime(CLOCK_MONOTONIC, &starttime);
-        for (i = 0; i < SHM_BLOCKS_IN_MAP; i++) {
+        for (i = 1; i < SHM_BLOCKS_IN_MAP; i++) {
                 struct shm_du_buff * sdb;
                 size_t               len;
 
@@ -93,7 +96,6 @@ void * produce()
                  bytes_written * 8 / (elapsed * 1000000000));
 
         free(test_values);
-        shm_du_map_close(dum);
 
         sync = -1;
 
@@ -107,39 +109,66 @@ void * consume()
         struct timespec     ts;
 
         ts.tv_sec = 0;
-        ts.tv_nsec = 1000;
+        ts.tv_nsec = 1000000;
 
         dum = shm_du_map_open();
 
-        if (dum == NULL)
-                pthread_exit((void *) -1);
+        if (dum == NULL) {
+                LOG_ERR("Could not open shm.");
+                return (void *)-1;
+        }
 
         while (!sync) {
                 while (!shm_release_du_buff(dum));
                 nanosleep(&ts, NULL);
         }
 
-        shm_du_map_close(dum);
-
         return 0;
 }
 
-int shm_du_map_test_prod_cons(int argc, char ** argv)
+int shm_du_map_test(int argc, char ** argv)
 {
         struct shm_du_map * dum;
+        int                 res1;
+        pthread_t           producer;
+        pthread_t           consumer;
 
-        int res1;
+        /* test 1 */
 
-        pthread_t producer;
-        pthread_t consumer;
-        shm_unlink(SHM_DU_MAP_FILENAME);
+        LOG_INFO("starting create/close test.");
 
         dum = shm_du_map_create();
 
-        if (dum == NULL)
+        if (dum == NULL) {
+                LOG_ERR("Could not open shm (dum).");
                 return -1;
+        }
 
-        sync = 0;
+        shm_du_map_close(dum);
+
+        LOG_INFO("done.");
+
+        /* test 2 */
+
+        LOG_INFO("starting sequential test.");
+
+        dum = shm_du_map_create();
+
+        res1 = (int) pthread_create(&producer, NULL, produce, NULL);
+        pthread_join(producer, NULL);
+
+        pthread_create(&consumer, NULL, consume, NULL);
+        pthread_join(consumer, NULL);
+
+        shm_du_map_close(dum);
+
+        LOG_INFO("done.");
+
+        /* test 3 */
+
+        LOG_INFO("starting concurrency test.");
+
+        dum = shm_du_map_create();
 
         res1 = (int) pthread_create(&producer, NULL, produce, NULL);
         pthread_create(&consumer, NULL, consume, NULL);
@@ -149,5 +178,7 @@ int shm_du_map_test_prod_cons(int argc, char ** argv)
 
         shm_du_map_close(dum);
 
+        LOG_INFO("done.");
+
         return res1;
 }
diff --git a/src/lib/tests/shm_du_map_test_create.c b/src/lib/tests/shm_du_map_test_create.c
deleted file mode 100644
index dcf3bd45..00000000
--- a/src/lib/tests/shm_du_map_test_create.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016
- *
- * Test of the Shared Memory Map
- *
- *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <ouroboros/shm_du_map.h>
-#include <ouroboros/common.h>
-#include <sys/mman.h>
-
-int shm_du_map_test_create(int argc, char ** argv)
-{
-        struct shm_du_map * dum;
-        struct shm_du_map * dum2;
-
-        shm_unlink(SHM_DU_MAP_FILENAME);
-
-        dum = shm_du_map_create();
-
-        if (dum == NULL)
-                return -1;
-
-        dum2 = shm_du_map_open();
-
-        if (dum2 == NULL) {
-                shm_du_map_close(dum);
-                return 1;
-        }
-
-        shm_du_map_close(dum2);
-
-        shm_du_map_close(dum);
-
-        return 0; /* tests succeeded */
-}
diff --git a/src/lib/tests/shm_du_map_test_du_buff_create.c b/src/lib/tests/shm_du_map_test_du_buff_create.c
deleted file mode 100644
index 6787a1bc..00000000
--- a/src/lib/tests/shm_du_map_test_du_buff_create.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016
- *
- * Test of the Shared Memory Map
- *
- *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <ouroboros/shm_du_map.h>
-#include <sys/mman.h>
-
-
-#define SHM_DU_BLOCK_DATA_SIZE (SHM_DU_BUFF_BLOCK_SIZE - 3 * sizeof(long))
-#define TEST_BUFF_SIZE (16 * SHM_DU_BLOCK_DATA_SIZE)
-
-#define MAX(a,b) (a > b ? a : b)
-#define MIN(a,b) (a < b ? a : b)
-
-int shm_du_map_test_du_buff_create(int argc, char ** argv)
-{
-        struct shm_du_map * dum;
-        struct shm_du_map * dum2;
-
-        int i, j, k;
-        int i_inc, j_inc, k_inc;
-
-        uint8_t bits[TEST_BUFF_SIZE];
-
-        shm_unlink(SHM_DU_MAP_FILENAME);
-
-        dum = shm_du_map_create();
-
-        if (dum == NULL)
-                return -1;
-
-        for (i = 0; i < TEST_BUFF_SIZE; i++)
-                bits[i] = 0;
-
-        i_inc = MAX(1, SHM_DU_BLOCK_DATA_SIZE / 4);
-        j_inc = MAX(1, SHM_DU_BLOCK_DATA_SIZE / 8);
-        k_inc = MAX(1, SHM_DU_BLOCK_DATA_SIZE / 16);
-
-        for (i = SHM_DU_BLOCK_DATA_SIZE / 4;
-             i <= TEST_BUFF_SIZE;
-             i += i_inc) {
-                for (j = 0; j < i; j += j_inc) {
-                        for (k = 0; k < i - j; k += k_inc) {
-                                if (k > SHM_DU_BLOCK_DATA_SIZE)
-                                        continue;
-
-                                if (i - (j + k) > SHM_DU_BLOCK_DATA_SIZE)
-                                        continue;
-
-                                struct shm_du_buff * dub = shm_create_du_buff(
-                                        dum,
-                                        i,
-                                        k,
-                                        bits,
-                                        j);
-                                if (dub == NULL) {
-                                        shm_du_map_close(dum);
-                                        return -1;
-                                }
-                                shm_release_du_buff(dum);
-                        }
-                }
-        }
-
-        dum2 = shm_du_map_open();
-
-        if (dum2 == NULL) {
-                shm_du_map_close(dum);
-                return 1;
-        }
-
-        shm_du_map_close(dum2);
-
-        shm_du_map_close(dum);
-
-        return 0; /* tests succeeded */
-}