diff --git a/regressions/ck_hs/benchmark/parallel_bytestring.c b/regressions/ck_hs/benchmark/parallel_bytestring.c index 5197923..7910ac2 100644 --- a/regressions/ck_hs/benchmark/parallel_bytestring.c +++ b/regressions/ck_hs/benchmark/parallel_bytestring.c @@ -70,7 +70,7 @@ struct hs_epoch { ck_epoch_entry_t epoch_entry; }; -COMMON_ALARM_DECLARE_GLOBAL(alarm_event, next_stage) +COMMON_ALARM_DECLARE_GLOBAL(hs_alarm, alarm_event, next_stage) static void alarm_handler(int s) @@ -287,7 +287,7 @@ main(int argc, char *argv[]) pthread_t *readers; double p_r, p_d; - COMMON_ALARM_DECLARE_LOCAL(alarm_event, ck_hs) + COMMON_ALARM_DECLARE_LOCAL(hs_alarm, alarm_event) r = 20; s = 8; @@ -327,7 +327,7 @@ main(int argc, char *argv[]) } } - COMMON_ALARM_INIT(alarm_event, r, ck_hs) + COMMON_ALARM_INIT(hs_alarm, alarm_event, r) affinerator.delta = 1; readers = malloc(sizeof(pthread_t) * n_threads); diff --git a/regressions/ck_ht/benchmark/parallel_bytestring.c b/regressions/ck_ht/benchmark/parallel_bytestring.c index 89a2551..f530788 100644 --- a/regressions/ck_ht/benchmark/parallel_bytestring.c +++ b/regressions/ck_ht/benchmark/parallel_bytestring.c @@ -71,7 +71,7 @@ struct ht_epoch { ck_epoch_entry_t epoch_entry; }; -COMMON_ALARM_DECLARE_GLOBAL(alarm_event, next_stage) +COMMON_ALARM_DECLARE_GLOBAL(ht_alarm, alarm_event, next_stage) static void alarm_handler(int s) @@ -265,7 +265,7 @@ main(int argc, char *argv[]) pthread_t *readers; double p_r, p_d; - COMMON_ALARM_DECLARE_LOCAL(alarm_event, ck_ht) + COMMON_ALARM_DECLARE_LOCAL(ht_alarm, alarm_event) r = 20; s = 8; @@ -305,7 +305,7 @@ main(int argc, char *argv[]) } } - COMMON_ALARM_INIT(alarm_event, r, ck_ht) + COMMON_ALARM_INIT(ht_alarm, alarm_event, r) affinerator.delta = 1; readers = malloc(sizeof(pthread_t) * n_threads);