*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/**
* SECTION:gstsystemclock
+ * @title: GstSystemClock
* @short_description: Default clock that uses the current system time
* @see_also: #GstClock
*
* Subclasses can however override all of the important methods for sync and
* async notifications to implement their own callback methods or blocking
* wait operations.
- *
- * Last reviewed on 2006-03-08 (0.10.4)
*/
#include "gst_private.h"
# define WIN32_LEAN_AND_MEAN /* prevents from including too many things */
# include <windows.h> /* QueryPerformance* stuff */
# undef WIN32_LEAN_AND_MEAN
+# ifndef EWOULDBLOCK
# define EWOULDBLOCK EAGAIN /* This is just to placate gcc */
+# endif
#endif /* G_OS_WIN32 */
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#endif
+
#define GET_ENTRY_STATUS(e) ((GstClockReturn) g_atomic_int_get(&GST_CLOCK_ENTRY_STATUS(e)))
#define SET_ENTRY_STATUS(e,val) (g_atomic_int_set(&GST_CLOCK_ENTRY_STATUS(e),(val)))
-#define CAS_ENTRY_STATUS(e,old,val) (G_ATOMIC_INT_COMPARE_AND_EXCHANGE(\
+#define CAS_ENTRY_STATUS(e,old,val) (g_atomic_int_compare_and_exchange(\
(&GST_CLOCK_ENTRY_STATUS(e)), (old), (val)))
/* Define this to get some extra debug about jitter from each clock_wait */
#undef WAIT_DEBUGGING
+#define GST_SYSTEM_CLOCK_GET_COND(clock) (&GST_SYSTEM_CLOCK_CAST(clock)->priv->entries_changed)
+#define GST_SYSTEM_CLOCK_WAIT(clock) g_cond_wait(GST_SYSTEM_CLOCK_GET_COND(clock),GST_OBJECT_GET_LOCK(clock))
+#define GST_SYSTEM_CLOCK_TIMED_WAIT(clock,tv) g_cond_timed_wait(GST_SYSTEM_CLOCK_GET_COND(clock),GST_OBJECT_GET_LOCK(clock),tv)
+#define GST_SYSTEM_CLOCK_BROADCAST(clock) g_cond_broadcast(GST_SYSTEM_CLOCK_GET_COND(clock))
+
struct _GstSystemClockPrivate
{
+ GThread *thread; /* thread for async notify */
+ gboolean stopping;
+
+ GList *entries;
+ GCond entries_changed;
+
GstClockType clock_type;
GstPoll *timer;
gint wakeup_count; /* the number of entries with a pending wakeup */
#ifdef G_OS_WIN32
LARGE_INTEGER start;
LARGE_INTEGER frequency;
+ guint64 ratio;
#endif /* G_OS_WIN32 */
+#ifdef __APPLE__
+ struct mach_timebase_info mach_timebase;
+#endif
};
-#define GST_SYSTEM_CLOCK_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_SYSTEM_CLOCK, \
- GstSystemClockPrivate))
-
#ifdef HAVE_POSIX_TIMERS
# ifdef HAVE_MONOTONIC_CLOCK
# define DEFAULT_CLOCK_TYPE GST_CLOCK_TYPE_MONOTONIC
/* the one instance of the systemclock */
static GstClock *_the_system_clock = NULL;
+static gboolean _external_default_clock = FALSE;
static void gst_system_clock_dispose (GObject * object);
static void gst_system_clock_set_property (GObject * object, guint prop_id,
static gboolean gst_system_clock_start_async (GstSystemClock * clock);
static void gst_system_clock_add_wakeup (GstSystemClock * sysclock);
-static GStaticMutex _gst_sysclock_mutex = G_STATIC_MUTEX_INIT;
+static GMutex _gst_sysclock_mutex;
/* static guint gst_system_clock_signals[LAST_SIGNAL] = { 0 }; */
#define gst_system_clock_parent_class parent_class
-G_DEFINE_TYPE (GstSystemClock, gst_system_clock, GST_TYPE_CLOCK);
+G_DEFINE_TYPE_WITH_PRIVATE (GstSystemClock, gst_system_clock, GST_TYPE_CLOCK);
static void
gst_system_clock_class_init (GstSystemClockClass * klass)
gobject_class = (GObjectClass *) klass;
gstclock_class = (GstClockClass *) klass;
- g_type_class_add_private (klass, sizeof (GstSystemClockPrivate));
-
gobject_class->dispose = gst_system_clock_dispose;
gobject_class->set_property = gst_system_clock_set_property;
gobject_class->get_property = gst_system_clock_get_property;
static void
gst_system_clock_init (GstSystemClock * clock)
{
+ GstSystemClockPrivate *priv;
+
GST_OBJECT_FLAG_SET (clock,
GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC |
GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC |
GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC |
GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC);
- clock->priv = GST_SYSTEM_CLOCK_GET_PRIVATE (clock);
+ clock->priv = priv = gst_system_clock_get_instance_private (clock);
- clock->priv->clock_type = DEFAULT_CLOCK_TYPE;
- clock->priv->timer = gst_poll_new_timer ();
+ priv->clock_type = DEFAULT_CLOCK_TYPE;
+ priv->timer = gst_poll_new_timer ();
+
+ priv->entries = NULL;
+ g_cond_init (&priv->entries_changed);
#ifdef G_OS_WIN32
- QueryPerformanceFrequency (&clock->priv->frequency);
+ QueryPerformanceFrequency (&priv->frequency);
/* can be 0 if the hardware does not have hardware support */
- if (clock->priv->frequency.QuadPart != 0)
+ if (priv->frequency.QuadPart != 0)
/* we take a base time so that time starts from 0 to ease debugging */
- QueryPerformanceCounter (&clock->priv->start);
+ QueryPerformanceCounter (&priv->start);
+ priv->ratio = GST_SECOND / priv->frequency.QuadPart;
#endif /* G_OS_WIN32 */
+#ifdef __APPLE__
+ mach_timebase_info (&priv->mach_timebase);
+#endif
+
#if 0
/* Uncomment this to start the async clock thread straight away */
GST_OBJECT_LOCK (clock);
{
GstClock *clock = (GstClock *) object;
GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+ GstSystemClockPrivate *priv = sysclock->priv;
GList *entries;
/* else we have to stop the thread */
GST_OBJECT_LOCK (clock);
- sysclock->stopping = TRUE;
+ priv->stopping = TRUE;
/* unschedule all entries */
- for (entries = clock->entries; entries; entries = g_list_next (entries)) {
+ for (entries = priv->entries; entries; entries = g_list_next (entries)) {
GstClockEntry *entry = (GstClockEntry *) entries->data;
GST_CAT_DEBUG (GST_CAT_CLOCK, "unscheduling entry %p", entry);
SET_ENTRY_STATUS (entry, GST_CLOCK_UNSCHEDULED);
}
- GST_CLOCK_BROADCAST (clock);
+ GST_SYSTEM_CLOCK_BROADCAST (clock);
gst_system_clock_add_wakeup (sysclock);
GST_OBJECT_UNLOCK (clock);
- if (sysclock->thread)
- g_thread_join (sysclock->thread);
- sysclock->thread = NULL;
+ if (priv->thread)
+ g_thread_join (priv->thread);
+ priv->thread = NULL;
GST_CAT_DEBUG (GST_CAT_CLOCK, "joined thread");
- g_list_foreach (clock->entries, (GFunc) gst_clock_id_unref, NULL);
- g_list_free (clock->entries);
- clock->entries = NULL;
+ g_list_foreach (priv->entries, (GFunc) gst_clock_id_unref, NULL);
+ g_list_free (priv->entries);
+ priv->entries = NULL;
- gst_poll_free (sysclock->priv->timer);
+ gst_poll_free (priv->timer);
+ g_cond_clear (&priv->entries_changed);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
/**
+ * gst_system_clock_set_default:
+ * @new_clock: (allow-none): a #GstClock
+ *
+ * Sets the default system clock that can be obtained with
+ * gst_system_clock_obtain().
+ *
+ * This is mostly used for testing and debugging purposes when you
+ * want to have control over the time reported by the default system
+ * clock.
+ *
+ * MT safe.
+ *
+ * Since: 1.4
+ */
+void
+gst_system_clock_set_default (GstClock * new_clock)
+{
+ GstClock *clock;
+
+ g_mutex_lock (&_gst_sysclock_mutex);
+ clock = _the_system_clock;
+
+ if (clock != NULL)
+ g_object_unref (clock);
+
+ if (new_clock == NULL) {
+ GST_CAT_DEBUG (GST_CAT_CLOCK, "resetting default system clock");
+ _external_default_clock = FALSE;
+ } else {
+ GST_CAT_DEBUG (GST_CAT_CLOCK, "setting new default system clock to %p",
+ new_clock);
+ _external_default_clock = TRUE;
+ g_object_ref (new_clock);
+ }
+ _the_system_clock = new_clock;
+ g_mutex_unlock (&_gst_sysclock_mutex);
+}
+
+/**
* gst_system_clock_obtain:
*
* Get a handle to the default system clock. The refcount of the
{
GstClock *clock;
- g_static_mutex_lock (&_gst_sysclock_mutex);
+ g_mutex_lock (&_gst_sysclock_mutex);
clock = _the_system_clock;
if (clock == NULL) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "creating new static system clock");
+ g_assert (!_external_default_clock);
clock = g_object_new (GST_TYPE_SYSTEM_CLOCK,
"name", "GstSystemClock", NULL);
- /* we created the global clock; take ownership so
- * we can hand out instances later */
+ /* Clear floating flag */
gst_object_ref_sink (clock);
-
_the_system_clock = clock;
- g_static_mutex_unlock (&_gst_sysclock_mutex);
+ g_mutex_unlock (&_gst_sysclock_mutex);
} else {
- g_static_mutex_unlock (&_gst_sysclock_mutex);
+ g_mutex_unlock (&_gst_sysclock_mutex);
GST_CAT_DEBUG (GST_CAT_CLOCK, "returning static system clock");
}
g_return_if_fail (sysclock->priv->wakeup_count > 0);
sysclock->priv->wakeup_count--;
- if (sysclock->priv->wakeup_count == 0) {
- /* read the control socket byte when we removed the last wakeup count */
- GST_CAT_DEBUG (GST_CAT_CLOCK, "reading control");
- while (!gst_poll_read_control (sysclock->priv->timer)) {
- g_warning ("gstsystemclock: read control failed, trying again\n");
+ GST_CAT_DEBUG (GST_CAT_CLOCK, "reading control");
+ while (!gst_poll_read_control (sysclock->priv->timer)) {
+ if (errno == EWOULDBLOCK) {
+ /* Try again and give other threads the chance to do something */
+ g_thread_yield ();
+ continue;
+ } else {
+ /* Critical error, GstPoll will have printed a critical warning already */
+ break;
}
- GST_CLOCK_BROADCAST (sysclock);
}
+ GST_SYSTEM_CLOCK_BROADCAST (sysclock);
GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d",
sysclock->priv->wakeup_count);
}
static void
gst_system_clock_add_wakeup (GstSystemClock * sysclock)
{
- /* only write the control socket for the first wakeup */
- if (sysclock->priv->wakeup_count == 0) {
- GST_CAT_DEBUG (GST_CAT_CLOCK, "writing control");
- while (!gst_poll_write_control (sysclock->priv->timer)) {
- if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
- g_warning
- ("gstsystemclock: write control failed in wakeup_async, trying again: %d:%s\n",
- errno, g_strerror (errno));
- } else {
- g_critical
- ("gstsystemclock: write control failed in wakeup_async: %d:%s\n",
- errno, g_strerror (errno));
- return;
- }
- }
- }
+ GST_CAT_DEBUG (GST_CAT_CLOCK, "writing control");
+ gst_poll_write_control (sysclock->priv->timer);
sysclock->priv->wakeup_count++;
GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d",
sysclock->priv->wakeup_count);
gst_system_clock_wait_wakeup (GstSystemClock * sysclock)
{
while (sysclock->priv->wakeup_count > 0) {
- GST_CLOCK_WAIT (sysclock);
+ GST_SYSTEM_CLOCK_WAIT (sysclock);
}
}
gst_system_clock_async_thread (GstClock * clock)
{
GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+ GstSystemClockPrivate *priv = sysclock->priv;
+ GstClockReturn status;
GST_CAT_DEBUG (GST_CAT_CLOCK, "enter system clock thread");
GST_OBJECT_LOCK (clock);
/* signal spinup */
- GST_CLOCK_BROADCAST (clock);
+ GST_SYSTEM_CLOCK_BROADCAST (clock);
/* now enter our (almost) infinite loop */
- while (!sysclock->stopping) {
+ while (!priv->stopping) {
GstClockEntry *entry;
GstClockTime requested;
GstClockReturn res;
/* check if something to be done */
- while (clock->entries == NULL) {
+ while (priv->entries == NULL) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "no clock entries, waiting..");
/* wait for work to do */
- GST_CLOCK_WAIT (clock);
+ GST_SYSTEM_CLOCK_WAIT (clock);
GST_CAT_DEBUG (GST_CAT_CLOCK, "got signal");
/* clock was stopping, exit */
- if (sysclock->stopping)
+ if (priv->stopping)
goto exit;
}
/* see if we have a pending wakeup because the order of the list
* changed. */
- if (sysclock->priv->async_wakeup) {
+ if (priv->async_wakeup) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "clear async wakeup");
gst_system_clock_remove_wakeup (sysclock);
- sysclock->priv->async_wakeup = FALSE;
+ priv->async_wakeup = FALSE;
}
/* pick the next entry */
- entry = clock->entries->data;
+ entry = priv->entries->data;
+
+ /* set entry status to busy before we release the clock lock */
+ do {
+ status = GET_ENTRY_STATUS (entry);
+
+ /* check for unscheduled */
+ if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED)) {
+ /* entry was unscheduled, move to the next one */
+ GST_CAT_DEBUG (GST_CAT_CLOCK, "async entry %p unscheduled", entry);
+ goto next_entry;
+ }
+
+ /* for periodic timers, status can be EARLY from a previous run */
+ if (G_UNLIKELY (status != GST_CLOCK_OK && status != GST_CLOCK_EARLY))
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+
+ /* mark the entry as busy but watch out for intermediate unscheduled
+ * statuses */
+ } while (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_BUSY)));
+
GST_OBJECT_UNLOCK (clock);
requested = entry->time;
- /* now wait for the entry, we already hold the lock */
+ /* now wait for the entry */
res =
gst_system_clock_id_wait_jitter_unlocked (clock, (GstClockID) entry,
NULL, FALSE);
/* adjust time now */
entry->time = requested + entry->interval;
/* and resort the list now */
- clock->entries =
- g_list_sort (clock->entries, gst_clock_id_compare_func);
+ priv->entries =
+ g_list_sort (priv->entries, gst_clock_id_compare_func);
/* and restart */
continue;
} else {
}
next_entry:
/* we remove the current entry and unref it */
- clock->entries = g_list_remove (clock->entries, entry);
+ priv->entries = g_list_remove (priv->entries, entry);
gst_clock_id_unref ((GstClockID) entry);
}
exit:
/* signal exit */
- GST_CLOCK_BROADCAST (clock);
+ GST_SYSTEM_CLOCK_BROADCAST (clock);
GST_OBJECT_UNLOCK (clock);
GST_CAT_DEBUG (GST_CAT_CLOCK, "exit system clock thread");
}
static GstClockTime
gst_system_clock_get_internal_time (GstClock * clock)
{
+#if defined __APPLE__
+ GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+ uint64_t mach_t = mach_absolute_time ();
+ return gst_util_uint64_scale (mach_t, sysclock->priv->mach_timebase.numer,
+ sysclock->priv->mach_timebase.denom);
+#else
#ifdef G_OS_WIN32
GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
/* we prefer the highly accurate performance counters on windows */
QueryPerformanceCounter (&now);
- return gst_util_uint64_scale (now.QuadPart - sysclock->priv->start.QuadPart,
- GST_SECOND, sysclock->priv->frequency.QuadPart);
+ return ((now.QuadPart -
+ sysclock->priv->start.QuadPart) * sysclock->priv->ratio);
} else
#endif /* G_OS_WIN32 */
-#if !defined HAVE_POSIX_TIMERS
+#if !defined HAVE_POSIX_TIMERS || !defined HAVE_CLOCK_GETTIME
{
GTimeVal timeval;
return GST_TIMESPEC_TO_TIME (ts);
}
#endif
+#endif /* __APPLE__ */
}
static guint64
gst_system_clock_get_resolution (GstClock * clock)
{
+#if defined __APPLE__
+ GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+ return gst_util_uint64_scale (GST_NSECOND,
+ sysclock->priv->mach_timebase.numer, sysclock->priv->mach_timebase.denom);
+#else
#ifdef G_OS_WIN32
GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
return GST_SECOND / sysclock->priv->frequency.QuadPart;
} else
#endif /* G_OS_WIN32 */
-#ifdef HAVE_POSIX_TIMERS
+#if defined(HAVE_POSIX_TIMERS) && defined(HAVE_CLOCK_GETTIME)
{
GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
clockid_t ptype;
return 1 * GST_USECOND;
}
#endif
+#endif /* __APPLE__ */
+}
+
+static inline void
+gst_system_clock_cleanup_unscheduled (GstSystemClock * sysclock,
+ GstClockEntry * entry)
+{
+ /* try to clean up.
+ * The unschedule function managed to set the status to
+ * unscheduled. We now take the lock and mark the entry as unscheduled.
+ * This makes sure that the unschedule function doesn't perform a
+ * wakeup anymore. If the unschedule function has a change to perform
+ * the wakeup before us, we clean up here */
+ GST_OBJECT_LOCK (sysclock);
+ entry->unscheduled = TRUE;
+ if (entry->woken_up) {
+ gst_system_clock_remove_wakeup (sysclock);
+ }
+ GST_OBJECT_UNLOCK (sysclock);
}
/* synchronously wait on the given GstClockEntry.
GstClockTimeDiff diff;
GstClockReturn status;
- if (G_UNLIKELY (GET_ENTRY_STATUS (entry) == GST_CLOCK_UNSCHEDULED))
+ status = GET_ENTRY_STATUS (entry);
+ if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED)) {
+ gst_system_clock_cleanup_unscheduled (sysclock, entry);
return GST_CLOCK_UNSCHEDULED;
+ }
/* need to call the overridden method because we want to sync against the time
* of the clock, whatever the subclass uses as a clock. */
while (TRUE) {
gint pollret;
- do {
- status = GET_ENTRY_STATUS (entry);
-
- /* stop when we are unscheduled */
- if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED))
- goto done;
-
- /* mark the entry as busy but watch out for intermediate unscheduled
- * statuses */
- } while (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_BUSY)));
-
/* now wait on the entry, it either times out or the fd is written. The
- * status of the entry is only BUSY around the poll. */
+ * status of the entry is BUSY only around the poll. */
pollret = gst_poll_wait (sysclock->priv->timer, diff);
/* get the new status, mark as DONE. We do this so that the unschedule
/* we were unscheduled, exit immediately */
if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED))
break;
+ if (G_UNLIKELY (status != GST_CLOCK_BUSY))
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
} while (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_DONE)));
GST_CAT_DEBUG (GST_CAT_CLOCK, "entry %p unlocked, status %d, ret %d",
entry, status, pollret);
if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED)) {
- /* try to clean up The unschedule function managed to set the status to
- * unscheduled. We now take the lock and mark the entry as unscheduled.
- * This makes sure that the unschedule function doesn't perform a
- * wakeup anymore. If the unschedule function has a change to perform
- * the wakeup before us, we clean up here */
- GST_OBJECT_LOCK (sysclock);
- entry->unscheduled = TRUE;
- if (entry->woken_up) {
- gst_system_clock_remove_wakeup (sysclock);
- }
- GST_OBJECT_UNLOCK (sysclock);
+ gst_system_clock_cleanup_unscheduled (sysclock, entry);
goto done;
} else {
if (G_UNLIKELY (pollret != 0)) {
if (diff <= 0) {
/* timeout, this is fine, we can report success now */
- status = GST_CLOCK_OK;
- SET_ENTRY_STATUS (entry, status);
+ if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, GST_CLOCK_DONE,
+ GST_CLOCK_OK))) {
+ status = GET_ENTRY_STATUS (entry);
+ if (status != GST_CLOCK_UNSCHEDULED)
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+ goto done;
+ } else {
+ status = GST_CLOCK_OK;
+ }
GST_CAT_DEBUG (GST_CAT_CLOCK,
"entry %p finished, diff %" G_GINT64_FORMAT, entry, diff);
} else {
GST_CAT_DEBUG (GST_CAT_CLOCK,
"entry %p restart, diff %" G_GINT64_FORMAT, entry, diff);
+ /* we are going to poll again, set status back to busy */
+ do {
+ status = GET_ENTRY_STATUS (entry);
+ /* we were unscheduled, exit immediately */
+ if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED))
+ goto done;
+ if (G_UNLIKELY (status != GST_CLOCK_DONE))
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+ } while (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status,
+ GST_CLOCK_BUSY)));
}
}
}
} else {
/* we are right on time or too late */
- if (G_UNLIKELY (diff == 0))
- status = GST_CLOCK_OK;
- else
- status = GST_CLOCK_EARLY;
-
- SET_ENTRY_STATUS (entry, status);
+ if (G_UNLIKELY (diff == 0)) {
+ if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_OK))) {
+ status = GET_ENTRY_STATUS (entry);
+ if (G_LIKELY (status == GST_CLOCK_UNSCHEDULED))
+ gst_system_clock_cleanup_unscheduled (sysclock, entry);
+ else
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+ } else {
+ status = GST_CLOCK_OK;
+ }
+ } else {
+ if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_EARLY))) {
+ status = GET_ENTRY_STATUS (entry);
+ if (G_LIKELY (status == GST_CLOCK_UNSCHEDULED))
+ gst_system_clock_cleanup_unscheduled (sysclock, entry);
+ else
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+ } else {
+ status = GST_CLOCK_EARLY;
+ }
+ }
}
done:
return status;
gst_system_clock_id_wait_jitter (GstClock * clock, GstClockEntry * entry,
GstClockTimeDiff * jitter)
{
+ GstClockReturn status;
+ do {
+ status = GET_ENTRY_STATUS (entry);
+
+ /* stop when we are unscheduled */
+ if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED))
+ return status;
+
+ if (G_UNLIKELY (status != GST_CLOCK_OK))
+ GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
+ status, entry);
+
+ /* mark the entry as busy but watch out for intermediate unscheduled
+ * statuses */
+ } while (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_BUSY)));
+
return gst_system_clock_id_wait_jitter_unlocked (clock, entry, jitter, TRUE);
}
gst_system_clock_start_async (GstSystemClock * clock)
{
GError *error = NULL;
+ GstSystemClockPrivate *priv = clock->priv;
- if (G_LIKELY (clock->thread != NULL))
+ if (G_LIKELY (priv->thread != NULL))
return TRUE; /* Thread already running. Nothing to do */
- clock->thread = g_thread_create ((GThreadFunc) gst_system_clock_async_thread,
- clock, TRUE, &error);
+ priv->thread = g_thread_try_new ("GstSystemClock",
+ (GThreadFunc) gst_system_clock_async_thread, clock, &error);
+
if (G_UNLIKELY (error))
goto no_thread;
/* wait for it to spin up */
- GST_CLOCK_WAIT (clock);
+ GST_SYSTEM_CLOCK_WAIT (clock);
return TRUE;
gst_system_clock_id_wait_async (GstClock * clock, GstClockEntry * entry)
{
GstSystemClock *sysclock;
+ GstSystemClockPrivate *priv;
GstClockEntry *head;
sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+ priv = sysclock->priv;
GST_CAT_DEBUG (GST_CAT_CLOCK, "adding async entry %p", entry);
if (G_UNLIKELY (GET_ENTRY_STATUS (entry) == GST_CLOCK_UNSCHEDULED))
goto was_unscheduled;
- if (clock->entries)
- head = clock->entries->data;
+ if (priv->entries)
+ head = priv->entries->data;
else
head = NULL;
/* need to take a ref */
gst_clock_id_ref ((GstClockID) entry);
/* insert the entry in sorted order */
- clock->entries = g_list_insert_sorted (clock->entries, entry,
+ priv->entries = g_list_insert_sorted (priv->entries, entry,
gst_clock_id_compare_func);
/* only need to send the signal if the entry was added to the
* front, else the thread is just waiting for another entry and
* will get to this entry automatically. */
- if (clock->entries->data == entry) {
+ if (priv->entries->data == entry) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "async entry added to head %p", head);
if (head == NULL) {
/* the list was empty before, signal the cond so that the async thread can
* start taking a look at the queue */
GST_CAT_DEBUG (GST_CAT_CLOCK, "first entry, sending signal");
- GST_CLOCK_BROADCAST (clock);
+ GST_SYSTEM_CLOCK_BROADCAST (clock);
} else {
GstClockReturn status;
GST_CAT_DEBUG (GST_CAT_CLOCK, "head entry is busy");
/* the async thread was waiting for an entry, unlock the wait so that it
* looks at the new head entry instead, we only need to do this once */
- if (!sysclock->priv->async_wakeup) {
+ if (!priv->async_wakeup) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup async thread");
- sysclock->priv->async_wakeup = TRUE;
+ priv->async_wakeup = TRUE;
gst_system_clock_add_wakeup (sysclock);
}
}
projects / platform / upstream / gstreamer.git / blobdiff