Fixed bug 1426 - SDL_SemWaitTimeout returns -1 and sets error instead…

… of SDL_MUTEX_TIMEDOUT on time out deraj 2012-02-19 19:01:08 PST Fix to treat ETIMEDOUT as a time out instead of an error (and update the test)
libsdl-org · Feb 21, 2012 · 170ed57 · 170ed57
1 parent 30b17e7
commit 170ed57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/thread/pthread/SDL_syssem.c b/src/thread/pthread/SDL_syssem.c
@@ -150,7 +150,11 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
     } while (retval < 0 && errno == EINTR);
 
     if (retval < 0) {
-        SDL_SetError("sem_timedwait() failed");
+        if (errno == ETIMEDOUT) {
+            retval = SDL_MUTEX_TIMEDOUT;
+        } else {
+            SDL_SetError(strerror(errno));
+        }
     }
 #else
     end = SDL_GetTicks() + timeout;

diff --git a/test/testsem.c b/test/testsem.c
@@ -56,12 +56,13 @@ TestWaitTimeout(void)
     Uint32 start_ticks;
     Uint32 end_ticks;
     Uint32 duration;
+    int retval;
 
     sem = SDL_CreateSemaphore(0);
     printf("Waiting 2 seconds on semaphore\n");
 
     start_ticks = SDL_GetTicks();
-    SDL_SemWaitTimeout(sem, 2000);
+    retval = SDL_SemWaitTimeout(sem, 2000);
     end_ticks = SDL_GetTicks();
 
     duration = end_ticks - start_ticks;
@@ -71,6 +72,10 @@ TestWaitTimeout(void)
         printf("Wait done.\n");
     else
         fprintf(stderr, "Wait took %d milliseconds\n", duration);
+
+    /* Check to make sure the return value indicates timed out */
+    if (retval != SDL_MUTEX_TIMEDOUT) 
+        fprintf(stderr, "SDL_SemWaitTimeout returned: %d; expected: %d\n", retval, SDL_MUTEX_TIMEDOUT);
 }
 
 int