stream: split out pthread helper function

Also split the function itself into 3.

4 files changed, 70 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 495fe79e61..bdd2714f6d 100644
--- a/Makefile
+++ b/Makefile
@@ -228,6 +228,7 @@ SOURCES = audio/audio.c \
           osdep/io.c \
           osdep/numcores.c \
           osdep/timer.c \
+          osdep/threads.c \
           stream/cookies.c \
           stream/rar.c \
           stream/stream.c \
diff --git a/osdep/threads.c b/osdep/threads.c
new file mode 100644
index 0000000000..ac6dfbb0f0
--- /dev/null
+++ b/osdep/threads.c
@@ -0,0 +1,57 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <time.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include "threads.h"
+
+static void get_pthread_time(struct timespec *out_ts)
+{
+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
+    clock_gettime(CLOCK_REALTIME, out_ts);
+#else
+    // OSX
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    out_ts->tv_sec = tv.tv_sec;
+    out_ts->tv_nsec = tv.tv_usec * 1000UL;
+#endif
+}
+
+static void timespec_add_seconds(struct timespec *ts, double seconds)
+{
+    unsigned long secs = (int)seconds;
+    unsigned long nsecs = (seconds - secs) * 1000000000UL;
+    if (nsecs + ts->tv_nsec >= 1000000000UL) {
+        secs += 1;
+        nsecs -= 1000000000UL;
+    }
+    ts->tv_sec += secs;
+    ts->tv_nsec += nsecs;
+}
+
+// Call pthread_cond_timedwait() with a relative timeout in seconds
+int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+                             double timeout)
+{
+    struct timespec ts;
+    get_pthread_time(&ts);
+    timespec_add_seconds(&ts, timeout);
+    return pthread_cond_timedwait(cond, mutex, &ts);
+}
diff --git a/osdep/threads.h b/osdep/threads.h
new file mode 100644
index 0000000000..7c9f041320
--- /dev/null
+++ b/osdep/threads.h
@@ -0,0 +1,9 @@
+#ifndef MP_OSDEP_THREADS_H_
+#define MP_OSDEP_THREADS_H_
+
+#include <pthread.h>
+
+int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+                             double timeout);
+
+#endif
diff --git a/stream/cache.c b/stream/cache.c
index 9b7b3a17be..2f66ccedc3 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -50,6 +50,7 @@
 #include "config.h"
 
 #include "osdep/timer.h"
+#include "osdep/threads.h"
 
 #include "mpvcore/mp_msg.h"
 
@@ -129,30 +130,6 @@ static int64_t mp_clipi64(int64_t val, int64_t min, int64_t max)
     return val;
 }
 
-// pthread_cond_timedwait() with a relative timeout in seconds
-static int cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           double timeout)
-{
-    struct timespec ts;
-#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
-    clock_gettime(CLOCK_REALTIME, &ts);
-#else
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    ts.tv_sec = tv.tv_sec;
-    ts.tv_nsec = tv.tv_usec * 1000UL;
-#endif
-    unsigned long seconds = (int)timeout;
-    unsigned long nsecs = (timeout - seconds) * 1000000000UL;
-    if (nsecs + ts.tv_nsec >= 1000000000UL) {
-        seconds += 1;
-        nsecs -= 1000000000UL;
-    }
-    ts.tv_sec += seconds;
-    ts.tv_nsec += nsecs;
-    return pthread_cond_timedwait(cond, mutex, &ts);
-}
-
 // Used by the main thread to wakeup the cache thread, and to wait for the
 // cache thread. The cache mutex has to be locked when calling this function.
 // *retry_time should be set to 0 on the first call.
@@ -173,7 +150,7 @@ static int cache_wakeup_and_wait(struct priv *s, double *retry_time)
     double start = mp_time_sec();
 
     pthread_cond_signal(&s->wakeup);
-    cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
+    mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
 
     *retry_time += mp_time_sec() - start;
 
@@ -450,7 +427,7 @@ static void *cache_thread(void *arg)
             s->control = CACHE_CTRL_NONE;
         }
         if (s->idle && s->control == CACHE_CTRL_NONE)
-            cond_timed_wait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
+            mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
     }
     pthread_cond_signal(&s->wakeup);
     pthread_mutex_unlock(&s->mutex);