varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-profiler: buffer controlfd data to intermediate memfd

Browse Source 
This ensures that we don't clobber things by writing them without possible
translation. That is problematic when each controlfd process might have
it's own counter registration or JIT maps as they could collide with the
main writer's own state.

This fixes some situations where the counter data was coming in with
erroneous values.
This commit is contained in:
Christian Hergert
2023-06-27 15:02:30 -07:00
parent fbebc31c05
commit b5f3bd2b26
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libsysprof-profile/sysprof-controlfd-instrument.c
View File

@ -41,6 +41,9 @@
# include "mapped-ring-buffer-source-private.h"
#endif
G_DEFINE_AUTOPTR_CLEANUP_FUNC (SysprofCaptureReader, sysprof_capture_reader_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (SysprofCaptureWriter, sysprof_capture_writer_unref)
struct _SysprofControlfdInstrument
{
SysprofInstrument parent_instance;
@ -188,7 +191,10 @@ static DexFuture *
sysprof_controlfd_instrument_record_fiber (gpointer user_data)
{
SysprofControlfdRecording *state = user_data;
g_autoptr(SysprofCaptureWriter) temp_writer = NULL;
SysprofCaptureWriter *writer;
g_autoptr(GError) error = NULL;
g_autofd int mem_fd = -1;
GInputStream *input;
g_assert (state != NULL);
@ -198,6 +204,12 @@ sysprof_controlfd_instrument_record_fiber (gpointer user_data)
input = g_io_stream_get_input_stream (G_IO_STREAM (state->stream));
if (!(mem_fd = sysprof_memfd_create ("[controlfd-memfd]")))
return dex_future_new_for_errno (errno);
temp_writer = sysprof_capture_writer_new_from_fd (g_steal_fd (&mem_fd), 0);
writer = _sysprof_recording_writer (state->recording);
for (;;)
{
g_autoptr(DexFuture) future = dex_input_stream_read_bytes (input, 10, 0);
@ -224,11 +236,10 @@ sysprof_controlfd_instrument_record_fiber (gpointer user_data)
if ((ring_buffer = mapped_ring_buffer_new_reader (0)))
{
int fd = mapped_ring_buffer_get_fd (ring_buffer);
SysprofCaptureWriter *writer = _sysprof_recording_writer (state->recording);
RingData *ring_data;
ring_data = g_new0 (RingData, 1);
ring_data->writer = sysprof_capture_writer_ref (writer);
ring_data->writer = sysprof_capture_writer_ref (temp_writer);
ring_data->source_ids = g_array_ref (state->source_ids);
ring_data->id = mapped_ring_buffer_create_source_full (ring_buffer,
sysprof_controlfd_instrument_frame_cb,
@ -249,6 +260,14 @@ handle_error:
g_source_remove (id);
}
if (temp_writer != NULL)
{
g_autoptr(SysprofCaptureReader) reader = sysprof_capture_writer_create_reader (temp_writer);
if (reader != NULL)
sysprof_capture_writer_cat (writer, reader);
}
if (error != NULL)
return dex_future_new_for_error (g_steal_pointer (&error));