mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

thread-pool: Fix thread leak when reusing threads

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=709730
This commit is contained in:
Ognyan Tonchev 2013-10-09 15:25:10 +02:00 committed by Sebastian Dröge
parent de7be1c9b2
commit 78e5a9148e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/rtsp-server/rtsp-thread-pool.c
View file

@ -143,10 +143,10 @@ gst_rtsp_thread_reuse (GstRTSPThread * thread)
/** /**
* gst_rtsp_thread_stop: * gst_rtsp_thread_stop:
* @thread: a #GstRTSPThread * @thread: (transfer full): a #GstRTSPThread
* *
* Stop @thread. When no threads are using the mainloop, the thread will be * Stop and unref @thread. When no threads are using the mainloop, the thread
* stopped and the final ref to @thread will be released. * will be stopped and the final ref to @thread will be released.
*/ */
void void
gst_rtsp_thread_stop (GstRTSPThread * thread) gst_rtsp_thread_stop (GstRTSPThread * thread)
@ -161,6 +161,8 @@ gst_rtsp_thread_stop (GstRTSPThread * thread)
GST_DEBUG ("stop mainloop of thread %p", thread); GST_DEBUG ("stop mainloop of thread %p", thread);
g_main_loop_quit (thread->loop); g_main_loop_quit (thread->loop);
} }
gst_rtsp_thread_unref (thread);
} }
#define GST_RTSP_THREAD_POOL_GET_PRIVATE(obj) \ #define GST_RTSP_THREAD_POOL_GET_PRIVATE(obj) \
@ -450,7 +452,8 @@ default_get_thread (GstRTSPThreadPool * pool,
GST_DEBUG_OBJECT (pool, "make new client thread"); GST_DEBUG_OBJECT (pool, "make new client thread");
thread = make_thread (pool, type, ctx); thread = make_thread (pool, type, ctx);
if (!g_thread_pool_push (klass->pool, thread, &error)) if (!g_thread_pool_push (klass->pool, gst_rtsp_thread_ref (thread),
&error))
goto thread_error; goto thread_error;
} }
g_queue_push_tail (&priv->threads, thread); g_queue_push_tail (&priv->threads, thread);
@ -461,7 +464,8 @@ default_get_thread (GstRTSPThreadPool * pool,
GST_DEBUG_OBJECT (pool, "make new media thread"); GST_DEBUG_OBJECT (pool, "make new media thread");
thread = make_thread (pool, type, ctx); thread = make_thread (pool, type, ctx);
if (!g_thread_pool_push (klass->pool, thread, &error)) if (!g_thread_pool_push (klass->pool, gst_rtsp_thread_ref (thread),
&error))
goto thread_error; goto thread_error;
break; break;
default: default:
@ -475,6 +479,8 @@ thread_error:
{ {
GST_ERROR_OBJECT (pool, "failed to push thread %s", error->message); GST_ERROR_OBJECT (pool, "failed to push thread %s", error->message);
gst_rtsp_thread_unref (thread); gst_rtsp_thread_unref (thread);
/* drop also the ref dedicated for the pool */
gst_rtsp_thread_unref (thread);
g_clear_error (&error); g_clear_error (&error);
return NULL; return NULL;
} }