From ddb7d1e6db9d4e84e55c54c094ccd0fd34bc3a3f Mon Sep 17 00:00:00 2001 From: Niklas Halle Date: Mon, 22 Jun 2020 16:30:10 +0200 Subject: stuff --- 04_exercise/slotmap/slotmap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '04_exercise/slotmap') diff --git a/04_exercise/slotmap/slotmap.c b/04_exercise/slotmap/slotmap.c index 57c4ef5..ca0460e 100644 --- a/04_exercise/slotmap/slotmap.c +++ b/04_exercise/slotmap/slotmap.c @@ -4,18 +4,21 @@ #include "slotmap.h" #include + +#define intptr_t __intptr_t + smHeader smInit(smEntry * slab, size_t size) { for (int i = 0; i < size; ++i) { - slab[i].value = (intptr_t)NULL; + slab[i].value = (__intptr_t)NULL; } return (smHeader){.slab = slab, .size=size}; } int smInsert(smHeader const * header, void * value) { for (size_t i = 0; i< header->size; ++i ) { - intptr_t ptr = atomic_load(&header->slab[i].value); + _Atomic(long) ptr = atomic_load(&header->slab[i].value); if((void *)ptr == NULL) { - intptr_t expected = (intptr_t) NULL; - if(atomic_compare_exchange_strong(&header->slab[i].value, &expected, (intptr_t) value)){ + __intptr_t expected = (__intptr_t) NULL; + if(atomic_compare_exchange_strong(&header->slab[i].value, &expected, (__intptr_t) value)){ return 0; } } @@ -23,7 +26,7 @@ int smInsert(smHeader const * header, void * value) { return -1; } void smDelete(smEntry * node) { - intptr_t oldval = atomic_exchange(&node->value, (intptr_t)(NULL)); + __intptr_t oldval = atomic_exchange(&node->value, (intptr_t)(NULL)); if((void *) oldval == NULL) { fprintf(stderr, "A Node has been double deleted"); } -- cgit v1.2.3-54-g00ecf