isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 00:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/stage: Account for frame times

Browse Source 
Instead of accumulating frames, simply calculate and
debug-dump the time each frame takes to be drawn.

Because we're using Clutter's debug machinery, it is
structured and can be parsed by scripts.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/502
This commit is contained in:
Georges Basile Stavracas Neto 2019-03-21 11:27:26 +00:00
parent 290f48f29a
commit 4904430083
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clutter/clutter/clutter-stage.c
View File

@ -133,9 +133,6 @@ struct _ClutterStagePrivate
gint sync_delay; gint sync_delay;
GTimer *fps_timer;
gint32 timer_n_frames;
ClutterIDPool *pick_id_pool; ClutterIDPool *pick_id_pool;
#ifdef CLUTTER_ENABLE_DEBUG #ifdef CLUTTER_ENABLE_DEBUG
@ -149,6 +146,9 @@ struct _ClutterStagePrivate
int update_freeze_count; int update_freeze_count;
double last_layout_time;
double last_paint_time;
guint relayout_pending : 1; guint relayout_pending : 1;
guint redraw_pending : 1; guint redraw_pending : 1;
guint is_fullscreen : 1; guint is_fullscreen : 1;
@ -1074,11 +1074,15 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
/* avoid reentrancy */ /* avoid reentrancy */
if (!CLUTTER_ACTOR_IN_RELAYOUT (stage)) if (!CLUTTER_ACTOR_IN_RELAYOUT (stage))
{ {
int64_t start, end;
priv->relayout_pending = FALSE; priv->relayout_pending = FALSE;
priv->stage_was_relayout = TRUE; priv->stage_was_relayout = TRUE;
CLUTTER_NOTE (ACTOR, "Recomputing layout"); CLUTTER_NOTE (ACTOR, "Recomputing layout");
start = g_get_monotonic_time ();
CLUTTER_SET_PRIVATE_FLAGS (stage, CLUTTER_IN_RELAYOUT); CLUTTER_SET_PRIVATE_FLAGS (stage, CLUTTER_IN_RELAYOUT);
natural_width = natural_height = 0; natural_width = natural_height = 0;
@ -1099,6 +1103,11 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
&box, CLUTTER_ALLOCATION_NONE); &box, CLUTTER_ALLOCATION_NONE);
CLUTTER_UNSET_PRIVATE_FLAGS (stage, CLUTTER_IN_RELAYOUT); CLUTTER_UNSET_PRIVATE_FLAGS (stage, CLUTTER_IN_RELAYOUT);
end = g_get_monotonic_time ();
priv->last_layout_time = (end - start) / 1000.0;
CLUTTER_NOTE (FRAME_TIME, "LAYOUT: %lf", priv->last_layout_time);
} }
} }
@ -1107,6 +1116,8 @@ clutter_stage_do_redraw (ClutterStage *stage)
{ {
ClutterActor *actor = CLUTTER_ACTOR (stage); ClutterActor *actor = CLUTTER_ACTOR (stage);
ClutterStagePrivate *priv = stage->priv; ClutterStagePrivate *priv = stage->priv;
int64_t start;
int64_t end;
if (CLUTTER_ACTOR_IN_DESTRUCTION (stage)) if (CLUTTER_ACTOR_IN_DESTRUCTION (stage))
return; return;
@ -1118,28 +1129,14 @@ clutter_stage_do_redraw (ClutterStage *stage)
_clutter_actor_get_debug_name (actor), _clutter_actor_get_debug_name (actor),
stage); stage);
if (CLUTTER_HAS_DEBUG (FRAME_TIME)) start = g_get_monotonic_time ();
{
if (priv->fps_timer == NULL)
priv->fps_timer = g_timer_new ();
}
_clutter_stage_window_redraw (priv->impl); _clutter_stage_window_redraw (priv->impl);
if (CLUTTER_HAS_DEBUG (FRAME_TIME)) end = g_get_monotonic_time ();
{
priv->timer_n_frames += 1;
if (g_timer_elapsed (priv->fps_timer, NULL) >= 1.0) priv->last_paint_time = (end - start) / 1000.0;
{ CLUTTER_NOTE (FRAME_TIME, "PAINT: %lf", priv->last_paint_time);
g_print ("*** FPS for %s: %i ***\n",
_clutter_actor_get_debug_name (actor),
priv->timer_n_frames);
priv->timer_n_frames = 0;
g_timer_start (priv->fps_timer);
}
}
CLUTTER_NOTE (PAINT, "Redraw finished for stage '%s'[%p]", CLUTTER_NOTE (PAINT, "Redraw finished for stage '%s'[%p]",
_clutter_actor_get_debug_name (actor), _clutter_actor_get_debug_name (actor),
@ -1886,9 +1883,6 @@ clutter_stage_finalize (GObject *object)
_clutter_id_pool_free (priv->pick_id_pool); _clutter_id_pool_free (priv->pick_id_pool);
if (priv->fps_timer != NULL)
g_timer_destroy (priv->fps_timer);
if (priv->paint_notify != NULL) if (priv->paint_notify != NULL)
priv->paint_notify (priv->paint_data); priv->paint_notify (priv->paint_data);