varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-11 15:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-profile: use shared time for process times

Browse Source
This commit is contained in:
Christian Hergert
2023-07-10 13:35:50 -07:00
parent f003482afb
commit b22e2f3b6a
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libsysprof-profile/sysprof-linux-instrument.c
View File

@ -53,7 +53,8 @@ static void
add_mmaps (SysprofRecording *recording, add_mmaps (SysprofRecording *recording,
GPid pid, GPid pid,
const char *mapsstr, const char *mapsstr,
gboolean ignore_inode) gboolean ignore_inode,
gint64 at_time)
{ {
SysprofCaptureWriter *writer; SysprofCaptureWriter *writer;
SysprofMapsParser parser; SysprofMapsParser parser;
@ -72,14 +73,8 @@ add_mmaps (SysprofRecording *recording,
if (ignore_inode) if (ignore_inode)
inode = 0; inode = 0;
sysprof_capture_writer_add_map (writer, sysprof_capture_writer_add_map (writer, at_time, -1, pid,
SYSPROF_CAPTURE_CURRENT_TIME, begin, end, offset, inode,
-1,
pid,
begin,
end,
offset,
inode,
file); file);
g_free (file); g_free (file);
} }
@ -89,7 +84,8 @@ static DexFuture *
populate_overlays (SysprofRecording *recording, populate_overlays (SysprofRecording *recording,
SysprofPodman *podman, SysprofPodman *podman,
int pid, int pid,
const char *cgroup) const char *cgroup,
gint64 at_time)
{ {
static GRegex *flatpak_regex; static GRegex *flatpak_regex;
static GRegex *podman_regex; static GRegex *podman_regex;
@ -139,9 +135,8 @@ populate_overlays (SysprofRecording *recording,
if ((layers = sysprof_podman_get_layers (podman, word))) if ((layers = sysprof_podman_get_layers (podman, word)))
{ {
for (guint i = 0; layers[i]; i++) for (guint i = 0; layers[i]; i++)
sysprof_capture_writer_add_overlay (writer, sysprof_capture_writer_add_overlay (writer, at_time, -1, pid,
SYSPROF_CAPTURE_CURRENT_TIME, i, layers[i], "/");
-1, pid, i, layers[i], "/");
} }
return _sysprof_recording_add_file (recording, path, FALSE); return _sysprof_recording_add_file (recording, path, FALSE);
@ -158,7 +153,8 @@ populate_overlays (SysprofRecording *recording,
static DexFuture * static DexFuture *
add_process_info (SysprofRecording *recording, add_process_info (SysprofRecording *recording,
GVariant *process_info) GVariant *process_info,
gint64 at_time)
{ {
g_autoptr(SysprofPodman) podman = NULL; g_autoptr(SysprofPodman) podman = NULL;
g_autoptr(GPtrArray) futures = NULL; g_autoptr(GPtrArray) futures = NULL;
@ -208,10 +204,7 @@ add_process_info (SysprofRecording *recording,
cgroup = ""; cgroup = "";
/* Notify the capture that a process was spawned */ /* Notify the capture that a process was spawned */
sysprof_capture_writer_add_process (writer, sysprof_capture_writer_add_process (writer, at_time, -1, pid,
SYSPROF_CAPTURE_CURRENT_TIME,
-1,
pid,
*cmdline ? cmdline : comm); *cmdline ? cmdline : comm);
/* Give the capture access to the mountinfo of that process to aid /* Give the capture access to the mountinfo of that process to aid
@ -224,13 +217,13 @@ add_process_info (SysprofRecording *recording,
* wrong. We'll have to rely on CRC/build-id instead. * wrong. We'll have to rely on CRC/build-id instead.
*/ */
ignore_inode = strstr (cgroup, "/libpod-") != NULL; ignore_inode = strstr (cgroup, "/libpod-") != NULL;
add_mmaps (recording, pid, maps, ignore_inode); add_mmaps (recording, pid, maps, ignore_inode, at_time);
/* We might have overlays that need to be applied to the process /* We might have overlays that need to be applied to the process
* which can be rather combursome for old-style Podman using * which can be rather combursome for old-style Podman using
* FUSE overlayfs. * FUSE overlayfs.
*/ */
g_ptr_array_add (futures, populate_overlays (recording, podman, pid, cgroup)); g_ptr_array_add (futures, populate_overlays (recording, podman, pid, cgroup, at_time));
skip: skip:
g_variant_dict_clear (&dict); g_variant_dict_clear (&dict);
@ -283,6 +276,7 @@ sysprof_linux_instrument_record_fiber (gpointer user_data)
g_autoptr(GVariant) process_info_reply = NULL; g_autoptr(GVariant) process_info_reply = NULL;
g_autoptr(GVariant) process_info = NULL; g_autoptr(GVariant) process_info = NULL;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
gint64 at_time;
g_assert (SYSPROF_IS_RECORDING (recording)); g_assert (SYSPROF_IS_RECORDING (recording));
@ -293,6 +287,7 @@ sysprof_linux_instrument_record_fiber (gpointer user_data)
/* We also want to get a bunch of info on user processes so that we can add /* We also want to get a bunch of info on user processes so that we can add
* records about them to the recording. * records about them to the recording.
*/ */
at_time = SYSPROF_CAPTURE_CURRENT_TIME;
if (!(process_info_reply = dex_await_variant (dex_dbus_connection_call (bus, if (!(process_info_reply = dex_await_variant (dex_dbus_connection_call (bus,
"org.gnome.Sysprof3", "org.gnome.Sysprof3",
"/org/gnome/Sysprof3", "/org/gnome/Sysprof3",
@ -307,7 +302,7 @@ sysprof_linux_instrument_record_fiber (gpointer user_data)
/* Add process records for each of the processes discovered */ /* Add process records for each of the processes discovered */
process_info = g_variant_get_child_value (process_info_reply, 0); process_info = g_variant_get_child_value (process_info_reply, 0);
dex_await (add_process_info (recording, process_info), NULL); dex_await (add_process_info (recording, process_info, at_time), NULL);
return dex_future_new_for_boolean (TRUE); return dex_future_new_for_boolean (TRUE);
} }