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: fix tag lookups for 0 tags

Browse Source
This commit is contained in:
Christian Hergert
2019-05-28 20:08:59 -07:00
parent c013264186
commit 1583ec3f79
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/libsysprof/sysprof-symbol-map.c
View File

@ -205,11 +205,14 @@ sysprof_symbol_map_lookup (SysprofSymbolMap *self,
sizeof *ret,
search_for_symbol_cb);
if (ret == NULL)
if (ret == NULL || ret->offset == 0)
return NULL;
if (tag != NULL && ret->tag_offset < (self->endptr - self->beginptr))
*tag = g_quark_from_string (&self->beginptr[ret->tag_offset]);
if (tag != NULL && ret->tag_offset > 0)
{
if (ret->tag_offset < (self->endptr - self->beginptr))
*tag = g_quark_from_string (&self->beginptr[ret->tag_offset]);
}
if (ret->offset < (self->endptr - self->beginptr))
return &self->beginptr[ret->offset];
@ -350,6 +353,9 @@ get_string_offset (GByteArray *ar,
{
gpointer ret;
if (str == NULL)
return 0;
if G_UNLIKELY (!g_hash_table_lookup_extended (seen, str, NULL, &ret))
{
ret = GUINT_TO_POINTER (ar->len);
@ -383,19 +389,6 @@ sysprof_symbol_map_serialize (SysprofSymbolMap *self,
*/
g_byte_array_append (ar, (guint8 *)&empty, sizeof empty);
for (guint i = 0; i < self->samples->len; i++)
{
Element *ele = g_ptr_array_index (self->samples, i);
if (!g_hash_table_contains (seen, ele->name))
{
const gchar *str = ele->name;
gpointer ptr = GUINT_TO_POINTER (ar->len);
g_byte_array_append (ar, (guint8 *)str, strlen (str) + 1);
g_hash_table_insert (seen, (gpointer)str, ptr);
}
}
for (guint i = 0; i < self->samples->len; i++)
{
Element *ele = g_ptr_array_index (self->samples, i);
@ -418,8 +411,15 @@ sysprof_symbol_map_serialize (SysprofSymbolMap *self,
dec.pid = ele->pid;
dec.offset = get_string_offset (ar, seen, ele->name);
g_assert (!dec.offset || g_strcmp0 (ele->name, (gchar *)&ar->data[dec.offset]) == 0);
if (ele->tag)
dec.tag_offset = get_string_offset (ar, seen, g_quark_to_string (ele->tag));
{
const gchar *tagstr = g_quark_to_string (ele->tag);
dec.tag_offset = get_string_offset (ar, seen, tagstr);
g_assert (g_strcmp0 (tagstr, (gchar *)&ar->data[dec.tag_offset]) == 0);
}
else
dec.tag_offset = 0;
@ -428,16 +428,16 @@ sysprof_symbol_map_serialize (SysprofSymbolMap *self,
begin = 0;
}
offset = sizeof empty * decoded->len;
offset = sizeof (Decoded) * (gsize)decoded->len;
for (guint i = 0; i < decoded->len; i++)
{
Decoded *dec = &g_array_index (decoded, Decoded, i);
if (dec->offset)
if (dec->offset > 0)
dec->offset += offset;
if (dec->tag_offset)
if (dec->tag_offset > 0)
dec->tag_offset += offset;
}
@ -482,6 +482,10 @@ sysprof_symbol_map_deserialize (SysprofSymbolMap *self,
beginptr = g_mapped_file_get_contents (self->mapped);
endptr = beginptr + g_mapped_file_get_length (self->mapped);
/* Ensure trialing \0 */
if (endptr > beginptr)
*(endptr - 1) = 0;
for (gchar *ptr = beginptr;
ptr < endptr && (ptr + sizeof (Decoded)) < endptr;
ptr += sizeof (Decoded))

2
src/tests/test-addr-decode.c
View File

@ -61,7 +61,7 @@ main (gint argc,
g_print ("%u: %s [%s]\n",
i,
name ? name : "-- missing --",
tag ? g_quark_to_string (tag) : "");
tag ? g_quark_to_string (tag) : "No Tag");
}
g_print ("======\n");