mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2026-02-09 22:50:54 +00:00
libsysprof-profile: give Profiler a spawnable
And pass it along to the recording so that it can manage spawning the subprocess during the record loop.
This commit is contained in:
@ -30,20 +30,29 @@
|
|||||||
|
|
||||||
struct _SysprofProfiler
|
struct _SysprofProfiler
|
||||||
{
|
{
|
||||||
GObject parent_instance;
|
GObject parent_instance;
|
||||||
GPtrArray *instruments;
|
GPtrArray *instruments;
|
||||||
|
SysprofSpawnable *spawnable;
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
|
PROP_SPAWNABLE,
|
||||||
N_PROPS
|
N_PROPS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static GParamSpec *properties [N_PROPS];
|
||||||
|
|
||||||
G_DEFINE_FINAL_TYPE (SysprofProfiler, sysprof_profiler, G_TYPE_OBJECT)
|
G_DEFINE_FINAL_TYPE (SysprofProfiler, sysprof_profiler, G_TYPE_OBJECT)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sysprof_profiler_finalize (GObject *object)
|
sysprof_profiler_finalize (GObject *object)
|
||||||
{
|
{
|
||||||
|
SysprofProfiler *self = (SysprofProfiler *)object;
|
||||||
|
|
||||||
|
g_clear_pointer (&self->instruments, g_ptr_array_unref);
|
||||||
|
g_clear_object (&self->spawnable);
|
||||||
|
|
||||||
G_OBJECT_CLASS (sysprof_profiler_parent_class)->finalize (object);
|
G_OBJECT_CLASS (sysprof_profiler_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,8 +62,14 @@ sysprof_profiler_get_property (GObject *object,
|
|||||||
GValue *value,
|
GValue *value,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
|
SysprofProfiler *self = SYSPROF_PROFILER (object);
|
||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
|
case PROP_SPAWNABLE:
|
||||||
|
g_value_set_object (value, sysprof_profiler_get_spawnable (self));
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
}
|
}
|
||||||
@ -66,8 +81,14 @@ sysprof_profiler_set_property (GObject *object,
|
|||||||
const GValue *value,
|
const GValue *value,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
|
SysprofProfiler *self = SYSPROF_PROFILER (object);
|
||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
|
case PROP_SPAWNABLE:
|
||||||
|
sysprof_profiler_set_spawnable (self, g_value_get_object (value));
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
}
|
}
|
||||||
@ -81,6 +102,13 @@ sysprof_profiler_class_init (SysprofProfilerClass *klass)
|
|||||||
object_class->finalize = sysprof_profiler_finalize;
|
object_class->finalize = sysprof_profiler_finalize;
|
||||||
object_class->get_property = sysprof_profiler_get_property;
|
object_class->get_property = sysprof_profiler_get_property;
|
||||||
object_class->set_property = sysprof_profiler_set_property;
|
object_class->set_property = sysprof_profiler_set_property;
|
||||||
|
|
||||||
|
properties [PROP_SPAWNABLE] =
|
||||||
|
g_param_spec_object ("spawnable", NULL, NULL,
|
||||||
|
SYSPROF_TYPE_SPAWNABLE,
|
||||||
|
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
|
g_object_class_install_properties (object_class, N_PROPS, properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -139,6 +167,7 @@ sysprof_profiler_record_async (SysprofProfiler *self,
|
|||||||
g_task_set_source_tag (task, sysprof_profiler_record_async);
|
g_task_set_source_tag (task, sysprof_profiler_record_async);
|
||||||
|
|
||||||
recording = _sysprof_recording_new (writer,
|
recording = _sysprof_recording_new (writer,
|
||||||
|
self->spawnable,
|
||||||
(SysprofInstrument **)self->instruments->pdata,
|
(SysprofInstrument **)self->instruments->pdata,
|
||||||
self->instruments->len);
|
self->instruments->len);
|
||||||
|
|
||||||
@ -169,3 +198,30 @@ sysprof_profiler_record_finish (SysprofProfiler *self,
|
|||||||
|
|
||||||
return g_task_propagate_pointer (G_TASK (result), error);
|
return g_task_propagate_pointer (G_TASK (result), error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* sysprof_profiler_get_spawnable:
|
||||||
|
* @self: a #SysprofProfiler
|
||||||
|
*
|
||||||
|
* Gets the #SysprofProfiler:spawnable property.
|
||||||
|
*
|
||||||
|
* Returns: (nullable) (transfer none): a #SysprofSpawnable or %NULL
|
||||||
|
*/
|
||||||
|
SysprofSpawnable *
|
||||||
|
sysprof_profiler_get_spawnable (SysprofProfiler *self)
|
||||||
|
{
|
||||||
|
g_return_val_if_fail (SYSPROF_IS_PROFILER (self), NULL);
|
||||||
|
|
||||||
|
return self->spawnable;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sysprof_profiler_set_spawnable (SysprofProfiler *self,
|
||||||
|
SysprofSpawnable *spawnable)
|
||||||
|
{
|
||||||
|
g_return_if_fail (SYSPROF_IS_PROFILER (self));
|
||||||
|
g_return_if_fail (!spawnable || SYSPROF_IS_SPAWNABLE (spawnable));
|
||||||
|
|
||||||
|
if (g_set_object (&self->spawnable, spawnable))
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_SPAWNABLE]);
|
||||||
|
}
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
|
|
||||||
#include "sysprof-instrument.h"
|
#include "sysprof-instrument.h"
|
||||||
#include "sysprof-recording.h"
|
#include "sysprof-recording.h"
|
||||||
|
#include "sysprof-spawnable.h"
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
@ -37,6 +38,11 @@ G_DECLARE_FINAL_TYPE (SysprofProfiler, sysprof_profiler, SYSPROF, PROFILER, GObj
|
|||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
SysprofProfiler *sysprof_profiler_new (void);
|
SysprofProfiler *sysprof_profiler_new (void);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
|
SysprofSpawnable *sysprof_profiler_get_spawnable (SysprofProfiler *self);
|
||||||
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
|
void sysprof_profiler_set_spawnable (SysprofProfiler *self,
|
||||||
|
SysprofSpawnable *spawnable);
|
||||||
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
void sysprof_profiler_add_instrument (SysprofProfiler *self,
|
void sysprof_profiler_add_instrument (SysprofProfiler *self,
|
||||||
SysprofInstrument *instrument);
|
SysprofInstrument *instrument);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
|
|||||||
@ -29,6 +29,7 @@
|
|||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
SysprofRecording *_sysprof_recording_new (SysprofCaptureWriter *writer,
|
SysprofRecording *_sysprof_recording_new (SysprofCaptureWriter *writer,
|
||||||
|
SysprofSpawnable *spawnable,
|
||||||
SysprofInstrument **instruments,
|
SysprofInstrument **instruments,
|
||||||
guint n_instruments);
|
guint n_instruments);
|
||||||
void _sysprof_recording_start (SysprofRecording *self);
|
void _sysprof_recording_start (SysprofRecording *self);
|
||||||
|
|||||||
@ -164,45 +164,18 @@ sysprof_recording_finalize (GObject *object)
|
|||||||
|
|
||||||
g_clear_pointer (&self->writer, sysprof_capture_writer_unref);
|
g_clear_pointer (&self->writer, sysprof_capture_writer_unref);
|
||||||
g_clear_pointer (&self->instruments, g_ptr_array_unref);
|
g_clear_pointer (&self->instruments, g_ptr_array_unref);
|
||||||
|
g_clear_object (&self->spawnable);
|
||||||
dex_clear (&self->fiber);
|
dex_clear (&self->fiber);
|
||||||
|
|
||||||
G_OBJECT_CLASS (sysprof_recording_parent_class)->finalize (object);
|
G_OBJECT_CLASS (sysprof_recording_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
sysprof_recording_get_property (GObject *object,
|
|
||||||
guint prop_id,
|
|
||||||
GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sysprof_recording_set_property (GObject *object,
|
|
||||||
guint prop_id,
|
|
||||||
const GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sysprof_recording_class_init (SysprofRecordingClass *klass)
|
sysprof_recording_class_init (SysprofRecordingClass *klass)
|
||||||
{
|
{
|
||||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||||
|
|
||||||
object_class->finalize = sysprof_recording_finalize;
|
object_class->finalize = sysprof_recording_finalize;
|
||||||
object_class->get_property = sysprof_recording_get_property;
|
|
||||||
object_class->set_property = sysprof_recording_set_property;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -214,6 +187,7 @@ sysprof_recording_init (SysprofRecording *self)
|
|||||||
|
|
||||||
SysprofRecording *
|
SysprofRecording *
|
||||||
_sysprof_recording_new (SysprofCaptureWriter *writer,
|
_sysprof_recording_new (SysprofCaptureWriter *writer,
|
||||||
|
SysprofSpawnable *spawnable,
|
||||||
SysprofInstrument **instruments,
|
SysprofInstrument **instruments,
|
||||||
guint n_instruments)
|
guint n_instruments)
|
||||||
{
|
{
|
||||||
@ -224,6 +198,8 @@ _sysprof_recording_new (SysprofCaptureWriter *writer,
|
|||||||
self = g_object_new (SYSPROF_TYPE_RECORDING, NULL);
|
self = g_object_new (SYSPROF_TYPE_RECORDING, NULL);
|
||||||
self->writer = sysprof_capture_writer_ref (writer);
|
self->writer = sysprof_capture_writer_ref (writer);
|
||||||
|
|
||||||
|
g_set_object (&self->spawnable, spawnable);
|
||||||
|
|
||||||
for (guint i = 0; i < n_instruments; i++)
|
for (guint i = 0; i < n_instruments; i++)
|
||||||
g_ptr_array_add (self->instruments, g_object_ref (instruments[i]));
|
g_ptr_array_add (self->instruments, g_object_ref (instruments[i]));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user