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

gst/gstregistry.c: Protect default registry with lock and ref/sink it.

Browse source 
Original commit message from CVS:
* gst/gstregistry.c: (gst_registry_get_default),
(_gst_registry_cleanup):
Protect default registry with lock and ref/sink it.
Fixes #324818, patch by Torsten Schoenfeld.
This commit is contained in:
Torsten Schoenfeld 2006-02-14 16:15:05 +00:00 committed by Wim Taymans
parent c1b135b4a3
commit 6ebad92626
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-02-14 Wim Taymans <wim@fluendo.com>
* gst/gstregistry.c: (gst_registry_get_default),
(_gst_registry_cleanup):
Protect default registry with lock and ref/sink it.
Fixes #324818, patch by Torsten Schoenfeld.
2006-02-14 Wim Taymans <wim@fluendo.com>
* gst/gstbuffer.c:

28
gst/gstregistry.c
View file

@ -52,7 +52,9 @@
#define GST_CAT_DEFAULT GST_CAT_REGISTRY
/* the one instance of the default registry */
/* the one instance of the default registry and the mutex protecting the
* variable. */
static GStaticMutex _gst_registry_mutex = G_STATIC_MUTEX_INIT;
static GstRegistry *_gst_registry_default = NULL;
/*
@ -208,10 +210,18 @@ gst_registry_finalize (GObject * object)
GstRegistry *
gst_registry_get_default (void)
{
if (!_gst_registry_default) {
GstRegistry *registry;
g_static_mutex_lock (&_gst_registry_mutex);
if (G_UNLIKELY (!_gst_registry_default)) {
_gst_registry_default = g_object_new (GST_TYPE_REGISTRY, NULL);
gst_object_ref (GST_OBJECT_CAST (_gst_registry_default));
gst_object_sink (GST_OBJECT_CAST (_gst_registry_default));
}
return _gst_registry_default;
registry = _gst_registry_default;
g_static_mutex_unlock (&_gst_registry_mutex);
return registry;
}
/**
@ -908,12 +918,18 @@ gst_registry_get_feature_list_by_plugin (GstRegistry * registry,
void
_gst_registry_cleanup ()
{
if (!_gst_registry_default)
return;
GstRegistry *registry;
gst_object_unref (_gst_registry_default);
g_static_mutex_lock (&_gst_registry_mutex);
if ((registry = _gst_registry_default) != NULL) {
_gst_registry_default = NULL;
}
g_static_mutex_unlock (&_gst_registry_mutex);
/* unref outside of the lock because we can. */
if (registry)
gst_object_unref (registry);
}
/**
* gst_default_registry_check_feature_version: