mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix threading on non-optimized atomic architectures. This unfortunately requires initializing threading in init_pre b...

Browse source 
Original commit message from CVS:
fix threading on non-optimized atomic architectures. This unfortunately requires initializing threading in init_pre because the debugging subsystem needs this. Therefore the --gst-nothreads command line option does not work anymore. So I erased it. You can however still call gst_use_threads (FALSE); before calling gst_init
This commit is contained in:
Benjamin Otte 2003-07-03 18:34:36 +00:00
parent 2ebb88a354
commit 568de85efc
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/gst.c
View file

@ -98,7 +98,6 @@ enum {
ARG_PLUGIN_PATH, ARG_PLUGIN_PATH,
ARG_PLUGIN_LOAD, ARG_PLUGIN_LOAD,
ARG_SCHEDULER, ARG_SCHEDULER,
ARG_NOTHREADS,
ARG_REGISTRY ARG_REGISTRY
}; };
@ -125,7 +124,6 @@ static const struct poptOption gstreamer_options[] = {
{"gst-plugin-path", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_PATH, "'" G_SEARCHPATH_SEPARATOR_S "'--separated path list for loading plugins", "PATHS"}, {"gst-plugin-path", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_PATH, "'" G_SEARCHPATH_SEPARATOR_S "'--separated path list for loading plugins", "PATHS"},
{"gst-plugin-load", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_LOAD, "comma-separated list of plugins to preload in addition to the list stored in env variable GST_PLUGIN_PATH", "PLUGINS"}, {"gst-plugin-load", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_LOAD, "comma-separated list of plugins to preload in addition to the list stored in env variable GST_PLUGIN_PATH", "PLUGINS"},
{"gst-scheduler", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER, "scheduler to use ('"GST_SCHEDULER_DEFAULT_NAME"' is the default)", "SCHEDULER"}, {"gst-scheduler", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER, "scheduler to use ('"GST_SCHEDULER_DEFAULT_NAME"' is the default)", "SCHEDULER"},
{"gst-nothreads", NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_NOTHREADS, "use NOPs for all threading and locking operations", NULL},
{"gst-registry", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_REGISTRY, "registry to use" , "REGISTRY"}, {"gst-registry", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_REGISTRY, "registry to use" , "REGISTRY"},
POPT_TABLEEND POPT_TABLEEND
}; };
@ -386,7 +384,18 @@ init_pre (void)
g_type_init (); g_type_init ();
if (g_thread_supported ()) {
/* somebody already initialized threading */
_gst_use_threads = TRUE;
} else {
if (_gst_use_threads)
g_thread_init (NULL);
else
g_thread_init (&gst_thread_dummy_functions);
}
/* we need threading to be enabled right here */
_gst_debug_init(); _gst_debug_init();
#ifndef GST_DISABLE_REGISTRY #ifndef GST_DISABLE_REGISTRY
{ {
const gchar *debug_list; const gchar *debug_list;
@ -484,13 +493,6 @@ init_post (void)
GstTrace *gst_trace; GstTrace *gst_trace;
#endif /* GST_DISABLE_TRACE */ #endif /* GST_DISABLE_TRACE */
if (!g_thread_supported ()) {
if (_gst_use_threads)
g_thread_init (NULL);
else
g_thread_init (&gst_thread_dummy_functions);
}
llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL; llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL); g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL);
@ -670,9 +672,6 @@ init_popt_callback (poptContext context, enum poptCallbackReason reason,
case ARG_SCHEDULER: case ARG_SCHEDULER:
gst_scheduler_factory_set_default_name (arg); gst_scheduler_factory_set_default_name (arg);
break; break;
case ARG_NOTHREADS:
gst_use_threads (FALSE);
break;
case ARG_REGISTRY: case ARG_REGISTRY:
#ifndef GST_DISABLE_REGISTRY #ifndef GST_DISABLE_REGISTRY
g_object_set (G_OBJECT (_user_registry), "location", arg, NULL); g_object_set (G_OBJECT (_user_registry), "location", arg, NULL);
@ -699,10 +698,17 @@ init_popt_callback (poptContext context, enum poptCallbackReason reason,
* is turned off, all thread operations such as mutexes and conditionals * is turned off, all thread operations such as mutexes and conditionals
* are turned into NOPs. use this if you want absolute minimal overhead * are turned into NOPs. use this if you want absolute minimal overhead
* and you don't use any threads in the pipeline. * and you don't use any threads in the pipeline.
* <note><para>
* This function may only be called before threads are initialized. This
* usually happens when calling gst_init.
* </para></note>
*/ */
void void
gst_use_threads (gboolean use_threads) gst_use_threads (gboolean use_threads)
{ {
g_return_if_fail (!gst_initialized);
g_return_if_fail (g_thread_supported ());
_gst_use_threads = use_threads; _gst_use_threads = use_threads;
} }