[sysprof] libsysprof: improve some defaults
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sysprof] libsysprof: improve some defaults
- Date: Wed, 29 May 2019 22:42:47 +0000 (UTC)
commit 27e75cf61b60e8305e411dd060c5490903272ade
Author: Christian Hergert <chergert redhat com>
Date: Wed May 22 16:14:31 2019 -0700
libsysprof: improve some defaults
src/libsysprof/sysprof-proxy-source.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/libsysprof/sysprof-proxy-source.c b/src/libsysprof/sysprof-proxy-source.c
index f47a37d..afb1a58 100644
--- a/src/libsysprof/sysprof-proxy-source.c
+++ b/src/libsysprof/sysprof-proxy-source.c
@@ -336,7 +336,7 @@ sysprof_proxy_source_get_bus_cb (GObject *object,
return;
}
- if (self->bus_name != NULL)
+ if (self->bus_name != NULL && self->bus_name[0])
{
sysprof_proxy_source_monitor (self, bus, self->bus_name);
return;
@@ -375,6 +375,12 @@ sysprof_proxy_source_start (SysprofSource *source)
self->has_started = TRUE;
+ /* If we're doing subprocess monitoring, we don't need to do
+ * anything special here to connect to a bus.
+ */
+ if (self->monitors->len > 0)
+ return;
+
g_bus_get (self->bus_type,
self->cancellable,
sysprof_proxy_source_get_bus_cb,
@@ -408,8 +414,6 @@ sysprof_proxy_source_complete_monitor (SysprofProxySource *self,
g_assert (monitor != NULL);
g_assert (monitor->self == self);
- g_print ("completing with FD: %d\n", monitor->fd);
-
if (!(reader = sysprof_capture_reader_new_from_fd (steal_fd (&monitor->fd), &error)))
g_warning ("Failed to load reader from peer FD: %s", error->message);
else
@@ -577,6 +581,7 @@ sysprof_proxy_source_init (SysprofProxySource *self)
self->pids = g_array_new (FALSE, FALSE, sizeof (GPid));
self->monitors = g_ptr_array_new_with_free_func ((GDestroyNotify) monitor_free);
self->is_whole_system = TRUE;
+ self->bus_type = G_BUS_TYPE_SESSION;
}
SysprofSource *
@@ -593,6 +598,9 @@ sysprof_proxy_source_new (GBusType bus_type,
if (bus_name && !*bus_name)
bus_name = NULL;
+ if (object_path && !*object_path)
+ object_path = NULL;
+
self = g_object_new (SYSPROF_TYPE_PROXY_SOURCE, NULL);
self->bus_type = bus_type;
self->bus_name = g_strdup (bus_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]