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-capture: allow using ring in readwrite mode

Browse Source 
This is a first step to be able to use the ring buffer as the backing
buffer for the SysprofCaptureWriter.
This commit is contained in:
Christian Hergert
2020-02-15 22:50:22 -07:00
parent 36860b449e
commit 69e4fb2588
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libsysprof-capture/mapped-ring-buffer.c
View File

@ -36,8 +36,9 @@
#define BUFFER_MAX_SIZE ((G_MAXUINT32/2)-_sysprof_getpagesize()) #define BUFFER_MAX_SIZE ((G_MAXUINT32/2)-_sysprof_getpagesize())
enum { enum {
MODE_READER = 1, MODE_READER = 1,
MODE_WRITER = 2, MODE_WRITER = 2,
MODE_READWRITE = 3,
}; };
/* /*
@ -209,6 +210,17 @@ mapped_ring_buffer_new_reader (gsize buffer_size)
return g_steal_pointer (&self); return g_steal_pointer (&self);
} }
MappedRingBuffer *
mapped_ring_buffer_new_readwrite (gsize buffer_size)
{
MappedRingBuffer *self;
if ((self = mapped_ring_buffer_new_reader (buffer_size)))
self->mode = MODE_READWRITE;
return self;
}
/** /**
* mapped_ring_buffer_new_writer: * mapped_ring_buffer_new_writer:
* @fd: a FD to map * @fd: a FD to map
@ -363,7 +375,7 @@ mapped_ring_buffer_allocate (MappedRingBuffer *self,
gsize tailpos; gsize tailpos;
g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (self->mode == MODE_WRITER, NULL); g_return_val_if_fail (self->mode & MODE_WRITER, NULL);
g_return_val_if_fail (length > 0, NULL); g_return_val_if_fail (length > 0, NULL);
g_return_val_if_fail (length < self->body_size, NULL); g_return_val_if_fail (length < self->body_size, NULL);
g_return_val_if_fail ((length & 0x7) == 0, NULL); g_return_val_if_fail ((length & 0x7) == 0, NULL);
@ -419,7 +431,7 @@ mapped_ring_buffer_advance (MappedRingBuffer *self,
guint32 tail; guint32 tail;
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);
g_return_if_fail (self->mode == MODE_WRITER); g_return_if_fail (self->mode & MODE_WRITER);
g_return_if_fail (length > 0); g_return_if_fail (length > 0);
g_return_if_fail (length < self->body_size); g_return_if_fail (length < self->body_size);
g_return_if_fail ((length & 0x7) == 0); g_return_if_fail ((length & 0x7) == 0);
@ -464,7 +476,7 @@ mapped_ring_buffer_drain (MappedRingBuffer *self,
gsize tailpos; gsize tailpos;
g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (self->mode == MODE_READER, FALSE); g_return_val_if_fail (self->mode & MODE_READER, FALSE);
g_return_val_if_fail (callback != NULL, FALSE); g_return_val_if_fail (callback != NULL, FALSE);
header = get_header (self); header = get_header (self);

2
src/libsysprof-capture/mapped-ring-buffer.h
View File

@ -56,6 +56,8 @@ typedef gboolean (*MappedRingBufferCallback) (gconstpointer data,
G_GNUC_INTERNAL G_GNUC_INTERNAL
MappedRingBuffer *mapped_ring_buffer_new_reader (gsize buffer_size); MappedRingBuffer *mapped_ring_buffer_new_reader (gsize buffer_size);
G_GNUC_INTERNAL G_GNUC_INTERNAL
MappedRingBuffer *mapped_ring_buffer_new_readwrite (gsize buffer_size);
G_GNUC_INTERNAL
MappedRingBuffer *mapped_ring_buffer_new_writer (gint fd); MappedRingBuffer *mapped_ring_buffer_new_writer (gint fd);
G_GNUC_INTERNAL G_GNUC_INTERNAL
gint mapped_ring_buffer_get_fd (MappedRingBuffer *self); gint mapped_ring_buffer_get_fd (MappedRingBuffer *self);

21
src/tests/test-mapped-ring-buffer.c
View File

@ -164,12 +164,33 @@ test_threaded_movements (void)
g_thread_join (thread2); g_thread_join (thread2);
} }
static void
test_readwrite (void)
{
MappedRingBuffer *ring;
gint64 *ptr;
ring = mapped_ring_buffer_new_readwrite (4096*16);
g_assert_nonnull (ring);
real_count = 0;
while ((ptr = mapped_ring_buffer_allocate (ring, sizeof *ptr)))
{
static gint64 count;
g_assert ((GPOINTER_TO_SIZE(ptr) & 0x7) == 0);
*ptr = ++count;
mapped_ring_buffer_advance (ring, sizeof *ptr);
}
mapped_ring_buffer_drain (ring, drain_count_cb, NULL);
}
gint gint
main (gint argc, main (gint argc,
gchar *argv[]) gchar *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MappedRingBuffer/basic_movements", test_basic_movements); g_test_add_func ("/MappedRingBuffer/basic_movements", test_basic_movements);
g_test_add_func ("/MappedRingBuffer/readwrite", test_readwrite);
g_test_add_func ("/MappedRingBuffer/threaded_movements", test_threaded_movements); g_test_add_func ("/MappedRingBuffer/threaded_movements", test_threaded_movements);
return g_test_run (); return g_test_run ();
} }