diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index 81e2db99e..271295949 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -3571,7 +3571,7 @@ clutter_actor_paint (ClutterActor *self, if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) { COGL_TRACE_BEGIN_ANCHORED (ClutterActorPaint, - "ClutterActor (paint)"); + "Clutter::Actor::paint()"); COGL_TRACE_DESCRIBE (ClutterActorPaint, _clutter_actor_get_debug_name (self)); } @@ -8734,7 +8734,7 @@ clutter_actor_allocate (ClutterActor *self, if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) { COGL_TRACE_BEGIN_ANCHORED (ClutterActorAllocate, - "ClutterActor (allocate)"); + "Clutter::Actor::allocate()"); COGL_TRACE_DESCRIBE (ClutterActorAllocate, _clutter_actor_get_debug_name (self)); } diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c index dd64ebb06..656e07932 100644 --- a/clutter/clutter/clutter-frame-clock.c +++ b/clutter/clutter/clutter-frame-clock.c @@ -250,7 +250,7 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock, ClutterFrameInfo *frame_info) { COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockNotifyPresented, - "Frame Clock (presented)"); + "Clutter::FrameClock::presented()"); if (G_UNLIKELY (CLUTTER_HAS_DEBUG (FRAME_CLOCK))) { @@ -389,7 +389,7 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock, void clutter_frame_clock_notify_ready (ClutterFrameClock *frame_clock) { - COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockNotifyReady, "Frame Clock (ready)"); + COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockNotifyReady, "Clutter::FrameClock::ready()"); switch (frame_clock->state) { @@ -714,7 +714,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock, int64_t this_dispatch_ready_time_us; int64_t this_dispatch_time_us; - COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockDispatch, "Frame Clock (dispatch)"); + COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockDispatch, "Clutter::FrameClock::dispatch()"); this_dispatch_ready_time_us = g_source_get_ready_time (frame_clock->source); this_dispatch_time_us = time_us; @@ -766,18 +766,18 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock, frame->target_presentation_time_us = frame_clock->next_presentation_time_us; frame->min_render_time_allowed_us = frame_clock->min_render_time_allowed_us; - COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockEvents, "Frame Clock (before frame)"); + COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockEvents, "Clutter::FrameListener::before_frame()"); if (iface->before_frame) iface->before_frame (frame_clock, frame, frame_clock->listener.user_data); COGL_TRACE_END (ClutterFrameClockEvents); - COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockTimelines, "Frame Clock (timelines)"); + COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockTimelines, "Clutter::FrameClock::advance_timelines()"); if (frame_clock->is_next_presentation_time_valid) time_us = frame_clock->next_presentation_time_us; advance_timelines (frame_clock, time_us); COGL_TRACE_END (ClutterFrameClockTimelines); - COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockFrame, "Frame Clock (frame)"); + COGL_TRACE_BEGIN_SCOPED (ClutterFrameClockFrame, "Clutter::FrameListener::frame()"); result = iface->frame (frame_clock, frame, frame_clock->listener.user_data); COGL_TRACE_END (ClutterFrameClockFrame); diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 32bbf6501..1a1480625 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -480,7 +480,7 @@ clutter_stage_paint_view (ClutterStage *stage, if (!priv->impl) return; - COGL_TRACE_BEGIN_SCOPED (ClutterStagePaintView, "Paint (view)"); + COGL_TRACE_BEGIN_SCOPED (ClutterStagePaintView, "Clutter::Stage::paint_view()"); if (g_signal_has_handler_pending (stage, stage_signals[PAINT_VIEW], 0, TRUE)) @@ -866,7 +866,7 @@ clutter_stage_maybe_relayout (ClutterActor *actor) if (priv->pending_relayouts == NULL) return; - COGL_TRACE_BEGIN_SCOPED (ClutterStageRelayout, "Layout"); + COGL_TRACE_BEGIN_SCOPED (ClutterStageRelayout, "Clutter::Stage::maybe_relayout()"); CLUTTER_NOTE (ACTOR, ">>> Recomputing layout"); @@ -940,7 +940,7 @@ clutter_stage_finish_layout (ClutterStage *stage) int phase; COGL_TRACE_BEGIN_SCOPED (ClutterStageUpdateActorStageViews, - "Actor stage-views"); + "Clutter::Stage::finish_layout()"); /* If an actor needs an immediate relayout because its resource scale * changed, we give it another chance to allocate correctly before @@ -973,7 +973,7 @@ clutter_stage_update_devices (ClutterStage *stage, ClutterStagePrivate *priv = stage->priv; GSList *l; - COGL_TRACE_BEGIN_SCOPED (ClutterStageUpdateDevices, "UpdateDevices"); + COGL_TRACE_BEGIN_SCOPED (ClutterStageUpdateDevices, "Clutter::Stage::update_devices()"); for (l = devices; l; l = l->next) { @@ -1076,7 +1076,7 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage, graphene_ray_t ray; ClutterActor *actor; - COGL_TRACE_BEGIN_SCOPED (ClutterStagePickView, "Pick (view)"); + COGL_TRACE_BEGIN_SCOPED (ClutterStagePickView, "Clutter::Stage::do_pick_on_view()"); setup_ray_for_coordinates (stage, x, y, &p, &ray); @@ -1948,7 +1948,7 @@ clutter_stage_read_pixels (ClutterStage *stage, float pixel_height; uint8_t *pixels; - COGL_TRACE_BEGIN_SCOPED (ClutterStageReadPixels, "Read Pixels"); + COGL_TRACE_BEGIN_SCOPED (ClutterStageReadPixels, "Clutter::Stage::read_pixels()"); g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL); diff --git a/cogl/cogl/winsys/cogl-onscreen-egl.c b/cogl/cogl/winsys/cogl-onscreen-egl.c index 46f326d39..94c52a3ea 100644 --- a/cogl/cogl/winsys/cogl-onscreen-egl.c +++ b/cogl/cogl/winsys/cogl-onscreen-egl.c @@ -297,7 +297,7 @@ cogl_onscreen_egl_swap_buffers_with_damage (CoglOnscreen *onscreen, CoglRendererEGL *egl_renderer = renderer->winsys; COGL_TRACE_BEGIN_SCOPED (CoglOnscreenEGLSwapBuffersWithDamage, - "Onscreen (eglSwapBuffers)"); + "Cogl::Onscreen::egl_swap_buffers_with_damage()"); /* The specification for EGL (at least in 1.4) says that the surface needs to be bound to the current context for the swap to work diff --git a/src/backends/meta-stage-impl.c b/src/backends/meta-stage-impl.c index ef47fee21..d70318c9a 100644 --- a/src/backends/meta-stage-impl.c +++ b/src/backends/meta-stage-impl.c @@ -680,7 +680,7 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl *stage_impl, g_clear_pointer (&fb_clip_region, mtk_region_unref); COGL_TRACE_BEGIN_SCOPED (MetaStageImplRedrawViewSwapFramebuffer, - "Paint (swap framebuffer)"); + "Meta::StageImpl::redraw_view_primary#swap_framebuffer()"); if (queued_redraw_clip) { diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 3a6799c63..a906bc03a 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -964,7 +964,7 @@ meta_backend_native_pause (MetaBackendNative *native) MetaRenderer *renderer = meta_backend_get_renderer (backend); COGL_TRACE_BEGIN_SCOPED (MetaBackendNativePause, - "Backend (pause)"); + "Meta::BackendNative::pause()"); meta_seat_native_release_devices (seat); meta_renderer_pause (renderer); @@ -989,7 +989,7 @@ void meta_backend_native_resume (MetaBackendNative *native) MetaInputSettings *input_settings; COGL_TRACE_BEGIN_SCOPED (MetaBackendNativeResume, - "Backend (resume)"); + "Meta::BackendNative::resume()"); meta_monitor_manager_native_resume (monitor_manager_native); meta_udev_resume (native->udev); diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index c51407dcf..588caab28 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -310,7 +310,7 @@ meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *cursor_renderer, GList *l; COGL_TRACE_BEGIN_SCOPED (MetaCursorRendererNative, - "CursorRendererNative (update cursor)"); + "Meta::CursorRendererNative::update_cursor()"); cursor_changed = priv->current_cursor != cursor_sprite; @@ -1052,7 +1052,7 @@ realize_cursor_sprite_for_crtc (MetaCursorRenderer *renderer, meta_kms_device_get_path (kms_device)); COGL_TRACE_BEGIN_SCOPED (CursorRendererNativeRealize, - "Cursor Renderer Native (realize for crtc)"); + "Meta::CursorRendererNative::realize_cursor_sprite_for_crtc()"); if (META_IS_CURSOR_SPRITE_XCURSOR (cursor_sprite)) { MetaCursorSpriteXcursor *sprite_xcursor = diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c index bce64d309..b655c8b9f 100644 --- a/src/backends/native/meta-kms-impl-device.c +++ b/src/backends/native/meta-kms-impl-device.c @@ -1208,7 +1208,7 @@ do_process (MetaKmsImplDevice *impl_device, MetaKmsResourceChanges changes = META_KMS_RESOURCE_CHANGE_NONE; COGL_TRACE_BEGIN_SCOPED (MetaKmsImplDeviceProcess, - "KMS device impl (processing)"); + "Meta::KmsImplDevice::do_process()"); update = meta_kms_impl_filter_update (impl, latch_crtc, update, flags); diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index ec009ec8c..8e03adde5 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -284,7 +284,7 @@ meta_kms_update_states_in_impl (MetaKms *kms, GList *l; COGL_TRACE_BEGIN_SCOPED (MetaKmsUpdateStates, - "KMS (update states)"); + "Meta::Kms::update_states_in_impl()"); meta_assert_in_kms_impl (kms); diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index 2e2d79e2f..69177f3c1 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -429,7 +429,7 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen, MetaKmsPlaneAssignment *plane_assignment; COGL_TRACE_BEGIN_SCOPED (MetaOnscreenNativeFlipCrtcs, - "Onscreen (flip CRTCs)"); + "Meta::OnscreenNative::flip_crtc()"); gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc)); @@ -482,7 +482,7 @@ meta_onscreen_native_set_crtc_mode (CoglOnscreen *onscreen, MetaCrtcKms *crtc_kms = META_CRTC_KMS (onscreen_native->crtc); COGL_TRACE_BEGIN_SCOPED (MetaOnscreenNativeSetCrtcModes, - "Onscreen (set CRTC modes)"); + "Meta::OnscreenNative::set_crtc_mode()"); switch (renderer_gpu_data->mode) { @@ -616,7 +616,7 @@ copy_shared_framebuffer_gpu (CoglOnscreen *onscreen, struct gbm_bo *bo; COGL_TRACE_BEGIN_SCOPED (CopySharedFramebufferSecondaryGpu, - "FB Copy (secondary GPU)"); + "copy_shared_framebuffer_gpu()"); render_device = renderer_gpu_data->render_device; egl_display = meta_render_device_get_egl_display (render_device); @@ -723,7 +723,7 @@ copy_shared_framebuffer_primary_gpu (CoglOnscreen *onscre int ret; COGL_TRACE_BEGIN_SCOPED (CopySharedFramebufferPrimaryGpu, - "FB Copy (primary GPU)"); + "copy_shared_framebuffer_primary_gpu()"); if (!secondary_gpu_state || secondary_gpu_state->egl_surface == EGL_NO_SURFACE) @@ -834,7 +834,7 @@ copy_shared_framebuffer_cpu (CoglOnscreen *onscreen, gboolean ret; COGL_TRACE_BEGIN_SCOPED (CopySharedFramebufferCpu, - "FB Copy (CPU)"); + "copy_shared_framebuffer_cpu()"); buffer_dumb = secondary_gpu_get_next_dumb_buffer (secondary_gpu_state); buffer = META_DRM_BUFFER (buffer_dumb); @@ -882,7 +882,7 @@ update_secondary_gpu_state_pre_swap_buffers (CoglOnscreen *onscreen, MetaDrmBuffer *copy = NULL; COGL_TRACE_BEGIN_SCOPED (MetaRendererNativeGpuStatePreSwapBuffers, - "Onscreen (secondary gpu pre-swap-buffers)"); + "update_secondary_gpu_state_pre_swap_buffers()"); secondary_gpu_state = onscreen_native->secondary_gpu_state; if (secondary_gpu_state) @@ -948,7 +948,7 @@ update_secondary_gpu_state_post_swap_buffers (CoglOnscreen *onscreen, MetaOnscreenNativeSecondaryGpuState *secondary_gpu_state; COGL_TRACE_BEGIN_SCOPED (MetaRendererNativeGpuStatePostSwapBuffers, - "Onscreen (secondary gpu post-swap-buffers)"); + "update_secondary_gpu_state_post_swap_buffers()"); secondary_gpu_state = onscreen_native->secondary_gpu_state; if (secondary_gpu_state) @@ -1075,7 +1075,7 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen, MetaKmsDevice *kms_device; COGL_TRACE_BEGIN_SCOPED (MetaRendererNativeSwapBuffers, - "Onscreen (swap-buffers)"); + "Meta::OnscreenNative::swap_buffers_with_damage()"); secondary_gpu_fb = update_secondary_gpu_state_pre_swap_buffers (onscreen, @@ -1188,7 +1188,7 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen, } COGL_TRACE_BEGIN_SCOPED (MetaRendererNativePostKmsUpdate, - "Onscreen (post pending update)"); + "Meta::OnscreenNative::swap_buffers_with_damage#post_pending_update()"); switch (renderer_gpu_data->mode) { diff --git a/src/backends/native/meta-seat-impl.c b/src/backends/native/meta-seat-impl.c index d9eeb3fc8..96ca4c535 100644 --- a/src/backends/native/meta-seat-impl.c +++ b/src/backends/native/meta-seat-impl.c @@ -244,9 +244,9 @@ static void dispatch_libinput (MetaSeatImpl *seat_impl) { COGL_TRACE_BEGIN_SCOPED (MetaSeatImplDispatchLibinput, - "MetaSeatImpl (dispatch libinput)"); + "Meta::SeatImpl::dispatch_libinput()"); + libinput_dispatch (seat_impl->libinput); - COGL_TRACE_END (MetaSeatImplDispatchLibinput); process_events (seat_impl); } @@ -2651,7 +2651,7 @@ process_events (MetaSeatImpl *seat_impl) struct libinput_event *event; COGL_TRACE_BEGIN_SCOPED (MetaSeatImplProcessEvents, - "MetaSeatImpl (process events)"); + "Meta::SeatImpl::process_events()"); while ((event = libinput_get_event (seat_impl->libinput))) { diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 3b8c15ee9..eb8dca7af 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -940,7 +940,7 @@ maybe_update_top_window_actor_for_views (MetaCompositor *compositor) priv->needs_update_top_window_actors = FALSE; COGL_TRACE_BEGIN_SCOPED (UpdateTopWindowActorForViews, - "Compositor (update top window actors)"); + "Meta::Compositor::update_top_window_actor_for_views()"); stage = CLUTTER_STAGE (meta_backend_get_stage (priv->backend)); @@ -1059,7 +1059,7 @@ meta_compositor_before_paint (MetaCompositor *compositor, meta_compositor_get_instance_private (compositor); COGL_TRACE_BEGIN_SCOPED (MetaCompositorPrePaint, - "Compositor (before-paint)"); + "Meta::Compositor::before_paint()"); maybe_update_top_window_actor_for_views (compositor); @@ -1124,7 +1124,7 @@ meta_compositor_after_paint (MetaCompositor *compositor, meta_compositor_get_instance_private (compositor); COGL_TRACE_BEGIN_SCOPED (MetaCompositorPostPaint, - "Compositor (after-paint)"); + "Meta::Compositor::after_paint()"); META_COMPOSITOR_GET_CLASS (compositor)->after_paint (compositor, compositor_view); priv->frame_in_progress = FALSE; diff --git a/src/compositor/meta-later.c b/src/compositor/meta-later.c index e3b0dcb04..801627e26 100644 --- a/src/compositor/meta-later.c +++ b/src/compositor/meta-later.c @@ -116,7 +116,9 @@ later_type_to_string (MetaLaterType when) static gboolean meta_later_invoke (MetaLater *later) { - COGL_TRACE_BEGIN_SCOPED (later, later_type_to_string (later->when)); + COGL_TRACE_BEGIN_SCOPED (later, "Meta::Later::invoke()"); + COGL_TRACE_DESCRIBE (later, later_type_to_string (later->when)); + return later->func (later->user_data); } diff --git a/src/core/display.c b/src/core/display.c index ae41f3bd6..ace30c8d6 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1725,7 +1725,7 @@ meta_display_notify_window_created (MetaDisplay *display, MetaWindow *window) { COGL_TRACE_BEGIN_SCOPED (MetaDisplayNotifyWindowCreated, - "Display (notify window created)"); + "Meta::Display::notify_window_created()"); g_signal_emit (display, display_signals[WINDOW_CREATED], 0, window); } @@ -3619,7 +3619,7 @@ update_window_visibilities (MetaDisplay *display, GList *l; COGL_TRACE_BEGIN_SCOPED (MetaDisplayUpdateVisibility, - "Display: Update visibility"); + "Meta::Display::update_window_visibilities()"); for (l = windows; l; l = l->next) { @@ -3642,17 +3642,19 @@ update_window_visibilities (MetaDisplay *display, should_show = g_list_reverse (should_show); COGL_TRACE_BEGIN_SCOPED (MetaDisplayShowUnplacedWindows, - "Display: Show unplaced windows"); + "Meta::Display::update_window_visibilities#show_unplaced()"); g_list_foreach (unplaced, (GFunc) meta_window_update_visibility, NULL); COGL_TRACE_END (MetaDisplayShowUnplacedWindows); meta_stack_freeze (display->stack); - COGL_TRACE_BEGIN_SCOPED (MetaDisplayShowWindows, "Display: Show windows"); + COGL_TRACE_BEGIN_SCOPED (MetaDisplayShowWindows, + "Meta::Display::update_window_visibilities#show()"); g_list_foreach (should_show, (GFunc) meta_window_update_visibility, NULL); COGL_TRACE_END (MetaDisplayShowWindows); - COGL_TRACE_BEGIN_SCOPED (MetaDisplayHideWindows, "Display: Hide windows"); + COGL_TRACE_BEGIN_SCOPED (MetaDisplayHideWindows, + "Meta::Display::update_window_visibilities#hide()"); g_list_foreach (should_hide, (GFunc) meta_window_update_visibility, NULL); COGL_TRACE_END (MetaDisplayHideWindows); diff --git a/src/core/events.c b/src/core/events.c index eb6177c3b..836a41b06 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -253,7 +253,7 @@ meta_display_handle_event (MetaDisplay *display, #endif COGL_TRACE_BEGIN_SCOPED (MetaDisplayHandleEvent, - "MetaDisplay (handle event)"); + "Meta::Display::handle_event()"); has_grab = stage_has_grab (display); diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index e9e09c0f0..6ee15d21a 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -567,7 +567,7 @@ on_stack_changed (MetaStack *stack, GArray *hidden_stack_ids; GList *sorted; - COGL_TRACE_BEGIN_SCOPED (StackChanged, "Stack changed"); + COGL_TRACE_BEGIN_SCOPED (StackChanged, "Meta::StackTracker::on_stack_changed()"); meta_topic (META_DEBUG_STACK, "Syncing window stack to server"); @@ -1285,12 +1285,12 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker, int old_pos, new_pos; COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackManaged, - "StackTracker: Restack Managed"); + "Meta::StackTracker::restack_managed()"); if (n_managed == 0) return; COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackManagedGet, - "StackTracker: Restack Managed (get)"); + "Meta::StackTracker::restack_managed#get()"); meta_stack_tracker_get_stack (tracker, &windows, &n_windows); /* If the top window has to be restacked, we don't want to move it to the very @@ -1310,7 +1310,7 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker, COGL_TRACE_END (StackTrackerRestackManagedGet); COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackManagedRaise, - "StackTracker: Restack Managed (raise)"); + "Meta::StackTracker::restack_managed#raise()"); new_pos = n_managed - 1; if (managed[new_pos] != windows[old_pos]) { @@ -1325,7 +1325,7 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker, new_pos--; COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackManagedRestack, - "StackTracker: Restack Managed (restack)"); + "Meta::StackTracker::restack_managed#restack()"); while (old_pos >= 0 && new_pos >= 0) { if (meta_stack_tracker_is_guard_window (tracker, windows[old_pos])) @@ -1355,7 +1355,7 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker, COGL_TRACE_END (StackTrackerRestackManagedRestack); COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackManagedLower, - "StackTracker: Restack Managed (lower)"); + "Meta::StackTracker::restack_managed#lower()"); while (new_pos > 0) { meta_stack_tracker_lower_below (tracker, managed[new_pos], managed[new_pos - 1]); @@ -1374,7 +1374,7 @@ meta_stack_tracker_restack_at_bottom (MetaStackTracker *tracker, int pos; COGL_TRACE_BEGIN_SCOPED (StackTrackerRestackAtBottom, - "Stack tracker: Restack at bottom"); + "Meta::StackTracker::restack_at_bottom()"); meta_stack_tracker_get_stack (tracker, &windows, &n_windows); for (pos = 0; pos < n_new_order; pos++) diff --git a/src/core/stack.c b/src/core/stack.c index d73da784d..a75ca675c 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -175,7 +175,7 @@ meta_stack_changed (MetaStack *stack) if (stack->freeze_count > 0) return; - COGL_TRACE_BEGIN_SCOPED (MetaStackChangedSort, "Stack: Changed"); + COGL_TRACE_BEGIN_SCOPED (MetaStackChangedSort, "Meta::Stack::changed()"); stack_ensure_sorted (stack); g_signal_emit (stack, signals[CHANGED], 0); @@ -188,7 +188,7 @@ meta_stack_add (MetaStack *stack, MetaWorkspaceManager *workspace_manager = window->display->workspace_manager; COGL_TRACE_BEGIN_SCOPED (MetaStackAdd, - "Stack (add window)"); + "Meta::Stack::add()"); g_return_if_fail (meta_window_is_stackable (window)); @@ -221,7 +221,7 @@ meta_stack_remove (MetaStack *stack, MetaWorkspaceManager *workspace_manager = window->display->workspace_manager; COGL_TRACE_BEGIN_SCOPED (MetaStackRemove, - "Stack (remove window)"); + "Meta::Stack::remove()"); meta_topic (META_DEBUG_STACK, "Removing window %s from the stack", window->desc); @@ -333,7 +333,7 @@ meta_stack_thaw (MetaStack *stack) { g_return_if_fail (stack->freeze_count > 0); - COGL_TRACE_BEGIN_SCOPED (MetaStackThaw, "Stack: thaw"); + COGL_TRACE_BEGIN_SCOPED (MetaStackThaw, "Meta::Stack::thaw()"); stack->freeze_count -= 1; meta_stack_changed (stack); diff --git a/src/core/window.c b/src/core/window.c index 95a9528d6..ce56f0ff8 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -1010,7 +1010,7 @@ static void meta_window_manage (MetaWindow *window) { COGL_TRACE_BEGIN_SCOPED (MetaWindowManage, - "Window (manage)"); + "Meta::Window::manage()"); META_WINDOW_GET_CLASS (window)->manage (window); } @@ -1025,7 +1025,7 @@ meta_window_constructed (GObject *object) MetaWorkspaceManager *workspace_manager = display->workspace_manager; COGL_TRACE_BEGIN_SCOPED (MetaWindowSharedInit, - "Window (init)"); + "Meta::Window::constructed()"); window->constructing = TRUE; diff --git a/src/core/workspace.c b/src/core/workspace.c index ddb571506..c90de072f 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -365,7 +365,7 @@ meta_workspace_add_window (MetaWorkspace *workspace, g_return_if_fail (g_list_find (workspace->mru_list, window) == NULL); COGL_TRACE_BEGIN_SCOPED (MetaWorkspaceAddWindow, - "Workspace (add window)"); + "Meta::Workspace::add_window()"); workspace_manager = workspace->display->workspace_manager; @@ -395,7 +395,7 @@ meta_workspace_remove_window (MetaWorkspace *workspace, MetaWorkspaceManager *workspace_manager = workspace->display->workspace_manager; COGL_TRACE_BEGIN_SCOPED (MetaWorkspaceRemoveWindow, - "Workspace (remove window)"); + "Meta::Workspace::remove_window()"); workspace->windows = g_list_remove (workspace->windows, window); diff --git a/src/wayland/meta-wayland-buffer.c b/src/wayland/meta-wayland-buffer.c index e30e35a67..4ad7acf27 100644 --- a/src/wayland/meta-wayland-buffer.c +++ b/src/wayland/meta-wayland-buffer.c @@ -585,7 +585,7 @@ meta_wayland_buffer_attach (MetaWaylandBuffer *buffer, MetaMultiTexture **texture, GError **error) { - COGL_TRACE_BEGIN_SCOPED (MetaWaylandBufferAttach, "WaylandBuffer (attach)"); + COGL_TRACE_BEGIN_SCOPED (MetaWaylandBufferAttach, "Meta::WaylandBuffer::attach()"); clear_tainted_scanout_onscreens (buffer); @@ -818,7 +818,7 @@ meta_wayland_buffer_try_acquire_scanout (MetaWaylandBuffer *buffer, CoglScanout *scanout = NULL; COGL_TRACE_BEGIN_SCOPED (MetaWaylandBufferTryScanout, - "WaylandBuffer (try scanout)"); + "Meta::WaylandBuffer::try_acquire_scanout()"); if (buffer->tainted_scanout_onscreens && g_hash_table_lookup (buffer->tainted_scanout_onscreens, onscreen)) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 81540106a..c789ae4b4 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -916,7 +916,7 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface) MetaWaylandSurface *subsurface_surface; COGL_TRACE_BEGIN_SCOPED (MetaWaylandSurfaceCommit, - "WaylandSurface (commit)"); + "Meta::WaylandSurface::commit()"); if (buffer) { diff --git a/src/x11/events.c b/src/x11/events.c index 764a3cd09..d252262a3 100644 --- a/src/x11/events.c +++ b/src/x11/events.c @@ -1846,7 +1846,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display, #endif COGL_TRACE_BEGIN_SCOPED (MetaX11DisplayHandleXevent, - "X11Display (handle X11 event)"); + "Meta::X11Display::handle_xevent()"); if (event->type == GenericEvent) XGetEventData (x11_display->xdisplay, &event->xcookie); diff --git a/src/x11/meta-sync-counter.c b/src/x11/meta-sync-counter.c index 49a70fb21..e9daf8646 100644 --- a/src/x11/meta-sync-counter.c +++ b/src/x11/meta-sync-counter.c @@ -283,7 +283,7 @@ meta_sync_counter_update (MetaSyncCounter *sync_counter, gboolean needs_frame_drawn = FALSE; gboolean no_delay_frame = FALSE; - COGL_TRACE_BEGIN_SCOPED (MetaWindowSyncRequestCounter, "X11: Sync request counter"); + COGL_TRACE_BEGIN_SCOPED (MetaWindowSyncRequestCounter, "Meta::SyncCounter::update()"); if (sync_counter->extended_sync_request_counter && new_counter_value % 2 == 0) { @@ -361,7 +361,7 @@ do_send_frame_drawn (MetaSyncCounter *sync_counter, XClientMessageEvent ev = { 0, }; COGL_TRACE_BEGIN_SCOPED (MetaWindowActorX11FrameDrawn, - "X11: Send _NET_WM_FRAME_DRAWN"); + "Meta::SyncCounter::do_send_frame_drawn()"); now_us = g_get_monotonic_time (); frame->frame_drawn_time = @@ -410,7 +410,7 @@ do_send_frame_timings (MetaSyncCounter *sync_counter, XClientMessageEvent ev = { 0, }; COGL_TRACE_BEGIN_SCOPED (MetaWindowActorX11FrameTimings, - "X11: Send _NET_WM_FRAME_TIMINGS"); + "Meta::SyncCounter::do_send_frame_timings()"); ev.type = ClientMessage; ev.window = sync_counter->xwindow;