mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
rename option as suggested to avoid bad jokes :)
Original commit message from CVS: rename option as suggested to avoid bad jokes :)
This commit is contained in:
parent
1d207e2e64
commit
cdfe720faa
3 changed files with 14876 additions and 11 deletions
10
gst/gst.c
10
gst/gst.c
|
@ -56,7 +56,7 @@ static gboolean _gst_initialization_failure = FALSE;
|
|||
extern gint _gst_trace_on;
|
||||
|
||||
/* set to TRUE when segfaults need to be left as is */
|
||||
gboolean _gst_enable_segfault = FALSE;
|
||||
gboolean _gst_disable_segtrap = FALSE;
|
||||
|
||||
extern GThreadFunctions gst_thread_dummy_functions;
|
||||
|
||||
|
@ -99,7 +99,7 @@ enum {
|
|||
ARG_PLUGIN_SPEW,
|
||||
ARG_PLUGIN_PATH,
|
||||
ARG_PLUGIN_LOAD,
|
||||
ARG_SEGFAULT_ENABLE,
|
||||
ARG_SEGTRAP_DISABLE,
|
||||
ARG_SCHEDULER,
|
||||
ARG_REGISTRY
|
||||
};
|
||||
|
@ -126,7 +126,7 @@ static const struct poptOption gstreamer_options[] = {
|
|||
{"gst-plugin-spew", NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_SPEW, N_("enable verbose plugin loading diagnostics"), NULL},
|
||||
{"gst-plugin-path", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_PATH, N_("'" 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, N_("comma-separated list of plugins to preload in addition to the list stored in env variable GST_PLUGIN_PATH"), "PLUGINS"},
|
||||
{"gst-enable-segfault",NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_SEGFAULT_ENABLE,N_("enable receiving of segmentation faults during plugin loading"), NULL},
|
||||
{"gst-disable-segtrap",NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_SEGTRAP_DISABLE,N_("disable trapping of segmentation faults during plugin loading"), NULL},
|
||||
{"gst-scheduler", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER, N_("scheduler to use ('"GST_SCHEDULER_DEFAULT_NAME"' is the default)"), "SCHEDULER"},
|
||||
{"gst-registry", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_REGISTRY, N_("registry to use") , "REGISTRY"},
|
||||
POPT_TABLEEND
|
||||
|
@ -705,8 +705,8 @@ init_popt_callback (poptContext context, enum poptCallbackReason reason,
|
|||
case ARG_PLUGIN_LOAD:
|
||||
split_and_iterate (arg, ",", prepare_for_load_plugin_func, NULL);
|
||||
break;
|
||||
case ARG_SEGFAULT_ENABLE:
|
||||
_gst_enable_segfault = TRUE;
|
||||
case ARG_SEGTRAP_DISABLE:
|
||||
_gst_disable_segtrap = TRUE;
|
||||
break;
|
||||
case ARG_SCHEDULER:
|
||||
gst_scheduler_factory_set_default_name (arg);
|
||||
|
|
|
@ -42,7 +42,7 @@ static GList *_gst_plugin_static = NULL;
|
|||
|
||||
/* static variables for segfault handling of plugin loading */
|
||||
static char *_gst_plugin_fault_handler_filename = NULL;
|
||||
extern gboolean *_gst_enable_segfault; /* see gst.c */
|
||||
extern gboolean *_gst_disable_segtrap; /* see gst.c */
|
||||
static gboolean *_gst_plugin_fault_handler_is_setup = FALSE;
|
||||
|
||||
/* list of valid licenses.
|
||||
|
@ -228,12 +228,12 @@ _gst_plugin_fault_handler_sighandler (int signum)
|
|||
switch (signum)
|
||||
{
|
||||
case SIGSEGV:
|
||||
g_print ("\nERROR:");
|
||||
g_print ("\nERROR: ");
|
||||
g_print ("Caught a segmentation fault while loading plugin file:\n");
|
||||
g_print ("%s\n\n", _gst_plugin_fault_handler_filename);
|
||||
g_print ("Please either:\n");
|
||||
g_print ("- remove it and restart.\n");
|
||||
g_print ("- run with --gst-enable-segfault and debug.\n");
|
||||
g_print ("- run with --gst-disable-segtrap and debug.\n");
|
||||
exit (-1);
|
||||
break;
|
||||
default:
|
||||
|
@ -252,7 +252,7 @@ _gst_plugin_fault_handler_setup (void)
|
|||
struct sigaction action;
|
||||
|
||||
/* if asked to leave segfaults alone, just return */
|
||||
if (_gst_enable_segfault) return;
|
||||
if (_gst_disable_segtrap) return;
|
||||
|
||||
if (_gst_plugin_fault_handler_is_setup) return;
|
||||
|
||||
|
|
Loading…
Reference in a new issue