X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=struct%2Flist.c;fp=struct%2Flist.c;h=29784a9dc61ba2f01286827e9b3e4cec2912b475;hp=c6c1780547f60825176bf0c9ec63cffcb1dded97;hb=b21e1c182a2e469240d2b1cbbda37f2dfeb880d9;hpb=a1fae129c758d7ea83dfdbb5f14ec1df12f0aa34

diff --git a/struct/list.c b/struct/list.c
index c6c1780..29784a9 100644
--- a/struct/list.c
+++ b/struct/list.c
@@ -18,11 +18,11 @@ typedef struct node {
     struct node *next;
 } node_t;
 
-typedef struct ll {
+struct ll {
     node_t *head;
-} list_t;
+};
 
-node_t *node_alloc (uint64_t key, uint64_t value) {
+static node_t *node_alloc (uint64_t key, uint64_t value) {
     node_t *item = (node_t *)nbd_malloc(sizeof(node_t));
     memset(item, 0, sizeof(node_t));
     item->key   = key;
@@ -191,93 +191,3 @@ void ll_print (list_t *ll) {
     }
     printf("\n");
 }
-
-#ifdef MAKE_list_test
-#include <errno.h>
-#include <pthread.h>
-#include <sys/time.h>
-
-#include "runtime.h"
-
-#define NUM_ITERATIONS 10000000
-
-static volatile int wait_;
-static long num_threads_;
-static list_t *ll_;
-
-void *worker (void *arg) {
-
-    // Wait for all the worker threads to be ready.
-    SYNC_ADD(&wait_, -1);
-    do {} while (wait_); 
-
-    for (int i = 0; i < NUM_ITERATIONS/num_threads_; ++i) {
-        unsigned r = nbd_rand();
-        int key = r & 0xF;
-        if (r & (1 << 8)) {
-            ll_add(ll_, key, 1);
-        } else {
-            ll_remove(ll_, key);
-        }
-
-        rcu_update();
-    }
-
-    return NULL;
-}
-
-int main (int argc, char **argv) {
-    nbd_init();
-    //lwt_set_trace_level("m0l0");
-
-    char* program_name = argv[0];
-    pthread_t thread[MAX_NUM_THREADS];
-
-    if (argc > 2) {
-        fprintf(stderr, "Usage: %s num_threads\n", program_name);
-        return -1;
-    }
-
-    num_threads_ = 2;
-    if (argc == 2)
-    {
-        errno = 0;
-        num_threads_ = strtol(argv[1], NULL, 10);
-        if (errno) {
-            fprintf(stderr, "%s: Invalid argument for number of threads\n", program_name);
-            return -1;
-        }
-        if (num_threads_ <= 0) {
-            fprintf(stderr, "%s: Number of threads must be at least 1\n", program_name);
-            return -1;
-        }
-        if (num_threads_ > MAX_NUM_THREADS) {
-            fprintf(stderr, "%s: Number of threads cannot be more than %d\n", program_name, MAX_NUM_THREADS);
-            return -1;
-        }
-    }
-
-    ll_ = ll_alloc();
-
-    struct timeval tv1, tv2;
-    gettimeofday(&tv1, NULL);
-
-    wait_ = num_threads_;
-
-    for (int i = 0; i < num_threads_; ++i) {
-        int rc = nbd_thread_create(thread + i, i, worker, (void*)(size_t)i);
-        if (rc != 0) { perror("pthread_create"); return rc; }
-    }
-
-    for (int i = 0; i < num_threads_; ++i) {
-        pthread_join(thread[i], NULL);
-    }
-
-    gettimeofday(&tv2, NULL);
-    int ms = (int)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000;
-    ll_print(ll_);
-    printf("Th:%ld Time:%dms\n", num_threads_, ms);
-
-    return 0;
-}
-#endif//list_test