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

gst/: Revert previous change until I figure out why it breaks distcheck.

Browse source 
Original commit message from CVS:
* gst/gst.c: (init_pre), (scan_and_update_registry),
(ensure_current_registry_nonforking),
(ensure_current_registry_forking), (ensure_current_registry),
(init_post), (gst_debug_help), (gst_deinit):
* gst/gst_private.h:
* gst/gstregistry.c: (gst_registry_finalize),
(gst_registry_remove_plugin), (gst_registry_scan_path_level),
(gst_registry_scan_path), (_gst_registry_remove_cache_plugins),
(_gst_registry_cleanup):
* gst/gstregistry.h:
Revert previous change until I figure out why it breaks distcheck.
This commit is contained in:
Jan Schmidt 2006-09-27 17:42:47 +00:00
parent b5cd597ca9
commit a8bbbf2e2d
5 changed files with 57 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2006-09-27 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gst.c: (init_pre), (scan_and_update_registry),
(ensure_current_registry_nonforking),
(ensure_current_registry_forking), (ensure_current_registry),
(init_post), (gst_debug_help), (gst_deinit):
* gst/gst_private.h:
* gst/gstregistry.c: (gst_registry_finalize),
(gst_registry_remove_plugin), (gst_registry_scan_path_level),
(gst_registry_scan_path), (_gst_registry_remove_cache_plugins),
(_gst_registry_cleanup):
* gst/gstregistry.h:
Revert previous change until I figure out why it breaks distcheck.
2006-09-27 Jan Schmidt <thaytan@mad.scientist.com> 2006-09-27 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gst.c: (init_pre), (scan_and_update_registry), * gst/gst.c: (init_pre), (scan_and_update_registry),

72
gst/gst.c
View file

@ -142,10 +142,8 @@ gboolean _gst_disable_segtrap = FALSE;
static gboolean _gst_enable_registry_fork = DEFAULT_FORK; static gboolean _gst_enable_registry_fork = DEFAULT_FORK;
static void load_plugin_func (gpointer data, gpointer user_data); static void load_plugin_func (gpointer data, gpointer user_data);
static gboolean init_pre (GOptionContext * context, GOptionGroup * group, static gboolean init_pre (void);
gpointer data, GError ** error); static gboolean init_post (void);
static gboolean init_post (GOptionContext * context, GOptionGroup * group,
gpointer data, GError ** error);
static gboolean parse_goption_arg (const gchar * s_opt, static gboolean parse_goption_arg (const gchar * s_opt,
const gchar * arg, gpointer data, GError ** err); const gchar * arg, gpointer data, GError ** err);
@ -488,8 +486,7 @@ split_and_iterate (const gchar * stringlist, gchar * separator, GFunc iterator,
/* we have no fail cases yet, but maybe in the future */ /* we have no fail cases yet, but maybe in the future */
static gboolean static gboolean
init_pre (GOptionContext * context, GOptionGroup * group, gpointer data, init_pre (void)
GError ** error)
{ {
/* GStreamer was built against a GLib >= 2.8 and is therefore not doing /* GStreamer was built against a GLib >= 2.8 and is therefore not doing
* the refcount hack. Check that it isn't being run against an older GLib */ * the refcount hack. Check that it isn't being run against an older GLib */
@ -580,7 +577,7 @@ static GstPluginDesc plugin_desc = {
*/ */
static gboolean static gboolean
scan_and_update_registry (GstRegistry * default_registry, scan_and_update_registry (GstRegistry * default_registry,
const gchar * registry_file, gboolean write_changes, GError ** error) const gchar * registry_file, gboolean write_changes)
{ {
const gchar *plugin_path; const gchar *plugin_path;
gboolean changed = FALSE; gboolean changed = FALSE;
@ -647,38 +644,34 @@ scan_and_update_registry (GstRegistry * default_registry,
g_strfreev (list); g_strfreev (list);
} }
/* Remove cached plugins so stale info is cleared. */
changed |= _priv_gst_registry_remove_cache_plugins (default_registry);
if (!changed) { if (!changed) {
GST_INFO ("Registry cache has not changed"); GST_DEBUG ("registry cache has not changed");
return TRUE; return TRUE;
} }
if (!write_changes) { if (!write_changes) {
GST_INFO ("Registry cached changed, but writing is disabled. Not writing."); GST_DEBUG ("not trying to write registry cache changes to file");
return TRUE; return TRUE;
} }
GST_INFO ("Registry cache changed. Writing new registry cache"); GST_DEBUG ("writing registry cache");
if (!gst_registry_xml_write_cache (default_registry, registry_file)) { if (!gst_registry_xml_write_cache (default_registry, registry_file)) {
g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED, g_warning ("Problem writing registry cache to %s: %s", registry_file,
_("Error writing registry cache to %s: %s"), g_strerror (errno));
registry_file, g_strerror (errno));
return FALSE; return FALSE;
} }
GST_INFO ("Registry cache written successfully"); GST_DEBUG ("registry cache written successfully");
return TRUE; return TRUE;
} }
static gboolean static gboolean
ensure_current_registry_nonforking (GstRegistry * default_registry, ensure_current_registry_nonforking (GstRegistry * default_registry,
const gchar * registry_file, GError ** error) const gchar * registry_file)
{ {
/* fork() not available */ /* fork() not available */
GST_DEBUG ("Updating registry cache in-process"); GST_DEBUG ("updating registry cache");
scan_and_update_registry (default_registry, registry_file, TRUE, error); scan_and_update_registry (default_registry, registry_file, TRUE);
return TRUE; return TRUE;
} }
@ -686,14 +679,14 @@ ensure_current_registry_nonforking (GstRegistry * default_registry,
* TRUE immediatly */ * TRUE immediatly */
static gboolean static gboolean
ensure_current_registry_forking (GstRegistry * default_registry, ensure_current_registry_forking (GstRegistry * default_registry,
const gchar * registry_file, GError ** error) const gchar * registry_file)
{ {
#ifdef HAVE_FORK #ifdef HAVE_FORK
pid_t pid; pid_t pid;
/* We fork here, and let the child read and possibly rebuild the registry. /* We fork here, and let the child read and possibly rebuild the registry.
* After that, the parent will re-read the freshly generated registry. */ * After that, the parent will re-read the freshly generated registry. */
GST_DEBUG ("forking to update registry"); GST_DEBUG ("forking");
pid = fork (); pid = fork ();
if (pid == -1) { if (pid == -1) {
GST_ERROR ("Failed to fork()"); GST_ERROR ("Failed to fork()");
@ -705,8 +698,8 @@ ensure_current_registry_forking (GstRegistry * default_registry,
/* this is the child */ /* this is the child */
GST_DEBUG ("child reading registry cache"); GST_DEBUG ("child reading registry cache");
res = res = scan_and_update_registry (default_registry, registry_file, TRUE);
scan_and_update_registry (default_registry, registry_file, TRUE, NULL); _gst_registry_remove_cache_plugins (default_registry);
/* need to use _exit, so that any exit handlers registered don't /* need to use _exit, so that any exit handlers registered don't
* bring down the main program */ * bring down the main program */
@ -726,9 +719,6 @@ ensure_current_registry_forking (GstRegistry * default_registry,
GST_DEBUG ("parent done waiting on child"); GST_DEBUG ("parent done waiting on child");
if (ret == -1) { if (ret == -1) {
GST_ERROR ("error during waitpid: %s", g_strerror (errno)); GST_ERROR ("error during waitpid: %s", g_strerror (errno));
g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
_("Error re-scanning registry %s: %s"),
", waitpid returned error", g_strerror (errno));
return FALSE; return FALSE;
} }
@ -736,14 +726,8 @@ ensure_current_registry_forking (GstRegistry * default_registry,
if (WIFSIGNALED (status)) { if (WIFSIGNALED (status)) {
GST_ERROR ("child did not exit normally, terminated by signal %d", GST_ERROR ("child did not exit normally, terminated by signal %d",
WTERMSIG (status)); WTERMSIG (status));
g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
_("Error re-scanning registry %s: %d"),
", child terminated by signal", WTERMSIG (status));
} else { } else {
GST_ERROR ("child did not exit normally, status: %d", status); GST_ERROR ("child did not exit normally, status: %d", status);
g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
_("Error re-scanning registry %s: %d"),
", child did not exit normally, status", status);
} }
return FALSE; return FALSE;
} }
@ -755,8 +739,8 @@ ensure_current_registry_forking (GstRegistry * default_registry,
GST_DEBUG ("parent reading registry cache"); GST_DEBUG ("parent reading registry cache");
gst_registry_xml_read_cache (default_registry, registry_file); gst_registry_xml_read_cache (default_registry, registry_file);
} else { } else {
GST_DEBUG ("parent re-scanning registry. Ignoring errors."); GST_DEBUG ("parent re-scanning registry");
scan_and_update_registry (default_registry, registry_file, FALSE, NULL); scan_and_update_registry (default_registry, registry_file, FALSE);
} }
} }
#endif /* HAVE_FORK */ #endif /* HAVE_FORK */
@ -764,7 +748,7 @@ ensure_current_registry_forking (GstRegistry * default_registry,
} }
static gboolean static gboolean
ensure_current_registry (GError ** error) ensure_current_registry (void)
{ {
char *registry_file; char *registry_file;
GstRegistry *default_registry; GstRegistry *default_registry;
@ -793,12 +777,10 @@ ensure_current_registry (GError ** error)
/* now check registry with or without forking */ /* now check registry with or without forking */
if (do_fork) { if (do_fork) {
GST_DEBUG ("forking for registry rebuild"); GST_DEBUG ("forking for registry rebuild");
ret = ensure_current_registry_forking (default_registry, registry_file, ret = ensure_current_registry_forking (default_registry, registry_file);
error);
} else { } else {
GST_DEBUG ("requested not to fork for registry rebuild"); GST_DEBUG ("requested not to fork for registry rebuild");
ret = ensure_current_registry_nonforking (default_registry, registry_file, ret = ensure_current_registry_nonforking (default_registry, registry_file);
error);
} }
g_free (registry_file); g_free (registry_file);
@ -819,8 +801,7 @@ ensure_current_registry (GError ** error)
* we might and then it's nice to be able to return that * we might and then it's nice to be able to return that
*/ */
static gboolean static gboolean
init_post (GOptionContext * context, GOptionGroup * group, gpointer data, init_post (void)
GError ** error)
{ {
GLogLevelFlags llf; GLogLevelFlags llf;
@ -873,7 +854,7 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
gst_initialized = TRUE; gst_initialized = TRUE;
#ifndef GST_DISABLE_REGISTRY #ifndef GST_DISABLE_REGISTRY
if (!ensure_current_registry (error)) if (!ensure_current_registry ())
return FALSE; return FALSE;
#endif /* GST_DISABLE_REGISTRY */ #endif /* GST_DISABLE_REGISTRY */
@ -913,8 +894,7 @@ gst_debug_help (void)
GSList *list, *walk; GSList *list, *walk;
GList *list2, *g; GList *list2, *g;
/* Need to ensure the registry is loaded to get debug categories */ if (!init_post ())
if (!init_post (NULL, NULL, NULL, NULL))
exit (1); exit (1);
list2 = gst_registry_plugin_filter (gst_registry_get_default (), list2 = gst_registry_plugin_filter (gst_registry_get_default (),
@ -1094,7 +1074,7 @@ gst_deinit (void)
gst_object_unref (clock); gst_object_unref (clock);
gst_object_unref (clock); gst_object_unref (clock);
_priv_gst_registry_cleanup (); _gst_registry_cleanup ();
gst_initialized = FALSE; gst_initialized = FALSE;
GST_INFO ("deinitialized GStreamer"); GST_INFO ("deinitialized GStreamer");

7
gst/gst_private.h
View file

@ -37,9 +37,6 @@ extern const char g_log_domain_gstreamer[];
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/* Needed for GstRegistry * */
#include "gstregistry.h"
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean __gst_in_valgrind (void); gboolean __gst_in_valgrind (void);
@ -47,10 +44,6 @@ gboolean __gst_in_valgrind (void);
/* Initialize GStreamer private quark storage */ /* Initialize GStreamer private quark storage */
void _priv_gst_quarks_initialize (void); void _priv_gst_quarks_initialize (void);
/* Private registry functions */
gboolean _priv_gst_registry_remove_cache_plugins (GstRegistry *registry);
void _priv_gst_registry_cleanup (void);
/*** debugging categories *****************************************************/ /*** debugging categories *****************************************************/
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG

61
gst/gstregistry.c
View file

@ -180,7 +180,7 @@ gst_registry_finalize (GObject * object)
if (plugin) { if (plugin) {
GST_DEBUG_OBJECT (registry, "removing plugin %s", GST_DEBUG_OBJECT (registry, "removing plugin %s",
gst_plugin_get_name (plugin)); gst_plugin_get_name (plugin));
gst_object_unref (plugin); gst_registry_remove_plugin (registry, plugin);
} }
p = g_list_next (p); p = g_list_next (p);
} }
@ -194,9 +194,7 @@ gst_registry_finalize (GObject * object)
GstPluginFeature *feature = f->data; GstPluginFeature *feature = f->data;
if (feature) { if (feature) {
GST_DEBUG_OBJECT (registry, "removing feature %p (%s)", gst_registry_remove_feature (registry, feature);
feature, gst_plugin_feature_get_name (feature));
gst_object_unref (feature);
} }
f = g_list_next (f); f = g_list_next (f);
} }
@ -346,33 +344,6 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin)
return TRUE; return TRUE;
} }
static void
gst_registry_remove_features_for_plugin_unlocked (GstRegistry * registry,
GstPlugin * plugin)
{
GList *f;
g_return_if_fail (GST_IS_REGISTRY (registry));
g_return_if_fail (GST_IS_PLUGIN (plugin));
/* Remove all features for this plugin */
f = registry->features;
while (f != NULL) {
GList *next = g_list_next (f);
GstPluginFeature *feature = f->data;
if (feature && !strcmp (feature->plugin_name, gst_plugin_get_name (plugin))) {
GST_DEBUG_OBJECT (registry, "removing feature %p (%s) for plugin %s",
feature, gst_plugin_feature_get_name (feature),
gst_plugin_get_name (plugin));
registry->features = g_list_delete_link (registry->features, f);
gst_object_unref (feature);
}
f = next;
}
}
/** /**
* gst_registry_remove_plugin: * gst_registry_remove_plugin:
* @registry: the registry to remove the plugin from * @registry: the registry to remove the plugin from
@ -388,12 +359,8 @@ gst_registry_remove_plugin (GstRegistry * registry, GstPlugin * plugin)
g_return_if_fail (GST_IS_REGISTRY (registry)); g_return_if_fail (GST_IS_REGISTRY (registry));
g_return_if_fail (GST_IS_PLUGIN (plugin)); g_return_if_fail (GST_IS_PLUGIN (plugin));
GST_DEBUG_OBJECT (registry, "removing plugin %p (%s)",
plugin, gst_plugin_get_name (plugin));
GST_OBJECT_LOCK (registry); GST_OBJECT_LOCK (registry);
registry->plugins = g_list_remove (registry->plugins, plugin); registry->plugins = g_list_remove (registry->plugins, plugin);
gst_registry_remove_features_for_plugin_unlocked (registry, plugin);
GST_OBJECT_UNLOCK (registry); GST_OBJECT_UNLOCK (registry);
gst_object_unref (plugin); gst_object_unref (plugin);
} }
@ -877,6 +844,8 @@ gst_registry_scan_path_level (GstRegistry * registry, const gchar * path,
g_dir_close (dir); g_dir_close (dir);
GST_DEBUG_OBJECT (registry, "registry changed? %d", changed);
return changed; return changed;
} }
@ -902,22 +871,19 @@ gst_registry_scan_path (GstRegistry * registry, const gchar * path)
GST_DEBUG_OBJECT (registry, "scanning path %s", path); GST_DEBUG_OBJECT (registry, "scanning path %s", path);
changed = gst_registry_scan_path_level (registry, path, 10); changed = gst_registry_scan_path_level (registry, path, 10);
GST_DEBUG_OBJECT (registry, "registry changed in path %s: %d", path, changed); GST_DEBUG_OBJECT (registry, "registry changed? %d", changed);
return changed; return changed;
} }
/* Unref all plugins marked 'cached', to clear old plugins that no void
* longer exist. Returns TRUE if any plugins were removed */ _gst_registry_remove_cache_plugins (GstRegistry * registry)
gboolean
_priv_gst_registry_remove_cache_plugins (GstRegistry * registry)
{ {
GList *g; GList *g;
GList *g_next; GList *g_next;
GstPlugin *plugin; GstPlugin *plugin;
gboolean changed = FALSE;
g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE); g_return_if_fail (GST_IS_REGISTRY (registry));
GST_OBJECT_LOCK (registry); GST_OBJECT_LOCK (registry);
@ -929,16 +895,16 @@ _priv_gst_registry_remove_cache_plugins (GstRegistry * registry)
if (plugin->flags & GST_PLUGIN_FLAG_CACHED) { if (plugin->flags & GST_PLUGIN_FLAG_CACHED) {
GST_DEBUG_OBJECT (registry, "removing cached plugin \"%s\"", GST_DEBUG_OBJECT (registry, "removing cached plugin \"%s\"",
GST_STR_NULL (plugin->filename)); GST_STR_NULL (plugin->filename));
registry->plugins = g_list_delete_link (registry->plugins, g); /* seems it would be sufficient just to do a delete_link for o(1) deletion
* -- we have to traverse the whole list anyway, and dup entries (if
* possible) should have dup refcounts */
registry->plugins = g_list_remove (registry->plugins, plugin);
gst_object_unref (plugin); gst_object_unref (plugin);
changed = TRUE;
} }
g = g_next; g = g_next;
} }
GST_OBJECT_UNLOCK (registry); GST_OBJECT_UNLOCK (registry);
return changed;
} }
@ -969,9 +935,8 @@ gst_registry_get_feature_list_by_plugin (GstRegistry * registry,
_gst_plugin_feature_filter_plugin_name, FALSE, (gpointer) name); _gst_plugin_feature_filter_plugin_name, FALSE, (gpointer) name);
} }
/* Unref and delete the default registry */
void void
_priv_gst_registry_cleanup () _gst_registry_cleanup ()
{ {
GstRegistry *registry; GstRegistry *registry;

4
gst/gstregistry.h
View file

@ -109,6 +109,10 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c
gboolean gst_registry_xml_read_cache (GstRegistry * registry, const char *location); gboolean gst_registry_xml_read_cache (GstRegistry * registry, const char *location);
gboolean gst_registry_xml_write_cache (GstRegistry * registry, const char *location); gboolean gst_registry_xml_write_cache (GstRegistry * registry, const char *location);
void _gst_registry_remove_cache_plugins (GstRegistry *registry);
void _gst_registry_cleanup (void);
/* convinience defines for the default registry */ /* convinience defines for the default registry */
/** /**