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-analyze: use ref strings internally

Browse Source 
This gives us a bit more control than the string chunk, so long as we can
rely on the allocator to do something nice.
This commit is contained in:
Christian Hergert
2023-05-02 13:30:09 -07:00
parent ffb6533e02
commit 4505e8bb85
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsysprof-analyze/sysprof-document-private.h
View File

@ -20,9 +20,11 @@
#pragma once #pragma once
#include "sysprof-document.h"
G_BEGIN_DECLS G_BEGIN_DECLS
const char *sysprof_document_intern_string (SysprofDocument *self, char *_sysprof_document_ref_string (SysprofDocument *self,
const char *name); const char *name);
G_END_DECLS G_END_DECLS

24
src/libsysprof-analyze/sysprof-document.c
View File

@ -36,7 +36,7 @@ struct _SysprofDocument
const guint8 *base; const guint8 *base;
GMutex strings_mutex; GMutex strings_mutex;
GStringChunk *strings; GHashTable *strings;
SysprofCaptureFileHeader header; SysprofCaptureFileHeader header;
guint needs_swap : 1; guint needs_swap : 1;
@ -96,7 +96,7 @@ sysprof_document_finalize (GObject *object)
g_clear_pointer (&self->mapped_file, g_mapped_file_unref); g_clear_pointer (&self->mapped_file, g_mapped_file_unref);
g_clear_pointer (&self->frames, g_array_unref); g_clear_pointer (&self->frames, g_array_unref);
g_clear_pointer (&self->strings, g_string_chunk_free); g_clear_pointer (&self->strings, g_hash_table_unref);
g_mutex_clear (&self->strings_mutex); g_mutex_clear (&self->strings_mutex);
@ -114,7 +114,8 @@ static void
sysprof_document_init (SysprofDocument *self) sysprof_document_init (SysprofDocument *self)
{ {
self->frames = g_array_new (FALSE, FALSE, sizeof (SysprofDocumentFramePointer)); self->frames = g_array_new (FALSE, FALSE, sizeof (SysprofDocumentFramePointer));
self->strings = g_string_chunk_new (4096L * 4); self->strings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
(GDestroyNotify)g_ref_string_release);
g_mutex_init (&self->strings_mutex); g_mutex_init (&self->strings_mutex);
} }
@ -247,18 +248,25 @@ sysprof_document_new (const char *filename,
return g_steal_pointer (&self); return g_steal_pointer (&self);
} }
const char * char *
sysprof_document_intern_string (SysprofDocument *self, _sysprof_document_ref_string (SysprofDocument *self,
const char *name) const char *name)
{ {
char *ret;
g_return_val_if_fail (SYSPROF_IS_DOCUMENT (self), NULL); g_return_val_if_fail (SYSPROF_IS_DOCUMENT (self), NULL);
if (name == NULL) if (name == NULL)
return NULL; return NULL;
g_mutex_lock (&self->strings_mutex); g_mutex_lock (&self->strings_mutex);
name = g_string_chunk_insert_const (self->strings, name); if (!(ret = g_hash_table_lookup (self->strings, name)))
{
ret = g_ref_string_new (name);
g_hash_table_insert (self->strings, ret, ret);
}
ret = g_ref_string_acquire (ret);
g_mutex_unlock (&self->strings_mutex); g_mutex_unlock (&self->strings_mutex);
return name; return ret;
} }