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] When clock_gettime is available, make SDL_syscond.c and SDL_syssem.c use it

clock_gettime.patch (text/plain), 2.66 KB, created by Ben Swick on 2014-11-20 21:24:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Swick

Created: 2014-11-20 21:24:59 UTC

Size: 2.66 KB

patch

obsolete

>diff -r bc074eca6597 src/thread/pthread/SDL_syscond.c
>--- a/src/thread/pthread/SDL_syscond.c	Sat Nov 15 15:07:55 2014 -0500
>+++ b/src/thread/pthread/SDL_syscond.c	Thu Nov 20 15:21:53 2014 -0600
>@@ -21,6 +21,7 @@
> #include "../../SDL_internal.h"
> 
> #include <sys/time.h>
>+#include <time.h>
> #include <unistd.h>
> #include <errno.h>
> #include <pthread.h>
>@@ -98,17 +99,26 @@
> SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
> {
>     int retval;
>+#ifndef HAVE_CLOCK_GETTIME
>     struct timeval delta;
>+#endif
>     struct timespec abstime;
> 
>     if (!cond) {
>         return SDL_SetError("Passed a NULL condition variable");
>     }
> 
>+#ifdef HAVE_CLOCK_GETTIME
>+    clock_gettime(CLOCK_REALTIME, &abstime);
>+
>+    abstime.tv_nsec += (ms % 1000) * 1000000;
>+    abstime.tv_sec += ms / 1000;
>+#else
>     gettimeofday(&delta, NULL);
> 
>     abstime.tv_sec = delta.tv_sec + (ms / 1000);
>     abstime.tv_nsec = (delta.tv_usec + (ms % 1000) * 1000) * 1000;
>+#endif
>     if (abstime.tv_nsec > 1000000000) {
>         abstime.tv_sec += 1;
>         abstime.tv_nsec -= 1000000000;
>diff -r bc074eca6597 src/thread/pthread/SDL_syssem.c
>--- a/src/thread/pthread/SDL_syssem.c	Sat Nov 15 15:07:55 2014 -0500
>+++ b/src/thread/pthread/SDL_syssem.c	Thu Nov 20 15:21:53 2014 -0600
>@@ -24,6 +24,7 @@
> #include <pthread.h>
> #include <semaphore.h>
> #include <sys/time.h>
>+#include <time.h>
> 
> #include "SDL_thread.h"
> #include "SDL_timer.h"
>@@ -102,7 +103,9 @@
> {
>     int retval;
> #ifdef HAVE_SEM_TIMEDWAIT
>+#ifndef HAVE_CLOCK_GETTIME
>     struct timeval now;
>+#endif
>     struct timespec ts_timeout;
> #else
>     Uint32 end;
>@@ -125,22 +128,26 @@
>     * a lapse of time, but until we reach a certain time.
>     * This time is now plus the timeout.
>     */
>+#ifdef HAVE_CLOCK_GETTIME
>+    clock_gettime(CLOCK_REALTIME, &ts_timeout);
>+
>+    /* Add our timeout to current time */
>+    ts_timeout.tv_nsec += (timeout % 1000) * 1000000;
>+    ts_timeout.tv_sec += timeout / 1000;
>+#else
>     gettimeofday(&now, NULL);
> 
>     /* Add our timeout to current time */
>-    now.tv_usec += (timeout % 1000) * 1000;
>-    now.tv_sec += timeout / 1000;
>+    ts_timeout.tv_sec = now.tv_sec + (timeout / 1000);
>+    ts_timeout.tv_nsec = (now.tv_usec + (timeout % 1000) * 1000) * 1000;
>+#endif
> 
>     /* Wrap the second if needed */
>-    if ( now.tv_usec >= 1000000 ) {
>-        now.tv_usec -= 1000000;
>-        now.tv_sec ++;
>+    if (ts_timeout.tv_nsec > 1000000000) {
>+        ts_timeout.tv_sec += 1;
>+        ts_timeout.tv_nsec -= 1000000000;
>     }
> 
>-    /* Convert to timespec */
>-    ts_timeout.tv_sec = now.tv_sec;
>-    ts_timeout.tv_nsec = now.tv_usec * 1000;
>-
>     /* Wait. */
>     do {
>         retval = sem_timedwait(&sem->sem, &ts_timeout);

Actions: View | Diff

Attachments on bug 2411: 1942

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.