mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

session-pool: signal session-removed outside of the lock

Browse source 
Release the lock before emiting the session-removed signal.
This commit is contained in:
Wim Taymans 2014-07-10 12:20:15 +02:00
parent 945c93fde0
commit 301585b30f
1 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gst/rtsp-server/rtsp-session-pool.c
View file

@ -456,13 +456,15 @@ gst_rtsp_session_pool_remove (GstRTSPSessionPool * pool, GstRTSPSession * sess)
found = found =
g_hash_table_remove (priv->sessions, g_hash_table_remove (priv->sessions,
gst_rtsp_session_get_sessionid (sess)); gst_rtsp_session_get_sessionid (sess));
if (found) { if (found)
priv->sessions_cookie++; priv->sessions_cookie++;
g_mutex_unlock (&priv->lock);
if (found)
g_signal_emit (pool, gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED], g_signal_emit (pool, gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED],
0, sess); 0, sess);
}
g_object_unref (sess); g_object_unref (sess);
g_mutex_unlock (&priv->lock);
return found; return found;
} }
@ -471,6 +473,7 @@ typedef struct
{ {
GTimeVal now; GTimeVal now;
GstRTSPSessionPool *pool; GstRTSPSessionPool *pool;
GList *removed;
} CleanupData; } CleanupData;
static gboolean static gboolean
@ -480,9 +483,8 @@ cleanup_func (gchar * sessionid, GstRTSPSession * sess, CleanupData * data)
expired = gst_rtsp_session_is_expired (sess, &data->now); expired = gst_rtsp_session_is_expired (sess, &data->now);
if (expired) { if (expired) {
GST_DEBUG ("session expired, emitting signal"); GST_DEBUG ("session expired");
g_signal_emit (data->pool, data->removed = g_list_prepend (data->removed, g_object_ref (sess));
gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED], 0, sess);
} }
return expired; return expired;
} }
@ -502,6 +504,7 @@ gst_rtsp_session_pool_cleanup (GstRTSPSessionPool * pool)
GstRTSPSessionPoolPrivate *priv; GstRTSPSessionPoolPrivate *priv;
guint result; guint result;
CleanupData data; CleanupData data;
GList *walk;
g_return_val_if_fail (GST_IS_RTSP_SESSION_POOL (pool), 0); g_return_val_if_fail (GST_IS_RTSP_SESSION_POOL (pool), 0);
@ -509,6 +512,7 @@ gst_rtsp_session_pool_cleanup (GstRTSPSessionPool * pool)
g_get_current_time (&data.now); g_get_current_time (&data.now);
data.pool = pool; data.pool = pool;
data.removed = NULL;
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
result = result =
@ -518,6 +522,16 @@ gst_rtsp_session_pool_cleanup (GstRTSPSessionPool * pool)
priv->sessions_cookie++; priv->sessions_cookie++;
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
for (walk = data.removed; walk; walk = walk->next) {
GstRTSPSession *sess = walk->data;
g_signal_emit (pool,
gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED], 0, sess);
g_object_unref (sess);
}
g_list_free (data.removed);
return result; return result;
} }
@ -593,15 +607,31 @@ restart:
switch (res) { switch (res) {
case GST_RTSP_FILTER_REMOVE: case GST_RTSP_FILTER_REMOVE:
g_signal_emit (pool, {
gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED], 0, session); gboolean removed = TRUE;
if (changed) if (changed)
g_hash_table_remove (priv->sessions, key); /* something changed, check if we still have the session */
removed = g_hash_table_remove (priv->sessions, key);
else else
g_hash_table_iter_remove (&iter); g_hash_table_iter_remove (&iter);
if (removed) {
/* if we managed to remove the session, update the cookie and
* signal */
cookie = ++priv->sessions_cookie; cookie = ++priv->sessions_cookie;
g_mutex_unlock (&priv->lock);
g_signal_emit (pool,
gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED], 0,
session);
g_mutex_lock (&priv->lock);
/* cookie could have changed again, make sure we restart */
changed |= (cookie != priv->sessions_cookie);
}
break; break;
}
case GST_RTSP_FILTER_REF: case GST_RTSP_FILTER_REF:
/* keep ref */ /* keep ref */
result = g_list_prepend (result, g_object_ref (session)); result = g_list_prepend (result, g_object_ref (session));