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

libsysprof: avoid await() on non-fiber

Browse Source 
That is fine to do when the futures are finished, but in this case one
might still be in-flight. Also, wait for all futures to complete before
processing them. Use a finally() block so we can check even if there are
errors.
This commit is contained in:
Christian Hergert
2023-08-31 15:21:48 -07:00
parent d9f67b27b4
commit 187bed76f4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsysprof/sysprof-linux-instrument.c
View File

@ -339,16 +339,17 @@ process_started_cb (DexFuture *completed,
for (guint i = 0; i < size; i++) for (guint i = 0; i < size; i++)
{ {
DexFuture *future = dex_future_set_get_future_at (DEX_FUTURE_SET (completed), i);
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
g_autoptr(GVariant) variant = dex_await_variant (dex_ref (future), &error); const GValue *value = NULL;
GVariant *variant = NULL;
const char *path = g_ptr_array_index (state->paths, i); const char *path = g_ptr_array_index (state->paths, i);
const char *bytestring = NULL; const char *bytestring = NULL;
if (error != NULL) if (!(value = dex_future_set_get_value_at (DEX_FUTURE_SET (completed), i, &error)))
continue; continue;
if (variant == NULL || !g_variant_is_of_type (variant, G_VARIANT_TYPE ("(ay)"))) if (!(variant = g_value_get_variant (value)) ||
!g_variant_is_of_type (variant, G_VARIANT_TYPE ("(ay)")))
g_return_val_if_reached (NULL); g_return_val_if_reached (NULL);
g_variant_get (variant, "(^&ay)", &bytestring); g_variant_get (variant, "(^&ay)", &bytestring);
@ -442,10 +443,10 @@ sysprof_linux_instrument_process_started (SysprofInstrument *instrument,
g_ptr_array_add (state->paths, g_steal_pointer (&mountinfo_path)); g_ptr_array_add (state->paths, g_steal_pointer (&mountinfo_path));
g_ptr_array_add (state->paths, g_steal_pointer (&flatpak_info_path)); g_ptr_array_add (state->paths, g_steal_pointer (&flatpak_info_path));
return dex_future_then (dex_future_any (mountinfo, flatpak_info, NULL), return dex_future_finally (dex_future_all (mountinfo, flatpak_info, NULL),
process_started_cb, process_started_cb,
state, state,
process_started_free); process_started_free);
} }
static void static void