mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-24 16:18:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Task: remember pool

Browse source 
Remember the pool we currently have our task running so that we can use it to
join the task later on.
Fix a leak of the taskpool.
This commit is contained in:
Wim Taymans 2009-04-23 17:05:21 +02:00 committed by Wim Taymans
parent 8ada09abac
commit a8d2516fa6
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/gsttask.c
View file

@ -80,8 +80,12 @@ struct _GstTaskPrivate
gboolean prio_set; gboolean prio_set;
GThreadPriority priority; GThreadPriority priority;
/* configured pool */
GstTaskPool *pool; GstTaskPool *pool;
/* remember the pool and id that is currently running. */
gpointer id; gpointer id;
GstTaskPool *pool_id;
}; };
static void gst_task_class_init (GstTaskClass * klass); static void gst_task_class_init (GstTaskClass * klass);
@ -162,6 +166,8 @@ gst_task_finalize (GObject * object)
priv->thr_notify = NULL; priv->thr_notify = NULL;
priv->thr_user_data = NULL; priv->thr_user_data = NULL;
gst_object_unref (priv->pool);
/* task thread cannot be running here since it holds a ref /* task thread cannot be running here since it holds a ref
* to the task so that the finalize could not have happened */ * to the task so that the finalize could not have happened */
g_cond_free (task->cond); g_cond_free (task->cond);
@ -488,8 +494,10 @@ start_task (GstTask * task)
tclass = GST_TASK_GET_CLASS (task); tclass = GST_TASK_GET_CLASS (task);
/* push on the thread pool */ /* push on the thread pool, we remember the original pool because the user
priv->id = gst_task_pool_push (priv->pool, task, &error); * could change it later on and then we join to the wrong pool. */
priv->pool_id = gst_object_ref (priv->pool);
priv->id = gst_task_pool_push (priv->pool_id, task, &error);
if (error != NULL) { if (error != NULL) {
g_warning ("failed to create thread: %s", error->message); g_warning ("failed to create thread: %s", error->message);
@ -671,8 +679,9 @@ gst_task_join (GstTask * task)
task->abidata.ABI.thread = NULL; task->abidata.ABI.thread = NULL;
/* get the id and pool to join */ /* get the id and pool to join */
if ((id = priv->id)) { if ((id = priv->id)) {
if ((pool = priv->pool)) if ((pool = priv->pool_id))
gst_object_ref (pool); gst_object_ref (pool);
priv->pool_id = NULL;
priv->id = NULL; priv->id = NULL;
} }
GST_OBJECT_UNLOCK (task); GST_OBJECT_UNLOCK (task);