brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/trace: Don't enable/disable in idle callback if thread matches

Browse Source 
This makes it possible to start profiling immediately on startup, during
context/backend/display setup, as well as flush during tear down.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2678>
This commit is contained in:
Jonas Ådahl 2022-10-28 15:46:48 +02:00 committed by Marge Bot
parent 1efb93e145
commit 5767d2f129
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cogl/cogl/cogl-trace.c
View File

@ -204,22 +204,30 @@ set_tracing_enabled_on_thread (GMainContext *main_context,
const char *filename) const char *filename)
{ {
TraceData *data; TraceData *data;
GSource *source;
data = g_new0 (TraceData, 1); data = g_new0 (TraceData, 1);
data->fd = fd; data->fd = fd;
data->group = group ? strdup (group) : NULL; data->group = group ? strdup (group) : NULL;
data->filename = filename ? strdup (filename) : NULL; data->filename = filename ? strdup (filename) : NULL;
source = g_idle_source_new (); if (main_context == g_main_context_get_thread_default ())
{
enable_tracing_idle_callback (data);
trace_data_free (data);
}
else
{
GSource *source;
source = g_idle_source_new ();
g_source_set_callback (source, g_source_set_callback (source,
enable_tracing_idle_callback, enable_tracing_idle_callback,
data, data,
trace_data_free); trace_data_free);
g_source_attach (source, main_context); g_source_attach (source, main_context);
g_source_unref (source); g_source_unref (source);
}
} }
void void
@ -241,14 +249,21 @@ cogl_set_tracing_enabled_on_thread (GMainContext *main_context,
void void
cogl_set_tracing_disabled_on_thread (GMainContext *main_context) cogl_set_tracing_disabled_on_thread (GMainContext *main_context)
{ {
GSource *source; if (g_main_context_get_thread_default () == main_context)
{
disable_tracing_idle_callback (NULL);
}
else
{
GSource *source;
source = g_idle_source_new (); source = g_idle_source_new ();
g_source_set_callback (source, disable_tracing_idle_callback, NULL, NULL); g_source_set_callback (source, disable_tracing_idle_callback, NULL, NULL);
g_source_attach (source, main_context); g_source_attach (source, main_context);
g_source_unref (source); g_source_unref (source);
}
} }
static void static void