[mutter/gbsneto/tracing: 3/5] profiler: Support setting output filename
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/tracing: 3/5] profiler: Support setting output filename
- Date: Fri, 17 May 2019 15:36:46 +0000 (UTC)
commit 88b5f8717acdc5b4b6dc17cdcf8f81f39810e093
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Fri Apr 12 15:34:56 2019 -0300
profiler: Support setting output filename
So we can have some control over where the file will
be saved.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/197
cogl/cogl/cogl-trace.c | 90 ++++++++++++++++++++++++++++++++++++++++----------
cogl/cogl/cogl-trace.h | 11 ++++--
2 files changed, 81 insertions(+), 20 deletions(-)
---
diff --git a/cogl/cogl/cogl-trace.c b/cogl/cogl/cogl-trace.c
index 0471c7ac3..7ef9ef1db 100644
--- a/cogl/cogl/cogl-trace.c
+++ b/cogl/cogl/cogl-trace.c
@@ -28,24 +28,50 @@
#include <unistd.h>
#define COGL_TRACE_OUTPUT_FILE "cogl-trace-sp-capture.syscap"
+#define BUFFER_LENGTH (4096 * 4)
+
+typedef struct
+{
+ int fd;
+ char *filename;
+} TraceData;
+
+static void
+trace_data_free (gpointer user_data)
+{
+ TraceData *data = user_data;
+
+ data->fd = -1;
+ g_clear_pointer (&data->filename, g_free);
+ g_free (data);
+}
__thread CoglTraceThreadContext *cogl_trace_thread_context;
CoglTraceContext *cogl_trace_context;
GMutex cogl_trace_mutex;
static CoglTraceContext *
-cogl_trace_context_new (int fd)
+cogl_trace_context_new (int fd,
+ const char *filename)
{
CoglTraceContext *context;
SpCaptureWriter *writer;
- g_debug ("Initializing trace context with fd=%d", fd);
-
- if (fd == -1)
- writer = sp_capture_writer_new (COGL_TRACE_OUTPUT_FILE,
- 4096 * 4);
+ if (fd != -1)
+ {
+ g_debug ("Initializing trace context with fd=%d", fd);
+ writer = sp_capture_writer_new_from_fd (fd, BUFFER_LENGTH);
+ }
+ else if (filename != NULL)
+ {
+ g_debug ("Initializing trace context with filename='%s'", filename);
+ writer = sp_capture_writer_new (filename, BUFFER_LENGTH);
+ }
else
- writer = sp_capture_writer_new_from_fd (fd, 4096 * 4);
+ {
+ g_debug ("Initializing trace context with default dilename");
+ writer = sp_capture_writer_new (COGL_TRACE_OUTPUT_FILE, BUFFER_LENGTH);
+ }
context = g_new0 (CoglTraceContext, 1);
context->writer = writer;
@@ -60,13 +86,13 @@ cogl_trace_context_free (CoglTraceContext *trace_context)
}
static void
-ensure_trace_context (int fd)
+ensure_trace_context (TraceData *data)
{
static GMutex mutex;
g_mutex_lock (&mutex);
if (!cogl_trace_context)
- cogl_trace_context = cogl_trace_context_new (fd);
+ cogl_trace_context = cogl_trace_context_new (data->fd, data->filename);
g_mutex_unlock (&mutex);
}
@@ -95,10 +121,10 @@ cogl_trace_thread_context_new (void)
static gboolean
enable_tracing_idle_callback (gpointer user_data)
{
- int fd = GPOINTER_TO_INT (user_data);
+ TraceData *data = user_data;
ensure_sigpipe_ignored ();
- ensure_trace_context (fd);
+ ensure_trace_context (data);
if (cogl_trace_thread_context)
{
@@ -143,20 +169,43 @@ disable_tracing_idle_callback (gpointer user_data)
return G_SOURCE_REMOVE;
}
-void
-cogl_set_tracing_enabled_on_thread (GMainContext *main_context,
- int fd)
+static void
+set_tracing_enabled_on_thread (GMainContext *main_context,
+ int fd,
+ const char *filename)
{
+ TraceData *data;
GSource *source;
+ data = g_new0 (TraceData, 1);
+ data->fd = fd;
+ data->filename = filename ? strdup (filename) : NULL;
+
source = g_idle_source_new ();
- g_source_set_callback (source, enable_tracing_idle_callback, GINT_TO_POINTER (fd), NULL);
+ g_source_set_callback (source,
+ enable_tracing_idle_callback,
+ data,
+ trace_data_free);
g_source_attach (source, main_context);
g_source_unref (source);
}
+void
+cogl_set_tracing_enabled_on_thread_with_fd (GMainContext *main_context,
+ int fd)
+{
+ set_tracing_enabled_on_thread (main_context, fd, NULL);
+}
+
+void
+cogl_set_tracing_enabled_on_thread (GMainContext *main_context,
+ const char *filename)
+{
+ set_tracing_enabled_on_thread (main_context, -1, filename);
+}
+
void
cogl_set_tracing_disabled_on_thread (GMainContext *main_context)
{
@@ -176,8 +225,15 @@ cogl_set_tracing_disabled_on_thread (GMainContext *main_context)
#include <stdio.h>
void
-cogl_set_tracing_enabled_on_thread (void *data,
- int fd)
+cogl_set_tracing_enabled_on_thread_with_fd (void *data,
+ int fd)
+{
+ fprintf (stderr, "Tracing not enabled");
+}
+
+void
+cogl_set_tracing_enabled_on_thread (void *data,
+ const char *filename)
{
fprintf (stderr, "Tracing not enabled");
}
diff --git a/cogl/cogl/cogl-trace.h b/cogl/cogl/cogl-trace.h
index 8b2c1ad95..a09a83485 100644
--- a/cogl/cogl/cogl-trace.h
+++ b/cogl/cogl/cogl-trace.h
@@ -51,8 +51,11 @@ extern __thread CoglTraceThreadContext *cogl_trace_thread_context;
extern CoglTraceContext *cogl_trace_context;
extern GMutex cogl_trace_mutex;
+void cogl_set_tracing_enabled_on_thread_with_fd (GMainContext *main_context,
+ int fd);
+
void cogl_set_tracing_enabled_on_thread (GMainContext *main_context,
- int fd);
+ const char *filename);
void cogl_set_tracing_disabled_on_thread (GMainContext *main_context);
@@ -129,8 +132,10 @@ cogl_auto_trace_end_helper (CoglTraceHead **head)
#define COGL_TRACE_END(Name) (void) 0
#define COGL_TRACE_BEGIN_SCOPED(Name) (void) 0
-void cogl_set_tracing_enabled_on_thread (void *data, int fd);
-
+void cogl_set_tracing_enabled_on_thread_with_fd (void *data,
+ int fd);
+void cogl_set_tracing_enabled_on_thread (void *data,
+ const char *filename);
void cogl_set_tracing_disabled_on_thread (void *data);
#endif /* HAVE_TRACING */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]