X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=struct%2Flist.c;h=29784a9dc61ba2f01286827e9b3e4cec2912b475;hb=d791fc64b23a9c0a3ed90aa60571344d7735aee9;hp=124043d2b4363222c711c644a15a599869b86c51;hpb=052506ff082f134f00834f666653819e18d9bddf;p=nbds diff --git a/struct/list.c b/struct/list.c index 124043d..29784a9 100644 --- a/struct/list.c +++ b/struct/list.c @@ -18,11 +18,11 @@ typedef struct node { struct node *next; } node_t; -typedef struct list { +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; @@ -31,16 +31,16 @@ node_t *node_alloc (uint64_t key, uint64_t value) { } list_t *ll_alloc (void) { - list_t *list = (list_t *)nbd_malloc(sizeof(list_t)); - list->head = node_alloc((uint64_t)-1, 0); - list->head->next = NULL; - return list; + list_t *ll = (list_t *)nbd_malloc(sizeof(list_t)); + ll->head = node_alloc((uint64_t)-1, 0); + ll->head->next = NULL; + return ll; } -static node_t *find_pred (node_t **pred_ptr, list_t *list, uint64_t key, int help_remove) { - node_t *pred = list->head; +static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_remove) { + node_t *pred = ll->head; node_t *item = pred->next; - TRACE("l3", "find_pred: searching for key %p in list (head is %p)", key, pred); + TRACE("l3", "find_pred: searching for key %p in ll (head is %p)", key, pred); while (item != NULL) { node_t *next = item->next; @@ -74,7 +74,7 @@ static node_t *find_pred (node_t **pred_ptr, list_t *list, uint64_t key, int hel } else { TRACE("l3", "find_pred: lost race to unlink from pred %p; its link changed to %p", pred, other); if (IS_TAGGED(other)) - return find_pred(pred_ptr, list, key, help_remove); // retry + return find_pred(pred_ptr, ll, key, help_remove); // retry item = other; if (EXPECT_FALSE(item == NULL)) break; @@ -99,7 +99,7 @@ static node_t *find_pred (node_t **pred_ptr, list_t *list, uint64_t key, int hel } - // is not in the list. + // is not in . if (pred_ptr != NULL) { *pred_ptr = pred; } @@ -107,23 +107,23 @@ static node_t *find_pred (node_t **pred_ptr, list_t *list, uint64_t key, int hel } // Fast find. Do not help unlink partially removed nodes and do not return the found item's predecessor. -uint64_t ll_lookup (list_t *list, uint64_t key) { - TRACE("l3", "ll_lookup: searching for key %p in list %p", key, list); - node_t *item = find_pred(NULL, list, key, FALSE); +uint64_t ll_lookup (list_t *ll, uint64_t key) { + TRACE("l3", "ll_lookup: searching for key %p in ll %p", key, ll); + node_t *item = find_pred(NULL, ll, key, FALSE); // If we found an matching the return its value. return (item && item->key == key) ? item->value : DOES_NOT_EXIST; } -// Insert the , if it doesn't already exist in the -uint64_t ll_add (list_t *list, uint64_t key, uint64_t value) { +// Insert the , if it doesn't already exist in +uint64_t ll_add (list_t *ll, uint64_t key, uint64_t value) { TRACE("l3", "ll_add: inserting key %p value %p", key, value); node_t *pred; node_t *item = NULL; do { - node_t *next = find_pred(&pred, list, key, TRUE); + node_t *next = find_pred(&pred, ll, key, TRUE); - // If a node matching already exists in the list, return its value. + // If a node matching already exists in , return its value. if (next != NULL && next->key == key) { TRACE("l3", "ll_add: there is already an item %p (value %p) with the same key", next, next->value); if (EXPECT_FALSE(item != NULL)) { nbd_free(item); } @@ -143,12 +143,12 @@ uint64_t ll_add (list_t *list, uint64_t key, uint64_t value) { } while (1); } -uint64_t ll_remove (list_t *list, uint64_t key) { - TRACE("l3", "ll_remove: removing item with key %p from list %p", key, list); +uint64_t ll_remove (list_t *ll, uint64_t key) { + TRACE("l3", "ll_remove: removing item with key %p from ll %p", key, ll); node_t *pred; - node_t *item = find_pred(&pred, list, key, TRUE); + node_t *item = find_pred(&pred, ll, key, TRUE); if (item == NULL || item->key != key) { - TRACE("l3", "ll_remove: remove failed, an item with a matching key does not exist in the list", 0, 0); + TRACE("l3", "ll_remove: remove failed, an item with a matching key does not exist in the ll", 0, 0); return DOES_NOT_EXIST; } @@ -166,13 +166,13 @@ uint64_t ll_remove (list_t *list, uint64_t key) { uint64_t value = item->value; - // Unlink from the list. + // Unlink from . TRACE("l3", "ll_remove: link item's pred %p to it's successor %p", pred, next); node_t *other; if ((other = SYNC_CAS(&pred->next, item, next)) != item) { TRACE("l3", "ll_remove: unlink failed; pred's link changed from %p to %p", item, other); // By marking the item earlier, we logically removed it. It is safe to leave the item. - // Another thread will finish physically removing it from the list. + // Another thread will finish physically removing it from the ll. return value; } @@ -181,9 +181,9 @@ uint64_t ll_remove (list_t *list, uint64_t key) { return value; } -void ll_print (list_t *list) { +void ll_print (list_t *ll) { node_t *item; - item = list->head->next; + item = ll->head->next; while (item) { printf("0x%llx ", item->key); fflush(stdout); @@ -191,93 +191,3 @@ void ll_print (list_t *list) { } printf("\n"); } - -#ifdef MAKE_list_test -#include -#include -#include - -#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