summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ouroboros/shm_du_map.h11
-rw-r--r--src/lib/CMakeLists.txt12
-rw-r--r--src/lib/shm_du_map.c202
-rw-r--r--src/lib/tests/CMakeLists.txt16
-rw-r--r--src/lib/tests/shm_du_map_test.c (renamed from src/lib/tests/shm_du_map_test_prod_cons.c)65
-rw-r--r--src/lib/tests/shm_du_map_test_create.c51
-rw-r--r--src/lib/tests/shm_du_map_test_du_buff_create.c95
7 files changed, 134 insertions, 318 deletions
diff --git a/include/ouroboros/shm_du_map.h b/include/ouroboros/shm_du_map.h
index b3533fa3..05c49c2d 100644
--- a/include/ouroboros/shm_du_map.h
+++ b/include/ouroboros/shm_du_map.h
@@ -38,15 +38,14 @@
#define SHM_DU_MAP_FILENAME "ouroboros_du_map"
#endif
-#ifndef SHM_DU_MAP_SIZE
-#define SHM_DU_MAP_SIZE 10
+#ifndef SHM_BLOCKS_IN_MAP
+#define SHM_BLOCKS_IN_MAP (1 << 12)
#endif
#include "common.h"
#include "logs.h"
struct shm_du_buff;
-
struct shm_du_map;
struct shm_du_map * shm_du_map_create();
@@ -60,11 +59,9 @@ struct shm_du_buff * shm_create_du_buff(struct shm_du_map * dum,
size_t len);
int shm_release_du_buff(struct shm_du_map * dum);
-uint8_t * shm_du_buff_head_alloc(struct shm_du_map * dum,
- struct shm_du_buff * sdb,
+uint8_t * shm_du_buff_head_alloc(struct shm_du_buff * sdb,
size_t size);
-uint8_t * shm_du_buff_tail_alloc(struct shm_du_map * dum,
- struct shm_du_buff * sdb,
+uint8_t * shm_du_buff_tail_alloc(struct shm_du_buff * sdb,
size_t size);
int shm_du_buff_head_release(struct shm_du_buff * sdb,
size_t size);
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index e81f3475..7ce98bf2 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -4,6 +4,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)
include_directories(${CMAKE_BINARY_DIR}/include)
+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()
+
set(SOURCE_FILES
# Add source files here
bitmap.c
@@ -15,11 +25,13 @@ set(SOURCE_FILES
irm.c
list.c
rina_name.c
+ shm_du_map.c
sockets.c
utils.c
)
add_library(ouroboros SHARED ${SOURCE_FILES})
+target_link_libraries(ouroboros rt pthread)
include(MacroAddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/src/lib/shm_du_map.c b/src/lib/shm_du_map.c
index d071b0c3..dc73077f 100644
--- a/src/lib/shm_du_map.c
+++ b/src/lib/shm_du_map.c
@@ -21,46 +21,33 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef SHM_DU_MAP_C
-#define SHM_DU_MAP_C
-
#include <ouroboros/shm_du_map.h>
-
#include <pthread.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <malloc.h>
#include <string.h>
-
-#define SHM_DU_BLOCK_DATA_SIZE (SHM_DU_BUFF_BLOCK_SIZE - \
- sizeof(struct shm_block))
-#define SHM_BLOCKS_IN_MAP (1 << SHM_DU_MAP_SIZE)
-#define SHM_BLOCKS_SIZE (SHM_DU_BUFF_BLOCK_SIZE * SHM_BLOCKS_IN_MAP)
-#define SHM_BUFFS_SIZE (SHM_BLOCKS_IN_MAP * sizeof (struct shm_du_buff))
-#define SHM_FILE_SIZE (SHM_BLOCKS_IN_MAP * (SHM_DU_BUFF_BLOCK_SIZE \
- + sizeof(struct shm_du_buff) \
- + sizeof(uint8_t)) \
- + 2 * sizeof (size_t) \
+#define SHM_BLOCKS_SIZE (SHM_BLOCKS_IN_MAP * SHM_DU_BUFF_BLOCK_SIZE)
+#define SHM_FILE_SIZE (SHM_BLOCKS_SIZE + 2 * sizeof (size_t) \
+ sizeof(pthread_mutex_t))
-#define idx_to_block_ptr(dum, i) ((struct shm_block *) \
- (dum->shm_base + i * SHM_DU_BUFF_BLOCK_SIZE))
-#define idx_to_du_buff_ptr(dum, i) (dum->ptr_du_buff + i)
-#define du_buff_ptr_to_idx(dum, sdb) ((sdb - dum->ptr_du_buff) / sizeof *sdb)
-#define block_ptr_to_idx(dum, sdb) (((uint8_t *)sdb - dum->shm_base) \
- / SHM_DU_BUFF_BLOCK_SIZE)
+#define get_head_ptr(dum) \
+((struct shm_du_buff *)(dum->shm_base + (*dum->ptr_head * \
+ SHM_DU_BUFF_BLOCK_SIZE)))
-#define shm_map_used(dum) ((*(dum->ptr_head) + SHM_BLOCKS_IN_MAP - \
- *(dum->ptr_tail)) & (SHM_BLOCKS_IN_MAP - 1))
+#define get_tail_ptr(dum) \
+((struct shm_du_buff *)(dum->shm_base + (*dum->ptr_tail * \
+ SHM_DU_BUFF_BLOCK_SIZE)))
-#define shm_map_free(dum, i)(shm_map_used(dum) + i + 1 < SHM_BLOCKS_IN_MAP)
+#define block_ptr_to_idx(dum, sdb) \
+ (((uint8_t *)sdb - dum->shm_base) / SHM_DU_BUFF_BLOCK_SIZE)
-struct shm_block {
- size_t size;
- long next;
- long prev;
-};
+#define shm_map_used(dum)((*dum->ptr_head + SHM_BLOCKS_IN_MAP - *dum->ptr_tail)\
+ & (SHM_BLOCKS_IN_MAP - 1))
+#define shm_map_free(dum, i)(shm_map_used(dum) + i < SHM_BLOCKS_IN_MAP)
+
+#define MIN(a,b)(a < b ? a : b)
struct shm_du_buff {
size_t size;
@@ -70,7 +57,6 @@ struct shm_du_buff {
struct shm_du_map {
uint8_t * shm_base; /* start of blocks */
- struct shm_du_buff * ptr_du_buff; /* start of du_buff structs */
size_t * ptr_head; /* start of ringbuffer head */
size_t * ptr_tail; /* start of ringbuffer tail */
pthread_mutex_t * shm_mutex; /* lock all free space in shm */
@@ -86,25 +72,25 @@ struct shm_du_map * shm_du_map_create()
dum = malloc(sizeof *dum);
if (dum == NULL) {
- LOG_ERR("Could not allocate struct.");
+ LOG_DBGF("Could not allocate struct.");
return NULL;
}
shm_fd = shm_open(SHM_DU_MAP_FILENAME, O_CREAT | O_EXCL | O_RDWR, 0666);
if (shm_fd == -1) {
- LOG_ERR("Failed creating shared memory map.");
+ LOG_DBGF("Failed creating shared memory map.");
free(dum);
return NULL;
}
- if (lseek (shm_fd,SHM_FILE_SIZE - 1, SEEK_SET) < 0) {
- LOG_ERR("Failed to extend shared memory map.");
+ if (lseek(shm_fd, SHM_FILE_SIZE - 1, SEEK_SET) < 0) {
+ LOG_DBGF("Failed to extend shared memory map.");
free(dum);
return NULL;
}
- if (write (shm_fd, "", 1) != 1) {
- LOG_ERR("Failed to finalise extension of shared memory map.");
+ if (write(shm_fd, "", 1) != 1) {
+ LOG_DBGF("Failed to finalise extension of shared memory map.");
free(dum);
return NULL;
}
@@ -117,22 +103,18 @@ struct shm_du_map * shm_du_map_create()
0);
if (shm_base == MAP_FAILED) {
- LOG_ERR("Failed to map shared memory.");
+ LOG_DBGF("Failed to map shared memory.");
if (shm_unlink(SHM_DU_MAP_FILENAME) == -1)
- LOG_ERR("Failed to remove invalid shm.");
+ LOG_DBGF("Failed to remove invalid shm.");
free(dum);
return NULL;
}
-#ifdef CONFIG_OUROBOROS_DEBUG
- memset(shm_base, 0, SHM_FILE_SIZE);
-#endif
+
dum->shm_base = shm_base;
- dum->ptr_du_buff = (struct shm_du_buff *)
- ((uint8_t *) dum->shm_base + SHM_BLOCKS_SIZE);
dum->ptr_head = (size_t *)
- ((uint8_t *) dum->ptr_du_buff + SHM_BUFFS_SIZE);
+ ((uint8_t *) dum->shm_base + SHM_BLOCKS_SIZE);
dum->ptr_tail = (size_t *)
((uint8_t *) dum->ptr_head + sizeof(size_t));
dum->shm_mutex = (pthread_mutex_t *)
@@ -158,7 +140,7 @@ struct shm_du_map * shm_du_map_open()
shm_fd = shm_open(SHM_DU_MAP_FILENAME, O_RDWR, 0666);
if (shm_fd == -1) {
- LOG_ERR("Failed opening shared memory for du_buff.");
+ LOG_DBGF("Failed opening shared memory.");
return NULL;
}
@@ -169,30 +151,32 @@ struct shm_du_map * shm_du_map_open()
shm_fd,
0);
if (shm_base == MAP_FAILED) {
- LOG_ERR("Failed to map shared memory.");
+ LOG_DBGF("Failed to map shared memory.");
+ if (close(shm_fd) == -1)
+ LOG_DBGF("Failed to close invalid shm.");
if (shm_unlink(SHM_DU_MAP_FILENAME) == -1)
- LOG_ERR("Failed to unlink invalid shm.");
+ LOG_DBGF("Failed to unlink invalid shm.");
return NULL;
}
dum = malloc(sizeof *dum);
if (dum == NULL) {
- LOG_ERR("Could not allocate struct.");
+ LOG_DBGF("Could not allocate struct.");
return NULL;
}
dum->shm_base = shm_base;
- dum->ptr_du_buff = (struct shm_du_buff *)
- ((uint8_t *) dum->shm_base + SHM_BLOCKS_SIZE);
dum->ptr_head = (size_t *)
- ((uint8_t *) dum->ptr_du_buff + SHM_BUFFS_SIZE);
+ ((uint8_t *) dum->shm_base + SHM_BLOCKS_SIZE);
dum->ptr_tail = (size_t *)
((uint8_t *) dum->ptr_head + sizeof(size_t));
dum->shm_mutex = (pthread_mutex_t *)
((uint8_t *) dum->ptr_tail + sizeof(size_t));
+ dum->fd = shm_fd;
+
return dum;
}
@@ -219,12 +203,11 @@ struct shm_du_buff * shm_create_du_buff(struct shm_du_map * dum,
size_t len)
{
struct shm_du_buff * sdb;
- long prev_index = -1;
- size_t remaining = size;
- size_t ts = size - (headspace + len);
- uint8_t * read_pos = data;
- size_t blocks = 0;
- int sz = size;
+ long blocks = 0;
+ int sz = size + sizeof *sdb;
+ int sz2 = headspace + len + sizeof *sdb;
+ uint8_t * write_pos;
+ size_t copy_len;
if (dum == NULL || data == NULL) {
LOG_DBGF("Bogus input, bugging out.");
@@ -241,16 +224,17 @@ struct shm_du_buff * shm_create_du_buff(struct shm_du_map * dum,
return NULL;
}
- if (headspace > SHM_DU_BLOCK_DATA_SIZE || ts > SHM_DU_BLOCK_DATA_SIZE) {
- LOG_ERR("Illegal du_buff: Cannot fit PCI in DU_BUFF_BLOCK.");
- return NULL;
- }
-
pthread_mutex_lock(dum->shm_mutex);
while (sz > 0) {
- sz -= SHM_DU_BLOCK_DATA_SIZE;
- blocks++;
+ sz -= SHM_DU_BUFF_BLOCK_SIZE;
+ sz2 -= SHM_DU_BUFF_BLOCK_SIZE;
+ if (sz2 < 0 && sz > 0) {
+ pthread_mutex_unlock(dum->shm_mutex);
+ LOG_DBG("Can't handle this packet now");
+ return NULL;
+ }
+ ++blocks;
}
if (!shm_map_free(dum, blocks)) {
@@ -259,62 +243,23 @@ struct shm_du_buff * shm_create_du_buff(struct shm_du_map * dum,
return NULL;
}
- sdb = dum->ptr_du_buff + *dum->ptr_head;
+ sdb = get_head_ptr(dum);
sdb->size = size;
sdb->du_head = headspace;
sdb->du_tail = sdb->du_head + len;
- while (remaining > 0) {
- struct shm_block * shm_buf;
- long bytes_to_copy = len;
- uint8_t * write_pos;
-
- shm_buf = idx_to_block_ptr(dum, *(dum->ptr_head));
-
- write_pos = (uint8_t *) shm_buf + sizeof *shm_buf;
-
- shm_buf->size = remaining < SHM_DU_BLOCK_DATA_SIZE ?
- remaining : SHM_DU_BLOCK_DATA_SIZE;
-
- bytes_to_copy = shm_buf->size;
-
- if (remaining <= SHM_DU_BLOCK_DATA_SIZE)
- bytes_to_copy -= ts;
- else if (remaining - ts <= SHM_DU_BLOCK_DATA_SIZE)
- shm_buf->size = remaining - ts;
-
- remaining -= shm_buf->size;
-
- if (prev_index == -1) {
-#ifdef CONFIG_OUROBOROS_DEBUG
- memset(write_pos, 0, sdb->du_head);
-#endif
- write_pos += sdb->du_head;
- bytes_to_copy -= sdb->du_head;
- }
-
- if (prev_index != -1)
- idx_to_block_ptr(dum, prev_index)->next =
- *(dum->ptr_head);
-
- if (len > 0) {
- memcpy(write_pos, read_pos, bytes_to_copy);
- }
- read_pos += bytes_to_copy;
-#ifdef CONFIG_OUROBOROS_DEBUG
- if (remaining == 0) {
- write_pos + = bytes_to_copy;
- memset(write_pos, 0, ts);
- }
-#endif
- shm_buf->next = -1;
- shm_buf->prev = prev_index;
-
- prev_index = *dum->ptr_head;
+ copy_len = MIN(len, SHM_DU_BUFF_BLOCK_SIZE - headspace - sizeof *sdb);
+ write_pos = ((uint8_t *) sdb) + sizeof *sdb + headspace;
+ while (blocks > 0) {
+ memcpy(write_pos, data, copy_len);
*(dum->ptr_head) = (*dum->ptr_head + 1)
& (SHM_BLOCKS_IN_MAP - 1);
+ len -= copy_len;
+ copy_len = MIN(len, SHM_DU_BUFF_BLOCK_SIZE);
+ write_pos = (uint8_t *) get_head_ptr(dum);
+ --blocks;
}
pthread_mutex_unlock(dum->shm_mutex);
@@ -324,7 +269,8 @@ struct shm_du_buff * shm_create_du_buff(struct shm_du_map * dum,
int shm_release_du_buff(struct shm_du_map * dum)
{
- int released = 0;
+ long sz;
+ long blocks = 0;
pthread_mutex_lock(dum->shm_mutex);
@@ -334,25 +280,22 @@ int shm_release_du_buff(struct shm_du_map * dum)
return -1;
}
- while (idx_to_block_ptr(dum, *dum->ptr_tail)->next != -1) {
- *(dum->ptr_tail) = (*dum->ptr_tail + 1)
- & (SHM_BLOCKS_IN_MAP -1);
- released++;
- }
+ sz = get_tail_ptr(dum)->size;
- *(dum->ptr_tail) = (*dum->ptr_tail + 1) & (SHM_BLOCKS_IN_MAP - 1);
+ while (sz + (long) sizeof (struct shm_du_buff) > 0) {
+ sz -= SHM_DU_BUFF_BLOCK_SIZE;
+ ++blocks;
+ }
+ *(dum->ptr_tail) = (*dum->ptr_tail + blocks) & (SHM_BLOCKS_IN_MAP - 1);
pthread_mutex_unlock(dum->shm_mutex);
return 0;
}
-uint8_t * shm_du_buff_head_alloc(struct shm_du_map * dum,
- struct shm_du_buff * sdb,
+uint8_t * shm_du_buff_head_alloc(struct shm_du_buff * sdb,
size_t size)
{
- uint8_t * ret;
-
if (sdb == NULL) {
LOG_DBGF("Bogus input, bugging out.");
return NULL;
@@ -365,17 +308,12 @@ uint8_t * shm_du_buff_head_alloc(struct shm_du_map * dum,
sdb->du_head -= size;
- ret = (uint8_t *) idx_to_block_ptr(dum, du_buff_ptr_to_idx(dum,sdb));
-
- return ret + sizeof(struct shm_block) + sdb->du_head;
+ return (uint8_t *) sdb + sizeof *sdb + sdb->du_head;
}
-uint8_t * shm_du_buff_tail_alloc(struct shm_du_map * dum,
- struct shm_du_buff * sdb,
+uint8_t * shm_du_buff_tail_alloc(struct shm_du_buff * sdb,
size_t size)
{
- uint8_t * ret;
-
if (sdb == NULL) {
LOG_DBGF("Bogus input, bugging out.");
return NULL;
@@ -388,9 +326,7 @@ uint8_t * shm_du_buff_tail_alloc(struct shm_du_map * dum,
sdb->du_tail += size;
- ret = (uint8_t *) idx_to_block_ptr(dum, du_buff_ptr_to_idx(dum,sdb));
-
- return ret + sizeof(struct shm_block) + sdb->du_tail;
+ return (uint8_t *) sdb + sizeof *sdb + sdb->du_tail;
}
int shm_du_buff_head_release(struct shm_du_buff * sdb,
@@ -428,5 +364,3 @@ int shm_du_buff_tail_release(struct shm_du_buff * sdb,
return sdb->du_tail;
}
-
-#endif
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 <[email protected]>
- *
- * 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 <[email protected]>
- *
- * 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 */
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 22:26:48 +0000