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

profile: avoid segfault generating reports with no stats

Browse Source 
The clutter-profile.c print_report() code would crash if no stats had
been gathered because uprof would return NULL for the "Redrawing" timer
which we then dereferenced.

This changes the code to start by checking for the "Mainloop",
"Redrawing" and "Do Pick" timers and if none are present it returns
immediately without generating any report.
This commit is contained in:
Robert Bragg 2010-02-26 09:44:29 +00:00
parent b9a91594f4
commit 8146d8d08d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-profile.c
View File

@ -57,8 +57,6 @@ print_report (UProfReport *report, UProfContext *context)
float fps; float fps;
ClutterUProfReportState state; ClutterUProfReportState state;
g_print ("\n");
/* FIXME: We need to fix the way Clutter initializes the uprof library /* FIXME: We need to fix the way Clutter initializes the uprof library
* (we don't currently call uprof_init()) and add a mechanism to know * (we don't currently call uprof_init()) and add a mechanism to know
* if uprof_init hasn't been called so we can simply bail out of report * if uprof_init hasn't been called so we can simply bail out of report
@ -66,23 +64,25 @@ print_report (UProfReport *report, UProfContext *context)
* Probably we can just have uprof_report_print bail out if uprof wasn't * Probably we can just have uprof_report_print bail out if uprof wasn't
* initialized, so we don't have to care here. * initialized, so we don't have to care here.
*/ */
mainloop_timer = uprof_context_get_timer_result (context, "Mainloop");
if (!mainloop_timer)
return;
stage_paint_timer = uprof_context_get_timer_result (context, "Redrawing"); stage_paint_timer = uprof_context_get_timer_result (context, "Redrawing");
#if 0
if (!stage_paint_timer) if (!stage_paint_timer)
g_critical ("Failed to find \"Redrawing\" timer " return;
"(you need to update print_report code if you rename it)\n"); do_pick_timer = uprof_context_get_timer_result (context, "Do pick");
#endif if (!do_pick_timer)
return;
g_print ("\n");
state.n_frames = uprof_timer_result_get_start_count (stage_paint_timer); state.n_frames = uprof_timer_result_get_start_count (stage_paint_timer);
g_print ("Frame count = %lu\n", state.n_frames); g_print ("Frame count = %lu\n", state.n_frames);
mainloop_timer = uprof_context_get_timer_result (context, "Mainloop");
fps = (float)state.n_frames / (uprof_timer_result_get_total_msecs (mainloop_timer) fps = (float)state.n_frames / (uprof_timer_result_get_total_msecs (mainloop_timer)
/ 1000.0); / 1000.0);
g_print ("Average fps = %5.2f\n", fps); g_print ("Average fps = %5.2f\n", fps);
do_pick_timer = uprof_context_get_timer_result (context, "Do pick");
if (do_pick_timer) if (do_pick_timer)
{ {
int n_picks = uprof_timer_result_get_start_count (do_pick_timer); int n_picks = uprof_timer_result_get_start_count (do_pick_timer);