X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cmodelint.cc;h=0b9668d16a56c96f20322205e4a7a4cdb599fca4;hp=2f892f0c290d2e4e6ba3f7968dd4e8f129aa7b10;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=dfb47d6bc6aacb0ce93a6e497d8abd027c12ec50 diff --git a/cmodelint.cc b/cmodelint.cc index 2f892f0c..0b9668d1 100644 --- a/cmodelint.cc +++ b/cmodelint.cc @@ -1,335 +1,268 @@ #include +#include + #include "model.h" +#include "execution.h" #include "action.h" +#include "history.h" #include "cmodelint.h" +#include "snapshot-interface.h" #include "threads-model.h" +#include "datarace.h" memory_order orders[6] = { memory_order_relaxed, memory_order_consume, memory_order_acquire, - memory_order_release, memory_order_acq_rel, memory_order_seq_cst + memory_order_release, memory_order_acq_rel, memory_order_seq_cst, }; -/** Performs a read action.*/ -uint64_t model_read_action(void * obj, memory_order ord) { - return model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj)); -} - -/** Performs a write action.*/ -void model_write_action(void * obj, memory_order ord, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_WRITE, ord, obj, val)); -} - -/** Performs an init action. */ -void model_init_action(void * obj, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, val)); -} - -/** - * Performs the read part of a RMW action. The next action must either be the - * write part of the RMW action or an explicit close out of the RMW action w/o - * a write. - */ -uint64_t model_rmwr_action(void *obj, memory_order ord) { - return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj)); -} - -/** Performs the write part of a RMW action. */ -void model_rmw_action(void *obj, memory_order ord, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_RMW, ord, obj, val)); +static void ensureModel() { + if (!model) { + snapshot_system_init(10000, 1024, 1024, 40000); + model = new ModelChecker(); + model->startChecker(); + } } -/** Closes out a RMW action without doing a write. */ -void model_rmwc_action(void *obj, memory_order ord) { - model->switch_to_master(new ModelAction(ATOMIC_RMWC, ord, obj)); -} - -/** Issues a fence operation. */ -void model_fence_action(memory_order ord) { - model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord, FENCE_LOCATION)); +/* --- helper functions --- */ +uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) { + ensureModel(); + return model->switch_thread(new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj, oldval, size)); } -/* --- helper functions --- */ uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position) { - return model->switch_to_master( - new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj) - ); + ensureModel(); + return model->switch_thread(new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj)); } void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val) - ); -} - -/* -void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index) { - model->switch_to_master(new ModelAction(ATOMIC_RMW, orders[atomic_index], obj, val)); + ensureModel(); + model->switch_thread(new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val)); } -*/ void model_rmwc_action_helper(void *obj, int atomic_index, const char *position) { - model->switch_to_master( - new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj) - ); -} - -/* -void model_fence_action_helper(int atomic_index) { - model->switch_to_master( - new ModelAction(ATOMIC_FENCE, orders[atomic_index], FENCE_LOCATION) - ); -} -*/ + ensureModel(); + model->switch_thread(new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj)); +} + +// cds volatile loads +#define VOLATILELOAD(size) \ + uint ## size ## _t cds_volatile_load ## size(void * obj, const char * position) { \ + ensureModel(); \ + return (uint ## size ## _t)model->switch_thread(new ModelAction(ATOMIC_READ, position, memory_order_volatile_load, obj)); \ + } + +VOLATILELOAD(8) +VOLATILELOAD(16) +VOLATILELOAD(32) +VOLATILELOAD(64) + +// cds volatile stores +#define VOLATILESTORE(size) \ + void cds_volatile_store ## size (void * obj, uint ## size ## _t val, const char * position) { \ + ensureModel(); \ + model->switch_thread(new ModelAction(ATOMIC_WRITE, position, memory_order_volatile_store, obj, (uint64_t) val)); \ + *((volatile uint ## size ## _t *)obj) = val; \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + atomraceCheckWrite(tid, (void *)(((char *)obj)+i)); \ + } \ + } + +VOLATILESTORE(8) +VOLATILESTORE(16) +VOLATILESTORE(32) +VOLATILESTORE(64) // cds atomic inits -void cds_atomic_init8(void * obj, uint8_t val, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val) - ); -} -void cds_atomic_init16(void * obj, uint16_t val, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val) - ); -} -void cds_atomic_init32(void * obj, uint32_t val, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val) - ); -} -void cds_atomic_init64(void * obj, uint64_t val, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, val) - ); -} - +#define CDSATOMICINT(size) \ + void cds_atomic_init ## size (void * obj, uint ## size ## _t val, const char * position) { \ + ensureModel(); \ + model->switch_thread(new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)); \ + *((volatile uint ## size ## _t *)obj) = val; \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + atomraceCheckWrite(tid, (void *)(((char *)obj)+i)); \ + } \ + } + +CDSATOMICINT(8) +CDSATOMICINT(16) +CDSATOMICINT(32) +CDSATOMICINT(64) // cds atomic loads -uint8_t cds_atomic_load8(void * obj, int atomic_index, const char * position) { - return (uint8_t) ( model->switch_to_master( - new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)) - ); -} -uint16_t cds_atomic_load16(void * obj, int atomic_index, const char * position) { - return (uint16_t) ( model->switch_to_master( - new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)) - ); -} -uint32_t cds_atomic_load32(void * obj, int atomic_index, const char * position) { - return (uint32_t) ( model->switch_to_master( - new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)) - ); -} -uint64_t cds_atomic_load64(void * obj, int atomic_index, const char * position) { - return model->switch_to_master( - new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj) - ); -} +#define CDSATOMICLOAD(size) \ + uint ## size ## _t cds_atomic_load ## size(void * obj, int atomic_index, const char * position) { \ + ensureModel(); \ + uint ## size ## _t val = (uint ## size ## _t)model->switch_thread( \ + new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)); \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + atomraceCheckRead(tid, (void *)(((char *)obj)+i)); \ + } \ + return val; \ + } + +CDSATOMICLOAD(8) +CDSATOMICLOAD(16) +CDSATOMICLOAD(32) +CDSATOMICLOAD(64) // cds atomic stores -void cds_atomic_store8(void * obj, uint8_t val, int atomic_index, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val) - ); -} -void cds_atomic_store16(void * obj, uint16_t val, int atomic_index, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val) - ); -} -void cds_atomic_store32(void * obj, uint32_t val, int atomic_index, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val) - ); -} -void cds_atomic_store64(void * obj, uint64_t val, int atomic_index, const char * position) { - model->switch_to_master( - new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, val) - ); -} +#define CDSATOMICSTORE(size) \ + void cds_atomic_store ## size(void * obj, uint ## size ## _t val, int atomic_index, const char * position) { \ + ensureModel(); \ + model->switch_thread(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \ + *((volatile uint ## size ## _t *)obj) = val; \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + atomraceCheckWrite(tid, (void *)(((char *)obj)+i)); \ + } \ + } + +CDSATOMICSTORE(8) +CDSATOMICSTORE(16) +CDSATOMICSTORE(32) +CDSATOMICSTORE(64) + #define _ATOMIC_RMW_(__op__, size, addr, val, atomic_index, position) \ -({ \ - uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index, position); \ - uint##size##_t _copy = _old; \ - uint##size##_t _val = val; \ - _copy __op__ _val; \ - model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position); \ - return _old; \ -}) + ({ \ + uint ## size ## _t _old = model_rmwr_action_helper(addr, atomic_index, position); \ + uint ## size ## _t _copy = _old; \ + uint ## size ## _t _val = val; \ + _copy __op__ _val; \ + model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position); \ + *((volatile uint ## size ## _t *)addr) = _copy; \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + atomraceCheckRead(tid, (void *)(((char *)addr)+i)); \ + recordWrite(tid, (void *)(((char *)addr)+i)); \ + } \ + return _old; \ + }) // cds atomic exchange -uint8_t cds_atomic_exchange8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( = , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_exchange16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( = , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_exchange32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( = , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_exchange64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( = , 64, addr, val, atomic_index, position); -} +#define CDSATOMICEXCHANGE(size) \ + uint ## size ## _t cds_atomic_exchange ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( =, size, addr, val, atomic_index, position); \ + } + +CDSATOMICEXCHANGE(8) +CDSATOMICEXCHANGE(16) +CDSATOMICEXCHANGE(32) +CDSATOMICEXCHANGE(64) // cds atomic fetch add -uint8_t cds_atomic_fetch_add8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( += , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_fetch_add16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( += , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_fetch_add32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( += , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_fetch_add64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( += , 64, addr, val, atomic_index, position); -} +#define CDSATOMICADD(size) \ + uint ## size ## _t cds_atomic_fetch_add ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( +=, size, addr, val, atomic_index, position); \ + } + +CDSATOMICADD(8) +CDSATOMICADD(16) +CDSATOMICADD(32) +CDSATOMICADD(64) // cds atomic fetch sub -uint8_t cds_atomic_fetch_sub8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( -= , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_fetch_sub16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( -= , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_fetch_sub32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( -= , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_fetch_sub64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( -= , 64, addr, val, atomic_index, position); -} +#define CDSATOMICSUB(size) \ + uint ## size ## _t cds_atomic_fetch_sub ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( -=, size, addr, val, atomic_index, position); \ + } + +CDSATOMICSUB(8) +CDSATOMICSUB(16) +CDSATOMICSUB(32) +CDSATOMICSUB(64) // cds atomic fetch and -uint8_t cds_atomic_fetch_and8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( &= , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_fetch_and16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( &= , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_fetch_and32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( &= , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_fetch_and64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( &= , 64, addr, val, atomic_index, position); -} +#define CDSATOMICAND(size) \ + uint ## size ## _t cds_atomic_fetch_and ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( &=, size, addr, val, atomic_index, position); \ + } + +CDSATOMICAND(8) +CDSATOMICAND(16) +CDSATOMICAND(32) +CDSATOMICAND(64) // cds atomic fetch or -uint8_t cds_atomic_fetch_or8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( |= , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_fetch_or16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( |= , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_fetch_or32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( |= , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_fetch_or64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( |= , 64, addr, val, atomic_index, position); -} +#define CDSATOMICOR(size) \ + uint ## size ## _t cds_atomic_fetch_or ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( |=, size, addr, val, atomic_index, position); \ + } + +CDSATOMICOR(8) +CDSATOMICOR(16) +CDSATOMICOR(32) +CDSATOMICOR(64) // cds atomic fetch xor -uint8_t cds_atomic_fetch_xor8(void* addr, uint8_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( ^= , 8, addr, val, atomic_index, position); -} -uint16_t cds_atomic_fetch_xor16(void* addr, uint16_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( ^= , 16, addr, val, atomic_index, position); -} -uint32_t cds_atomic_fetch_xor32(void* addr, uint32_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( ^= , 32, addr, val, atomic_index, position); -} -uint64_t cds_atomic_fetch_xor64(void* addr, uint64_t val, int atomic_index, const char * position) { - _ATOMIC_RMW_( ^= , 64, addr, val, atomic_index, position); -} +#define CDSATOMICXOR(size) \ + uint ## size ## _t cds_atomic_fetch_xor ## size(void* addr, uint ## size ## _t val, int atomic_index, const char * position) { \ + _ATOMIC_RMW_( ^=, size, addr, val, atomic_index, position); \ + } + +CDSATOMICXOR(8) +CDSATOMICXOR(16) +CDSATOMICXOR(32) +CDSATOMICXOR(64) // cds atomic compare and exchange -// In order to accomodate the LLVM PASS, the return values are not true or false. +// In order to accomodate the LLVM PASS, the return values are not true or false. #define _ATOMIC_CMPSWP_WEAK_ _ATOMIC_CMPSWP_ #define _ATOMIC_CMPSWP_(size, addr, expected, desired, atomic_index, position) \ -({ \ - uint##size##_t _desired = desired; \ - uint##size##_t _expected = expected; \ - uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index, position); \ - if (_old == _expected) { \ - model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); return _expected; } \ - else { \ - model_rmwc_action_helper(addr, atomic_index, position); _expected = _old; return _old; } \ -}) + ({ \ + uint ## size ## _t _desired = desired; \ + uint ## size ## _t _expected = expected; \ + uint ## size ## _t _old = model_rmwrcas_action_helper(addr, atomic_index, _expected, sizeof(_expected), position); \ + if (_old == _expected) { \ + model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); \ + *((volatile uint ## size ## _t *)addr) = desired; \ + thread_id_t tid = thread_current_id(); \ + for(int i=0;i < size / 8;i++) { \ + recordWrite(tid, (void *)(((char *)addr)+i)); \ + } \ + return _expected; } \ + else { \ + model_rmwc_action_helper(addr, atomic_index, position); _expected = _old; return _old; } \ + }) // atomic_compare_exchange version 1: the CmpOperand (corresponds to expected) -// extracted from LLVM IR is an integer type. +// extracted from LLVM IR is an integer type. +#define CDSATOMICCASV1(size) \ + uint ## size ## _t cds_atomic_compare_exchange ## size ## _v1(void* addr, uint ## size ## _t expected, uint ## size ## _t desired, int atomic_index_succ, int atomic_index_fail, const char *position) { \ + _ATOMIC_CMPSWP_(size, addr, expected, desired, atomic_index_succ, position); \ + } -uint8_t cds_atomic_compare_exchange8_v1(void* addr, uint8_t expected, uint8_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position ) -{ - _ATOMIC_CMPSWP_(8, addr, expected, desired, - atomic_index_succ, position); -} -uint16_t cds_atomic_compare_exchange16_v1(void* addr, uint16_t expected, uint16_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - _ATOMIC_CMPSWP_(16, addr, expected, desired, - atomic_index_succ, position); -} -uint32_t cds_atomic_compare_exchange32_v1(void* addr, uint32_t expected, uint32_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - _ATOMIC_CMPSWP_(32, addr, expected, desired, - atomic_index_succ, position); -} -uint64_t cds_atomic_compare_exchange64_v1(void* addr, uint64_t expected, uint64_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - _ATOMIC_CMPSWP_(64, addr, expected, desired, - atomic_index_succ, position); -} +CDSATOMICCASV1(8) +CDSATOMICCASV1(16) +CDSATOMICCASV1(32) +CDSATOMICCASV1(64) // atomic_compare_exchange version 2 -bool cds_atomic_compare_exchange8_v2(void* addr, uint8_t* expected, uint8_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position ) -{ - uint8_t ret = cds_atomic_compare_exchange8_v1(addr, *expected, - desired, atomic_index_succ, atomic_index_fail, position); - if (ret == *expected) return true; - else return false; -} -bool cds_atomic_compare_exchange16_v2(void* addr, uint16_t* expected, uint16_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - uint16_t ret = cds_atomic_compare_exchange16_v1(addr, *expected, - desired, atomic_index_succ, atomic_index_fail, position); - if (ret == *expected) return true; - else return false; -} -bool cds_atomic_compare_exchange32_v2(void* addr, uint32_t* expected, uint32_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - uint32_t ret = cds_atomic_compare_exchange32_v1(addr, *expected, - desired, atomic_index_succ, atomic_index_fail, position); - if (ret == *expected) return true; - else return false; -} -bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, uint64_t desired, - int atomic_index_succ, int atomic_index_fail, const char *position) -{ - uint64_t ret = cds_atomic_compare_exchange64_v1(addr, *expected, - desired, atomic_index_succ, atomic_index_fail, position); - if (ret == *expected) return true; - else return false; -} +#define CDSATOMICCASV2(size) \ + bool cds_atomic_compare_exchange ## size ## _v2(void* addr, uint ## size ## _t* expected, uint ## size ## _t desired, int atomic_index_succ, int atomic_index_fail, const char *position) { \ + uint ## size ## _t ret = cds_atomic_compare_exchange ## size ## _v1(addr, *expected, desired, atomic_index_succ, atomic_index_fail, position); \ + if (ret == *expected) {return true;} else {return false;} \ + } +CDSATOMICCASV2(8) +CDSATOMICCASV2(16) +CDSATOMICCASV2(32) +CDSATOMICCASV2(64) // cds atomic thread fence void cds_atomic_thread_fence(int atomic_index, const char * position) { - model->switch_to_master( + model->switch_thread( new ModelAction(ATOMIC_FENCE, position, orders[atomic_index], FENCE_LOCATION) - ); + ); } /* -#define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ ) \ + #define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ ) \ ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__); \ __typeof__(__e__) __q__ = (__e__); \ __typeof__(__m__) __v__ = (__m__); \ @@ -340,13 +273,13 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) { else { model_rmwc_action((void *)__p__, __x__); *__q__ = __t__; __r__ = false;} \ __r__; }) -#define _ATOMIC_FENCE_( __x__ ) \ + #define _ATOMIC_FENCE_( __x__ ) \ ({ model_fence_action(__x__);}) -*/ + */ /* -#define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ ) \ + #define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ ) \ ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__); \ __typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__); \ __typeof__(__m__) __v__ = (__m__); \ @@ -354,5 +287,53 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) { __copy__ __o__ __v__; \ model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__); \ __old__ = __old__; Silence clang (-Wunused-value) \ - }) -*/ + }) + */ + +void cds_func_entry(const char * funcName) { +#ifdef NEWFUZZER + ensureModel(); + thread_id_t tid = thread_current_id(); + uint32_t func_id; + + ModelHistory *history = model->get_history(); + if ( !history->getFuncMap()->contains(funcName) ) { + // add func id to func map + func_id = history->get_func_counter(); + history->incr_func_counter(); + history->getFuncMap()->put(funcName, func_id); + + // add func id to reverse func map + ModelVector * func_map_rev = history->getFuncMapRev(); + if ( func_map_rev->size() <= func_id ) + func_map_rev->resize( func_id + 1 ); + + func_map_rev->at(func_id) = funcName; + } else { + func_id = history->getFuncMap()->get(funcName); + } + + history->enter_function(func_id, tid); +#endif +} + +void cds_func_exit(const char * funcName) { +#ifdef NEWFUZZER + ensureModel(); + thread_id_t tid = thread_current_id(); + uint32_t func_id; + + ModelHistory *history = model->get_history(); + func_id = history->getFuncMap()->get(funcName); +/* + * func_id not found; this could happen in the case where a function calls cds_func_entry + * when the model has been defined yet, but then an atomic inside the function initializes + * the model. And then cds_func_exit is called upon the function exiting. + * + */ + if (func_id == 0) + return; + + history->exit_function(func_id, tid); +#endif +}