winpr/synch: fix tests

TestSynchTimerQueue:
- fixed race condition

TestSynchWaitableTimerAPC:
- Use WaitForSingleObjectEx since the thread must be in an alterable state

TestSynch is now expected to succeed on WIN32

winpr/libwinpr/synch/test/TestSynchTimerQueue.c

@@ -7,16 +7,15 @@
 #define FIRE_COUNT	5
 #define TIMER_COUNT	5
 
-static int g_Count = 0;
-static HANDLE g_Event = NULL;
-
 struct apc_data
 {
-	int TimerId;
-	int FireCount;
+	DWORD TimerId;
+	DWORD FireCount;
 	DWORD DueTime;
 	DWORD Period;
 	UINT32 StartTime;
+	DWORD MaxFireCount;
+	HANDLE CompletionEvent;
 };
 typedef struct apc_data APC_DATA;
 
@@ -36,38 +35,30 @@ VOID CALLBACK TimerRoutine(PVOID lpParam, BOOLEAN TimerOrWaitFired)
 	expectedTime = apcData->DueTime + (apcData->Period * apcData->FireCount);
 
 	apcData->FireCount++;
-	g_Count++;
 
 	printf("TimerRoutine: TimerId: %d FireCount: %d ActualTime: %d ExpectedTime: %d Discrepancy: %d\n",
 			apcData->TimerId, apcData->FireCount, TimerTime, expectedTime, TimerTime - expectedTime);
 
-	if (g_Count >= (TIMER_COUNT * FIRE_COUNT))
-	{
-		SetEvent(g_Event);
-	}
-
 	Sleep(50);
+
+	if (apcData->FireCount == apcData->MaxFireCount)
+	{
+		SetEvent(apcData->CompletionEvent);
+	}
 }
 
 int TestSynchTimerQueue(int argc, char* argv[])
 {
-	int index;
+	DWORD index;
 	HANDLE hTimerQueue;
 	HANDLE hTimers[TIMER_COUNT];
 	APC_DATA apcData[TIMER_COUNT];
 
-	g_Event = CreateEvent(NULL, TRUE, FALSE, NULL);
-	if (!g_Event)
-	{
-		printf("CreateEvent failed (%d)\n", (int) GetLastError());
-		return -1;
-	}
-
 	hTimerQueue = CreateTimerQueue();
 
 	if (!hTimerQueue)
 	{
-		printf("CreateTimerQueue failed (%d)\n", (int) GetLastError());
+		printf("CreateTimerQueue failed (%u)\n", GetLastError());
 		return -1;
 	}
 
@@ -78,37 +69,46 @@ int TestSynchTimerQueue(int argc, char* argv[])
 		apcData[index].DueTime = (index * 100) + 500;
 		apcData[index].Period = 1000;
 		apcData[index].FireCount = 0;
+		apcData[index].MaxFireCount = FIRE_COUNT;
+
+		if (!(apcData[index].CompletionEvent = CreateEvent(NULL, TRUE, FALSE, NULL)))
+		{
+			printf("Failed to create apcData[%u] event (%u)\n", index, GetLastError());
+			return -1;
+		}
 
 		if (!CreateTimerQueueTimer(&hTimers[index], hTimerQueue, (WAITORTIMERCALLBACK) TimerRoutine,
 				&apcData[index], apcData[index].DueTime, apcData[index].Period, 0))
 		{
-			printf("CreateTimerQueueTimer failed (%d)\n", (int) GetLastError());
+			printf("CreateTimerQueueTimer failed (%u)\n", GetLastError());
 			return -1;
 		}
 	}
 
-	if (WaitForSingleObject(g_Event, INFINITE) != WAIT_OBJECT_0)
+	for (index = 0; index < TIMER_COUNT; index++)
 	{
-		printf("WaitForSingleObject failed (%d)\n", (int) GetLastError());
-		return -1;
+		if (WaitForSingleObject(apcData[index].CompletionEvent, 20000) != WAIT_OBJECT_0)
+		{
+			printf("Failed to wait for timer queue timer #%u (%u)\n", index, GetLastError());
+			return -1;
+		}
+		CloseHandle(apcData[index].CompletionEvent);
 	}
 
 	for (index = 0; index < TIMER_COUNT; index++)
 	{
 		if (!DeleteTimerQueueTimer(hTimerQueue, hTimers[index], NULL))
 		{
-			printf("DeleteTimerQueueTimer failed (%d)\n", (int) GetLastError());
+			printf("DeleteTimerQueueTimer failed (%u)\n", GetLastError());
 			return -1;
 		}
 	}
-	
+
 	if (!DeleteTimerQueue(hTimerQueue))
 	{
-		printf("DeleteTimerQueue failed (%d)\n", (int) GetLastError());
+		printf("DeleteTimerQueue failed (%u)\n", GetLastError());
 		return -1;
 	}
 
-	CloseHandle(g_Event);
-
 	return 0;
 }

winpr/libwinpr/synch/test/TestSynchWaitableTimerAPC.c

@@ -67,9 +67,35 @@ int TestSynchWaitableTimerAPC(int argc, char* argv[])
 	if (!bSuccess)
 		goto cleanup;
 
-	if (WaitForSingleObject(g_Event, INFINITE) != WAIT_OBJECT_0)
+	/**
+	 * See Remarks at https://msdn.microsoft.com/en-us/library/windows/desktop/ms686786(v=vs.85).aspx
+	 * The SetWaitableTimer completion routine is executed by the thread that activates the timer
+	 * using SetWaitableTimer. However, the thread must be in an ALERTABLE state.
+	 */
+
+
+	/**
+	 * Note: On WIN32 we need to use WaitForSingleObjectEx with parameter bAlertable = TRUE
+	 * However, WinPR currently (May 2016) does not have a working WaitForSingleObjectEx implementation
+	 * but its non-WIN32 WaitForSingleObject implementations seem to be alertable by WinPR's
+	 * timer implementations.
+	 **/
+
+	for(;;)
 	{
-		printf("WaitForSingleObject failed (%d)\n", GetLastError());
+		DWORD rc;
+#ifdef _WIN32
+		rc = WaitForSingleObjectEx(g_Event, INFINITE, TRUE);
+#else
+		rc = WaitForSingleObject(g_Event, INFINITE);
+#endif
+		if (rc == WAIT_OBJECT_0)
+			break;
+
+		if (rc == 0x000000C0L) /* WAIT_IO_COMPLETION */
+			continue;
+
+		printf("Failed to wait for completion event (%u)\n", GetLastError());
 		goto cleanup;
 	}