summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2021-07-12 13:54:26 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2022-03-04 10:10:05 +0300
commitbcf6ee5e5554c3aa2398c35a0c905649d74124f0 (patch)
treed64e78de32c846f7a64035e556ff26054e93521b
parent2cd9b4775aad33dc832c81342ddb4bdc3ed0a0ee (diff)
downloadmutter-bcf6ee5e5554c3aa2398c35a0c905649d74124f0.tar.gz
Name unnamed sources
These names show up in GLib traces in sysprof, so let's make sure they exist. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1928>
-rw-r--r--clutter/clutter/clutter-frame-clock.c2
-rw-r--r--cogl/cogl/cogl-glib-source.c1
-rw-r--r--src/backends/meta-backend.c1
-rw-r--r--src/backends/meta-idle-monitor.c1
-rw-r--r--src/backends/meta-screen-cast-stream-src.c7
-rw-r--r--src/backends/native/meta-kms.c2
-rw-r--r--src/backends/native/meta-seat-impl.c1
-rw-r--r--src/backends/x11/meta-backend-x11.c1
-rw-r--r--src/wayland/meta-wayland.c15
9 files changed, 21 insertions, 10 deletions
diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c
index a1687415a..164e77c08 100644
--- a/clutter/clutter/clutter-frame-clock.c
+++ b/clutter/clutter/clutter-frame-clock.c
@@ -761,7 +761,7 @@ init_frame_clock_source (ClutterFrameClock *frame_clock)
source = g_source_new (&frame_clock_source_funcs, sizeof (ClutterClockSource));
clock_source = (ClutterClockSource *) source;
- name = g_strdup_printf ("Clutter frame clock (%p)", frame_clock);
+ name = g_strdup_printf ("[mutter] Clutter frame clock (%p)", frame_clock);
g_source_set_name (source, name);
g_source_set_priority (source, CLUTTER_PRIORITY_REDRAW);
g_source_set_can_recurse (source, FALSE);
diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
index aa86c828d..37c3713c0 100644
--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@@ -171,6 +171,7 @@ cogl_glib_renderer_source_new (CoglRenderer *renderer,
source = g_source_new (&cogl_glib_source_funcs,
sizeof (CoglGLibSource));
+ g_source_set_name (source, "[mutter] Cogl");
cogl_source = (CoglGLibSource *) source;
cogl_source->renderer = renderer;
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index 25d0719ce..cf6a04943 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -1136,6 +1136,7 @@ init_clutter (MetaBackend *backend,
return FALSE;
source = g_source_new (&clutter_source_funcs, sizeof (MetaBackendSource));
+ g_source_set_name (source, "[mutter] Backend");
backend_source = (MetaBackendSource *) source;
backend_source->backend = backend;
g_source_attach (source, NULL);
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c
index df924d4dd..879924de8 100644
--- a/src/backends/meta-idle-monitor.c
+++ b/src/backends/meta-idle-monitor.c
@@ -337,6 +337,7 @@ make_watch (MetaIdleMonitor *monitor,
{
GSource *source = g_source_new (&idle_monitor_source_funcs,
sizeof (GSource));
+ g_source_set_name (source, "[mutter] Idle monitor");
g_source_set_callback (source, NULL, watch, NULL);
if (!monitor->inhibited)
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
index 96fd35457..e801324f0 100644
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -1194,11 +1194,12 @@ static GSourceFuncs pipewire_source_funcs =
static MetaPipeWireSource *
create_pipewire_source (MetaScreenCastStreamSrc *src)
{
+ GSource *source;
MetaPipeWireSource *pipewire_source;
- pipewire_source =
- (MetaPipeWireSource *) g_source_new (&pipewire_source_funcs,
- sizeof (MetaPipeWireSource));
+ source = g_source_new (&pipewire_source_funcs, sizeof (MetaPipeWireSource));
+ g_source_set_name (source, "[mutter] PipeWire");
+ pipewire_source = (MetaPipeWireSource *) source;
pipewire_source->src = src;
pipewire_source->pipewire_loop = pw_loop_new (NULL);
if (!pipewire_source->pipewire_loop)
diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c
index 2688a23c6..052ec8a65 100644
--- a/src/backends/native/meta-kms.c
+++ b/src/backends/native/meta-kms.c
@@ -473,6 +473,7 @@ meta_kms_add_source_in_impl (MetaKms *kms,
source = g_source_new (&simple_impl_source_funcs,
sizeof (MetaKmsSimpleImplSource));
+ g_source_set_name (source, "[mutter] KMS simple impl");
simple_impl_source = (MetaKmsSimpleImplSource *) source;
simple_impl_source->kms = kms;
@@ -534,6 +535,7 @@ meta_kms_register_fd_in_impl (MetaKms *kms,
meta_assert_in_kms_impl (kms);
source = g_source_new (&fd_impl_source_funcs, sizeof (MetaKmsFdImplSource));
+ g_source_set_name (source, "[mutter] KMS fd impl");
fd_impl_source = (MetaKmsFdImplSource *) source;
fd_impl_source->dispatch = dispatch;
fd_impl_source->user_data = user_data;
diff --git a/src/backends/native/meta-seat-impl.c b/src/backends/native/meta-seat-impl.c
index ad6782325..8b3115265 100644
--- a/src/backends/native/meta-seat-impl.c
+++ b/src/backends/native/meta-seat-impl.c
@@ -1509,6 +1509,7 @@ meta_event_source_new (MetaSeatImpl *seat_impl)
int fd;
source = g_source_new (&event_funcs, sizeof (MetaEventSource));
+ g_source_set_name (source, "[mutter] Events");
event_source = (MetaEventSource *) source;
/* setup the source */
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index fa01e3221..056a16ad7 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -476,6 +476,7 @@ x_event_source_new (MetaBackend *backend)
XEventSource *x_source;
source = g_source_new (&x_event_funcs, sizeof (XEventSource));
+ g_source_set_name (source, "[mutter] X events");
x_source = (XEventSource *) source;
x_source->backend = backend;
x_source->event_poll_fd.fd = ConnectionNumber (priv->xdisplay);
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 5adc5d988..6e2b56dd4 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -117,17 +117,20 @@ static GSourceFuncs wayland_event_source_funcs =
static GSource *
wayland_event_source_new (struct wl_display *display)
{
- WaylandEventSource *source;
+ GSource *source;
+ WaylandEventSource *wayland_source;
struct wl_event_loop *loop = wl_display_get_event_loop (display);
- source = (WaylandEventSource *) g_source_new (&wayland_event_source_funcs,
- sizeof (WaylandEventSource));
- source->display = display;
- g_source_add_unix_fd (&source->source,
+ source = g_source_new (&wayland_event_source_funcs,
+ sizeof (WaylandEventSource));
+ g_source_set_name (source, "[mutter] Wayland events");
+ wayland_source = (WaylandEventSource *) source;
+ wayland_source->display = display;
+ g_source_add_unix_fd (&wayland_source->source,
wl_event_loop_get_fd (loop),
G_IO_IN | G_IO_ERR);
- return &source->source;
+ return &wayland_source->source;
}
void