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

libsysprof-capture: avoid recursion in TLS cleanup

Browse Source
This commit is contained in:
Christian Hergert
2020-02-16 20:58:39 -08:00
parent 135b5d2fbf
commit ee5c43f107
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libsysprof-capture/sysprof-collector.c
View File

@ -88,7 +88,7 @@ typedef struct
int pid; int pid;
} SysprofCollector; } SysprofCollector;
#define COLLECTOR_MAGIC_CREATING ((gpointer)&creating) #define COLLECTOR_INVALID ((gpointer)&invalid)
static MappedRingBuffer *request_writer (void); static MappedRingBuffer *request_writer (void);
static void sysprof_collector_free (gpointer data); static void sysprof_collector_free (gpointer data);
@ -98,7 +98,7 @@ static G_LOCK_DEFINE (control_fd);
static GPrivate collector_key = G_PRIVATE_INIT (sysprof_collector_free); static GPrivate collector_key = G_PRIVATE_INIT (sysprof_collector_free);
static GPrivate single_trace_key = G_PRIVATE_INIT (NULL); static GPrivate single_trace_key = G_PRIVATE_INIT (NULL);
static SysprofCollector *shared_collector; static SysprofCollector *shared_collector;
static SysprofCollector creating; static SysprofCollector invalid;
static inline gboolean static inline gboolean
use_single_trace (void) use_single_trace (void)
@ -201,12 +201,14 @@ sysprof_collector_free (gpointer data)
{ {
SysprofCollector *collector = data; SysprofCollector *collector = data;
if (collector != NULL && collector != COLLECTOR_MAGIC_CREATING) if (collector != NULL && collector != COLLECTOR_INVALID)
{ {
if (collector->buffer != NULL) MappedRingBuffer *buffer = g_steal_pointer (&collector->buffer);
if (buffer != NULL)
{ {
write_final_frame (collector->buffer); write_final_frame (buffer);
g_clear_pointer (&collector->buffer, mapped_ring_buffer_unref); mapped_ring_buffer_unref (buffer);
} }
g_free (collector); g_free (collector);
@ -219,19 +221,19 @@ sysprof_collector_get (void)
const SysprofCollector *collector = g_private_get (&collector_key); const SysprofCollector *collector = g_private_get (&collector_key);
/* We might have gotten here recursively */ /* We might have gotten here recursively */
if G_UNLIKELY (collector == COLLECTOR_MAGIC_CREATING) if G_UNLIKELY (collector == COLLECTOR_INVALID)
return COLLECTOR_MAGIC_CREATING; return COLLECTOR_INVALID;
if G_LIKELY (collector != NULL) if G_LIKELY (collector != NULL)
return collector; return collector;
if (use_single_trace () && shared_collector != COLLECTOR_MAGIC_CREATING) if (use_single_trace () && shared_collector != COLLECTOR_INVALID)
return shared_collector; return shared_collector;
{ {
SysprofCollector *self; SysprofCollector *self;
g_private_replace (&collector_key, COLLECTOR_MAGIC_CREATING); g_private_replace (&collector_key, COLLECTOR_INVALID);
G_LOCK (control_fd); G_LOCK (control_fd);