int marker_format_event(LttTrace *trace, GQuark name, const char *format)
{
struct marker_info *info;
+ char *fquery;
+ char *fcopy;
- info = g_hash_table_lookup(trace->markers_hash, (gconstpointer)name);
- if (!info)
- g_error("Got marker format \"%s\", but marker name \"%s\" has no ID yet. "
- "Kernel issue.",
- format, name);
+ fquery = marker_get_format_from_name(trace, name);
+ if (fquery) {
+ if (strcmp(fquery, format) != 0)
+ g_error("Marker format mismatch \"%s\" vs \"%s\" for marker %s. "
+ "Kernel issue.", fquery, format, g_quark_to_string(name));
+ else
+ return 0; /* Already exists. Nothing to do. */
+ }
+ fcopy = g_new(char, strlen(format)+1);
+ strcpy(fcopy, format);
+ g_hash_table_insert(trace->markers_format_hash, (gpointer)(gulong)name,
+ (gpointer)fcopy);
+
+ info = marker_get_info_from_name(trace, name);
for (; info != NULL; info = info->next) {
- if (info->format)
- g_free(info->format);
- info->format = g_new(char, strlen(format)+1);
- strcpy(info->format, format);
+ info->format = fcopy;
if (marker_parse_format(format, info))
g_error("Error parsing marker format \"%s\" for marker \"%s\"", format,
g_quark_to_string(name));
int found = 0;
if (trace->markers->len <= id)
- trace->markers = g_array_set_size(trace->markers, id+1);
+ trace->markers = g_array_set_size(trace->markers,
+ max(trace->markers->len * 2, id + 1));
info = &g_array_index(trace->markers, struct marker_info, id);
info->name = name;
info->int_size = int_size;
info->pointer_size = pointer_size;
info->size_t_size = size_t_size;
info->alignment = alignment;
+ info->fields = NULL;
info->next = NULL;
- head = g_hash_table_lookup(trace->markers_hash, (gconstpointer)name);
+ info->format = marker_get_format_from_name(trace, name);
+ if (info->format && marker_parse_format(info->format, info))
+ g_error("Error parsing marker format \"%s\" for marker \"%s\"",
+ info->format, g_quark_to_string(name));
+ head = marker_get_info_from_name(trace, name);
if (!head)
- g_hash_table_insert(trace->markers_hash, (gpointer)name, info);
+ g_hash_table_insert(trace->markers_hash, (gpointer)(gulong)name,
+ (gpointer)(gulong)id);
else {
struct marker_info *iter;
for (iter = head; iter != NULL; iter = iter->next)
if (iter->name == name)
found = 1;
if (!found) {
- g_hash_table_replace(trace->markers_hash, (gpointer)name, info);
+ g_hash_table_replace(trace->markers_hash, (gpointer)(gulong)name,
+ (gpointer)(gulong)id);
info->next = head;
}
}
if (!trace->markers)
return -ENOMEM;
trace->markers_hash = g_hash_table_new(g_direct_hash, g_direct_equal);
+ if (!trace->markers_hash)
+ return -ENOMEM;
+ trace->markers_format_hash = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, g_free);
if (!trace->markers_hash)
return -ENOMEM;
return 0;
for (i=0; i<trace->markers->len; i++) {
info = &g_array_index(trace->markers, struct marker_info, i);
- if (info->format)
- g_free(info->format);
if (info->fields)
g_array_free(info->fields, TRUE);
}
g_array_free(trace->markers, TRUE);
g_hash_table_destroy(trace->markers_hash);
+ g_hash_table_destroy(trace->markers_format_hash);
}