mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

thread-pool: Unref reused threads in gst_rtsp_thread_stop()

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=723519
This commit is contained in:
Ognyan Tonchev 2014-01-31 15:02:22 +01:00 committed by Wim Taymans
parent 71c45fce5a
commit 274d4b017f
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,12 +133,17 @@ gboolean
gst_rtsp_thread_reuse (GstRTSPThread * thread) gst_rtsp_thread_reuse (GstRTSPThread * thread)
{ {
GstRTSPThreadImpl *impl = (GstRTSPThreadImpl *) thread; GstRTSPThreadImpl *impl = (GstRTSPThreadImpl *) thread;
gboolean res;
g_return_val_if_fail (GST_IS_RTSP_THREAD (thread), FALSE); g_return_val_if_fail (GST_IS_RTSP_THREAD (thread), FALSE);
GST_DEBUG ("reuse thread %p", thread); GST_DEBUG ("reuse thread %p", thread);
return g_atomic_int_add (&impl->reused, 1) > 0; res = g_atomic_int_add (&impl->reused, 1) > 0;
if (res)
gst_rtsp_thread_ref (thread);
return res;
} }
static gboolean static gboolean
@ -174,7 +179,8 @@ gst_rtsp_thread_stop (GstRTSPThread * thread)
thread, (GDestroyNotify) gst_rtsp_thread_unref); thread, (GDestroyNotify) gst_rtsp_thread_unref);
g_source_attach (source, thread->context); g_source_attach (source, thread->context);
g_source_unref (source); g_source_unref (source);
} } else
gst_rtsp_thread_unref (thread);
} }
#define GST_RTSP_THREAD_POOL_GET_PRIVATE(obj) \ #define GST_RTSP_THREAD_POOL_GET_PRIVATE(obj) \
@ -458,7 +464,6 @@ default_get_thread (GstRTSPThreadPool * pool,
* stops. */ * stops. */
goto retry; goto retry;
} }
gst_rtsp_thread_ref (thread);
} else { } else {
/* make more threads */ /* make more threads */
GST_DEBUG_OBJECT (pool, "make new client thread"); GST_DEBUG_OBJECT (pool, "make new client thread");

4
tests/check/gst/threadpool.c
View file

@ -34,6 +34,8 @@ GST_START_TEST (test_pool_get_thread)
thread = gst_rtsp_thread_pool_get_thread (pool, GST_RTSP_THREAD_TYPE_CLIENT, thread = gst_rtsp_thread_pool_get_thread (pool, GST_RTSP_THREAD_TYPE_CLIENT,
NULL); NULL);
fail_unless (thread != NULL); fail_unless (thread != NULL);
/* one ref is hold by the pool */
fail_unless (GST_MINI_OBJECT_REFCOUNT (thread) == 2);
gst_rtsp_thread_stop (thread); gst_rtsp_thread_stop (thread);
g_object_unref (pool); g_object_unref (pool);
@ -62,6 +64,8 @@ GST_START_TEST (test_pool_get_thread_reuse)
fail_unless (thread2 != NULL); fail_unless (thread2 != NULL);
fail_unless (thread == thread2); fail_unless (thread == thread2);
/* one ref is hold by the pool */
fail_unless (GST_MINI_OBJECT_REFCOUNT (thread) == 3);
gst_rtsp_thread_stop (thread); gst_rtsp_thread_stop (thread);
gst_rtsp_thread_stop (thread2); gst_rtsp_thread_stop (thread2);