varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

profiler: handle stop during startup more gracefully

Browse Source
This commit is contained in:
Christian Hergert
2019-02-13 15:47:38 -08:00
parent d852c3e7ac
commit f3ea9b2401
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/profiler/sp-local-profiler.c
View File

@ -74,6 +74,13 @@ typedef struct
* feature of per-process vs whole-system. * feature of per-process vs whole-system.
*/ */
guint whole_system : 1; guint whole_system : 1;
/*
* If we got a stop request after calling start() but before we have had
* a chance to settle, then we need to stop immediately after starting.
* We do this to avoid a more complex state machine (for now).
*/
guint stop_after_starting : 1;
} SpLocalProfilerPrivate; } SpLocalProfilerPrivate;
static void profiler_iface_init (SpProfilerInterface *iface); static void profiler_iface_init (SpProfilerInterface *iface);
@ -191,7 +198,13 @@ sp_local_profiler_stop (SpProfiler *profiler)
g_return_if_fail (SP_IS_LOCAL_PROFILER (self)); g_return_if_fail (SP_IS_LOCAL_PROFILER (self));
if (priv->is_stopping || (!priv->is_starting && !priv->is_running)) if (priv->is_starting)
{
priv->stop_after_starting = TRUE;
return;
}
if (priv->is_stopping || !priv->is_running)
return; return;
priv->is_stopping = TRUE; priv->is_stopping = TRUE;
@ -444,7 +457,7 @@ sp_local_profiler_finish_startup (SpLocalProfiler *self)
* *
* If we detect this, we stop immediately. * If we detect this, we stop immediately.
*/ */
if (priv->finished_or_failed->len == priv->sources->len) if (priv->finished_or_failed->len == priv->sources->len || priv->stop_after_starting)
sp_local_profiler_stop (SP_PROFILER (self)); sp_local_profiler_stop (SP_PROFILER (self));
} }