Namespace changes to regressions/common.h (alarm).

Add "local_name" to COMMON_ALARM_DECLARE_LOCAL and
COMMON_ALARM_DECLARE_INIT to avoid namespace conflicts.

regressions/ck_hs/benchmark/parallel_bytestring.c

@@ -287,7 +287,7 @@ main(int argc, char *argv[])
 	pthread_t *readers;
 	double p_r, p_d;
 
-	COMMON_ALARM_DECLARE_LOCAL(alarm_event)
+	COMMON_ALARM_DECLARE_LOCAL(alarm_event, ck_hs)
 
 	r = 20;
 	s = 8;
@@ -327,7 +327,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	COMMON_ALARM_INIT(alarm_event, r)
+	COMMON_ALARM_INIT(alarm_event, r, ck_hs)
 
 	affinerator.delta = 1;
 	readers = malloc(sizeof(pthread_t) * n_threads);

regressions/ck_ht/benchmark/parallel_bytestring.c

@@ -265,7 +265,7 @@ main(int argc, char *argv[])
 	pthread_t *readers;
 	double p_r, p_d;
 
-	COMMON_ALARM_DECLARE_LOCAL(alarm_event)
+	COMMON_ALARM_DECLARE_LOCAL(alarm_event, ck_ht)
 
 	r = 20;
 	s = 8;
@@ -305,7 +305,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	COMMON_ALARM_INIT(alarm_event, r)
+	COMMON_ALARM_INIT(alarm_event, r, ck_ht)
 
 	affinerator.delta = 1;
 	readers = malloc(sizeof(pthread_t) * n_threads);

regressions/common.h

@@ -146,53 +146,53 @@ common_alarm(void (*sig_handler)(int), void *alarm_event, unsigned int duration)
 #ifndef SECOND_TIMER
 #define	SECOND_TIMER 10000000
 #endif
-#define	COMMON_ALARM_DECLARE_GLOBAL(alarm_event_name, flag_name)									\
-static HANDLE common_win_alarm_timer;													\
-static HANDLE alarm_event_name;														\
-static LARGE_INTEGER timer_length;													\
-																	\
-static void CALLBACK															\
-common_win_alarm_handler(LPVOID arg, DWORD timer_low_value, DWORD timer_high_value)							\
-{																	\
-	(void)arg;															\
-	(void)timer_low_value;														\
-	(void)timer_high_value;														\
-	flag_name = true;														\
-	return;																\
-}																	\
-																	\
-static void *																\
-common_win_alarm(void *unused)														\
-{																	\
-	(void)unused;															\
-	bool timer_success = false;													\
-	for (;;) {															\
-		WaitForSingleObjectEx(alarm_event_name, INFINITE, true);								\
-		timer_success = SetWaitableTimer(common_win_alarm_timer, &timer_length, 0, common_win_alarm_handler, NULL, false);	\
-		assert(timer_success != false);												\
-		WaitForSingleObjectEx(common_win_alarm_timer, INFINITE, true);								\
-	}																\
-																	\
-	return NULL;															\
+#define	COMMON_ALARM_DECLARE_GLOBAL(alarm_event_name, flag_name)			\
+static HANDLE common_win_alarm_timer;							\
+static HANDLE alarm_event_name;								\
+static LARGE_INTEGER common_alarm_timer_length;						\
+											\
+static void CALLBACK									\
+common_win_alarm_handler(LPVOID arg, DWORD timer_low_value, DWORD timer_high_value)	\
+{											\
+	(void)arg;									\
+	(void)timer_low_value;								\
+	(void)timer_high_value;								\
+	flag_name = true;								\
+	return;										\
+}											\
+											\
+static void *										\
+common_win_alarm(void *unused)								\
+{											\
+	(void)unused;									\
+	bool timer_success = false;							\
+	for (;;) {									\
+		WaitForSingleObjectEx(alarm_event_name, INFINITE, true);		\
+		timer_success = SetWaitableTimer(common_win_alarm_timer, &common_alarm_timer_length, 0, common_win_alarm_handler, NULL, false);	\
+		assert(timer_success != false);						\
+		WaitForSingleObjectEx(common_win_alarm_timer, INFINITE, true);		\
+	}										\
+											\
+	return NULL;									\
 }
 
-#define	COMMON_ALARM_DECLARE_LOCAL(alarm_event_name)	\
-	__int64 tl;					\
-	pthread_t common_win_alarm_thread;
-
-#define	COMMON_ALARM_INIT(alarm_event_name, duration) 						\
-	tl = -1 * duration * SECOND_TIMER;							\
-	timer_length.LowPart = (DWORD) (tl & 0xFFFFFFFF);					\
-	timer_length.HighPart = (LONG) (tl >> 32);						\
-	alarm_event_name = CreateEvent(NULL, false, false, NULL);				\
-	assert(alarm_event_name != NULL);							\
-	common_win_alarm_timer = CreateWaitableTimer(NULL, true, NULL);				\
-	assert(common_win_alarm_timer != NULL);							\
-	if (pthread_create(&common_win_alarm_thread, NULL, common_win_alarm, NULL) != 0)	\
+#define	COMMON_ALARM_DECLARE_LOCAL(alarm_event_name, local_name)	\
+	int64_t common_alarm_tl_#local_name;				\
+	pthread_t common_win_alarm_thread_#local_name;
+
+#define	COMMON_ALARM_INIT(alarm_event_name, duration, local_name) 			\
+	common_alarm_tl_#local_name = -1 * (duration) * SECOND_TIMER;			\
+	common_alarm_timer_length.LowPart = (DWORD) (tl & 0xFFFFFFFF);			\
+	common_alarm_timer_length.HighPart = (LONG) (tl >> 32);				\
+	alarm_event_name = CreateEvent(NULL, false, false, NULL);			\
+	assert(alarm_event_name != NULL);						\
+	common_win_alarm_timer = CreateWaitableTimer(NULL, true, NULL);			\
+	assert(common_win_alarm_timer != NULL);						\
+	if (pthread_create(&common_win_alarm_thread_#local_name, NULL, common_win_alarm, NULL) != 0)	\
 		ck_error("ERROR: Failed to create common_win_alarm thread.\n");
 #else
 #define	COMMON_ALARM_DECLARE_GLOBAL(alarm_event_name, flag_name)
-#define	COMMON_ALARM_DECLARE_LOCAL(alarm_event_name)	\
+#define	COMMON_ALARM_DECLARE_LOCAL(alarm_event_name, local_name)	\
 	int alarm_event_name = 0;
 #define	COMMON_ALARM_INIT(alarm_event_name, duration)
 #endif