We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix to treat ETIMEDOUT as a time out instead of an error (and update the test)

pthread_sem_timeout.patch (text/plain), 1.60 KB, created by deraj on 2012-02-19 19:01:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: deraj

Created: 2012-02-19 19:01:08 UTC

Size: 1.60 KB

patch

obsolete

>diff -rupN old/src/thread/pthread/SDL_syssem.c new/src/thread/pthread/SDL_syssem.c
>--- old/src/thread/pthread/SDL_syssem.c	2012-01-18 22:30:06.000000000 -0800
>+++ new/src/thread/pthread/SDL_syssem.c	2012-02-19 11:50:39.290330582 -0800
>@@ -144,8 +144,14 @@ int SDL_SemWaitTimeout(SDL_sem *sem, Uin
> 		retval = sem_timedwait(&sem->sem, &ts_timeout);
> 	while (retval == -1 && errno == EINTR);
> 
>-	if (retval == -1)
>-		SDL_SetError(strerror(errno));
>+	if (retval == -1) {
>+		if (errno == ETIMEDOUT) {
>+			retval = SDL_MUTEX_TIMEDOUT;
>+		}
>+		else {
>+			SDL_SetError(strerror(errno));
>+		}
>+	}
> #else
> 	end = SDL_GetTicks() + timeout;
> 	while ((retval = SDL_SemTryWait(sem)) == SDL_MUTEX_TIMEDOUT) {
>diff -rupN old/test/testsem.c new/test/testsem.c
>--- old/test/testsem.c	2012-01-18 22:30:06.000000000 -0800
>+++ new/test/testsem.c	2012-02-19 12:45:45.990272234 -0800
>@@ -38,12 +38,13 @@ static void 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;
>@@ -53,6 +54,10 @@ static void 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 main(int argc, char **argv)

Actions: View | Diff

Attachments on bug 1426: 824

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.