From 78fbe93caa21ab2bffc7229a5cfd27a15c1aa01f Mon Sep 17 00:00:00 2001 From: Brendon Scheinman Date: Sun, 3 Mar 2013 16:09:38 -0600 Subject: [PATCH] ck_cohort: fixed regression tests to match new CK_COHORT_PROTOTYPE signature --- regressions/ck_cohort/benchmark/throughput.c | 6 +++--- regressions/ck_cohort/ck_cohort.h | 4 ++-- regressions/ck_cohort/validate/validate.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/regressions/ck_cohort/benchmark/throughput.c b/regressions/ck_cohort/benchmark/throughput.c index 4c91095..9242408 100644 --- a/regressions/ck_cohort/benchmark/throughput.c +++ b/regressions/ck_cohort/benchmark/throughput.c @@ -78,8 +78,8 @@ ck_spinlock_unlock_with_context(ck_spinlock_t *lock, void *context) } CK_COHORT_PROTOTYPE(basic, - ck_spinlock_t, ck_spinlock_lock_with_context, ck_spinlock_unlock_with_context, - ck_spinlock_t, ck_spinlock_lock_with_context, ck_spinlock_unlock_with_context) + ck_spinlock_lock_with_context, ck_spinlock_unlock_with_context, + ck_spinlock_lock_with_context, ck_spinlock_unlock_with_context) struct cohort_record { CK_COHORT_INSTANCE(basic) cohort; @@ -162,6 +162,7 @@ main(int argc, char *argv[]) threads = malloc(sizeof(pthread_t) * nthr); if (threads == NULL) { ck_error("ERROR: Could not allocate thread structures\n"); + } cohorts = malloc(sizeof(struct cohort_record) * n_cohorts); if (cohorts == NULL) { @@ -228,4 +229,3 @@ main(int argc, char *argv[]) return 0; } - diff --git a/regressions/ck_cohort/ck_cohort.h b/regressions/ck_cohort/ck_cohort.h index 3194311..847544c 100644 --- a/regressions/ck_cohort/ck_cohort.h +++ b/regressions/ck_cohort/ck_cohort.h @@ -16,8 +16,8 @@ ck_spinlock_fas_unlock(lock);\ }\ CK_COHORT_PROTOTYPE(fas_fas,\ - ck_spinlock_fas_t, ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context,\ - ck_spinlock_fas_t, ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context)\ + ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context,\ + ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context)\ static CK_COHORT_INSTANCE(fas_fas) CK_CC_CACHELINE cohort = CK_COHORT_INITIALIZER #define LOCK_INIT CK_COHORT_INIT(fas_fas, &cohort, &global_fas_lock, &local_fas_lock,\ CK_COHORT_DEFAULT_LOCAL_PASS_LIMIT) diff --git a/regressions/ck_cohort/validate/validate.c b/regressions/ck_cohort/validate/validate.c index 8b31e90..c9f531f 100644 --- a/regressions/ck_cohort/validate/validate.c +++ b/regressions/ck_cohort/validate/validate.c @@ -60,8 +60,8 @@ ck_spinlock_fas_unlock_with_context(ck_spinlock_fas_t *lock, void *context) } CK_COHORT_PROTOTYPE(fas_fas, - ck_spinlock_fas_t, ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context, - ck_spinlock_fas_t, ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context) + ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context, + ck_spinlock_fas_lock_with_context, ck_spinlock_fas_unlock_with_context) static CK_COHORT_INSTANCE(fas_fas) *cohorts; static int n_cohorts;