mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst: Rename _priv_gst_info_start_time to _priv_gst_start_time and initialize it centrally

Browse source 
It's used by the debugging and tracer subsystem and in various files, make it
a central thing that is initialized independ of the existence of those
subsystems.
This commit is contained in:
Sebastian Dröge 2016-01-07 18:41:25 +02:00
parent 842b472772
commit d787105fd5
5 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/gst.c
View file

@ -123,6 +123,8 @@
static gboolean gst_initialized = FALSE; static gboolean gst_initialized = FALSE;
static gboolean gst_deinitialized = FALSE; static gboolean gst_deinitialized = FALSE;
GstClockTime _priv_gst_start_time;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
HMODULE _priv_gst_dll_handle = NULL; HMODULE _priv_gst_dll_handle = NULL;
#endif #endif
@ -475,6 +477,9 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
GST_DEBUG ("already initialized"); GST_DEBUG ("already initialized");
return TRUE; return TRUE;
} }
_priv_gst_start_time = gst_util_get_timestamp ();
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
_priv_gst_debug_init (); _priv_gst_debug_init ();
priv_gst_dump_dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR"); priv_gst_dump_dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR");

2
gst/gst_private.h
View file

@ -263,7 +263,7 @@ extern GstDebugCategory *_priv_GST_CAT_POLL;
#define GST_CAT_PROTECTION _priv_GST_CAT_PROTECTION #define GST_CAT_PROTECTION _priv_GST_CAT_PROTECTION
extern GstDebugCategory *_priv_GST_CAT_PROTECTION; extern GstDebugCategory *_priv_GST_CAT_PROTECTION;
extern GstClockTime _priv_gst_info_start_time; extern GstClockTime _priv_gst_start_time;
#else #else

3
gst/gstdebugutils.c
View file

@ -840,8 +840,7 @@ gst_debug_bin_to_dot_file_with_ts (GstBin * bin,
} }
/* add timestamp */ /* add timestamp */
elapsed = GST_CLOCK_DIFF (_priv_gst_info_start_time, elapsed = GST_CLOCK_DIFF (_priv_gst_start_time, gst_util_get_timestamp ());
gst_util_get_timestamp ());
/* we don't use GST_TIME_FORMAT as such filenames would fail on some /* we don't use GST_TIME_FORMAT as such filenames would fail on some
* filesystems like fat */ * filesystems like fat */

12
gst/gstinfo.c
View file

@ -186,12 +186,6 @@ GstDebugCategory *_priv_GST_CAT_PROTECTION = NULL;
/* underscore is to prevent conflict with GST_CAT_DEBUG define */ /* underscore is to prevent conflict with GST_CAT_DEBUG define */
GST_DEBUG_CATEGORY_STATIC (_GST_CAT_DEBUG); GST_DEBUG_CATEGORY_STATIC (_GST_CAT_DEBUG);
/* time of initialization, so we get useful debugging output times
* FIXME: we use this in gstdebugutils.c, what about a function + macro to
* get the running time: GST_DEBUG_RUNNING_TIME
*/
GstClockTime _priv_gst_info_start_time;
#if 0 #if 0
#if defined __sgi__ #if defined __sgi__
#include <rld_interface.h> #include <rld_interface.h>
@ -318,9 +312,6 @@ _priv_gst_debug_init (void)
log_file = stderr; log_file = stderr;
} }
/* get time we started for debugging messages */
_priv_gst_info_start_time = gst_util_get_timestamp ();
__gst_printf_pointer_extension_set_func __gst_printf_pointer_extension_set_func
(gst_info_printf_pointer_extension_func); (gst_info_printf_pointer_extension_func);
@ -1013,8 +1004,7 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level,
obj = (gchar *) ""; obj = (gchar *) "";
} }
elapsed = GST_CLOCK_DIFF (_priv_gst_info_start_time, elapsed = GST_CLOCK_DIFF (_priv_gst_start_time, gst_util_get_timestamp ());
gst_util_get_timestamp ());
if (color_mode != GST_DEBUG_COLOR_MODE_OFF) { if (color_mode != GST_DEBUG_COLOR_MODE_OFF) {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32

2
gst/gsttracerutils.h
View file

@ -91,7 +91,7 @@ extern GHashTable *_priv_tracers;
#define GST_TRACER_IS_ENABLED (_priv_tracer_enabled) #define GST_TRACER_IS_ENABLED (_priv_tracer_enabled)
#define GST_TRACER_TS \ #define GST_TRACER_TS \
GST_CLOCK_DIFF (_priv_gst_info_start_time, gst_util_get_timestamp ()) GST_CLOCK_DIFF (_priv_gst_start_time, gst_util_get_timestamp ())
/* tracing hooks */ /* tracing hooks */