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

proc: use helpers for proc access

Browse Source
This commit is contained in:
Christian Hergert
2019-05-09 17:30:24 -07:00
parent e282aa78c9
commit a361c66085
1 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/libsysprof/sysprof-proc-source.c
View File

@ -43,13 +43,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "sysprof-helpers.h"
#include "sysprof-proc-source.h" #include "sysprof-proc-source.h"
struct _SysprofProcSource struct _SysprofProcSource
{ {
GObject parent_instance; GObject parent_instance;
SysprofCaptureWriter *writer; SysprofCaptureWriter *writer;
GArray *pids; GArray *pids;
}; };
static void source_iface_init (SysprofSourceInterface *iface); static void source_iface_init (SysprofSourceInterface *iface);
@ -64,11 +65,11 @@ static gchar **
proc_readlines (const gchar *format, proc_readlines (const gchar *format,
...) ...)
{ {
SysprofHelpers *helpers = sysprof_helpers_get_default ();
g_autofree gchar *filename = NULL;
g_autofree gchar *contents = NULL;
gchar **ret = NULL; gchar **ret = NULL;
gchar *filename = NULL;
gchar *contents = NULL;
va_list args; va_list args;
gsize len;
g_assert (format != NULL); g_assert (format != NULL);
@ -76,13 +77,10 @@ proc_readlines (const gchar *format,
filename = g_strdup_vprintf (format, args); filename = g_strdup_vprintf (format, args);
va_end (args); va_end (args);
if (g_file_get_contents (filename, &contents, &len, NULL)) if (sysprof_helpers_get_proc_file (helpers, filename, NULL, &contents, NULL))
ret = g_strsplit (contents, "\n", 0); ret = g_strsplit (contents, "\n", 0);
g_free (contents); return g_steal_pointer (&ret);
g_free (filename);
return ret;
} }
gchar * gchar *
@ -382,20 +380,19 @@ sysprof_proc_source_populate_maps (SysprofProcSource *self,
static void static void
sysprof_proc_source_populate (SysprofProcSource *self) sysprof_proc_source_populate (SysprofProcSource *self)
{ {
SysprofHelpers *helpers = sysprof_helpers_get_default ();
g_auto(GStrv) mounts = NULL; g_auto(GStrv) mounts = NULL;
const gchar *name; g_autofree gint32 *pids = NULL;
GDir *dir; gsize n_pids = 0;
g_assert (SYSPROF_IS_PROC_SOURCE (self)); g_assert (SYSPROF_IS_PROC_SOURCE (self));
if (NULL == (mounts = proc_readlines ("/proc/mounts"))) if (!(mounts = proc_readlines ("/proc/mounts")))
return; return;
if (self->pids->len > 0) if (self->pids->len > 0)
{ {
guint i; for (guint i = 0; i < self->pids->len; i++)
for (i = 0; i < self->pids->len; i++)
{ {
GPid pid = g_array_index (self->pids, GPid, i); GPid pid = g_array_index (self->pids, GPid, i);
@ -406,23 +403,14 @@ sysprof_proc_source_populate (SysprofProcSource *self)
return; return;
} }
if (NULL == (dir = g_dir_open ("/proc", 0, NULL))) if (sysprof_helpers_list_processes (helpers, NULL, &pids, &n_pids, NULL))
return;
while (NULL != (name = g_dir_read_name (dir)))
{ {
GPid pid; for (guint i = 0; i < n_pids; i++)
char *end; {
sysprof_proc_source_populate_process (self, pids[i]);
pid = strtol (name, &end, 10); sysprof_proc_source_populate_maps (self, pids[i], mounts);
if (pid <= 0 || *end != '\0') }
continue;
sysprof_proc_source_populate_process (self, pid);
sysprof_proc_source_populate_maps (self, pid, mounts);
} }
g_dir_close (dir);
} }
static void static void
@ -461,7 +449,7 @@ sysprof_proc_source_set_writer (SysprofSource *source,
static void static void
sysprof_proc_source_add_pid (SysprofSource *source, sysprof_proc_source_add_pid (SysprofSource *source,
GPid pid) GPid pid)
{ {
SysprofProcSource *self = (SysprofProcSource *)source; SysprofProcSource *self = (SysprofProcSource *)source;
guint i; guint i;