ck_cohort: fixed regression tests to match new CK_COHORT_PROTOTYPE signature

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_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)
 
 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;
 }
-

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_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)\
 	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)

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_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)
 static CK_COHORT_INSTANCE(fas_fas) *cohorts;
 static int n_cohorts;