/* parse attributes. */
repeat:
switch (*fmt) {
- case 'b':
- *attributes |= LTT_ATTRIBUTE_COMPACT;
- ++fmt;
- goto repeat;
case 'n':
*attributes |= LTT_ATTRIBUTE_NETWORK_BYTE_ORDER;
++fmt;
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
*fmt =='Z' || *fmt == 'z' || *fmt == 't' ||
*fmt == 'S' || *fmt == '1' || *fmt == '2' ||
- *fmt == '4' || *fmt == 8) {
+ *fmt == '4' || *fmt == '8') {
qualifier = *fmt;
++fmt;
if (qualifier == 'l' && *fmt == 'l') {
__attribute__((no_instrument_function))
static inline const char *parse_c_type(struct marker_info *info,
const char *fmt,
- char *c_size, enum ltt_type *c_type)
+ char *c_size, enum ltt_type *c_type, GString *field_fmt)
{
int qualifier; /* 'h', 'l', or 'L' for integer fields */
/* 'z' support added 23/7/1999 S.H. */
case ' ':
case '#':
case '0':
+ g_string_append_c(field_fmt, *fmt);
++fmt;
goto repeat;
}
case 'c':
*c_type = LTT_TYPE_UNSIGNED_INT;
*c_size = sizeof(unsigned char);
+ g_string_append_c(field_fmt, *fmt);
goto parse_end;
case 's':
*c_type = LTT_TYPE_STRING;
case 'd':
case 'i':
*c_type = LTT_TYPE_SIGNED_INT;
+ g_string_append_c(field_fmt, 'l');
+ g_string_append_c(field_fmt, 'l');
+ g_string_append_c(field_fmt, *fmt);
break;
case 'o':
case 'u':
case 'x':
case 'X':
+ g_string_append_c(field_fmt, 'l');
+ g_string_append_c(field_fmt, 'l');
+ g_string_append_c(field_fmt, *fmt);
*c_type = LTT_TYPE_UNSIGNED_INT;
break;
default:
long offset, const char *name,
char trace_size, enum ltt_type trace_type,
char c_size, enum ltt_type c_type, unsigned long attributes,
- unsigned int field_count)
+ unsigned int field_count, GString *field_fmt)
{
struct marker_field *field;
char tmpname[MAX_NAME_LEN];
field->name = g_quark_from_string(tmpname);
}
field->type = trace_type;
+ field->fmt = g_string_new(field_fmt->str);
switch (trace_type) {
case LTT_TYPE_SIGNED_INT:
case LTT_TYPE_POINTER:
field->size = trace_size;
field->alignment = trace_size;
+ info->largest_align = max((guint8)field->alignment,
+ (guint8)info->largest_align);
field->attributes = attributes;
if (offset == -1) {
field->offset = -1;
field->static_offset = 1;
return -1;
default:
- g_error("Unexpected type"); //FIXME: compact type
+ g_error("Unexpected type");
return 0;
}
}
// not aligning on pointer size, breaking genevent backward compatibility.
break;
default:
- g_error("Unexpected type"); //FIXME: compact type
+ g_error("Unexpected type");
return -1;
}
}
const char *name_begin = NULL, *name_end = NULL;
char *name = NULL;
unsigned int field_count = 1;
+ GString *field_fmt = g_string_new("");
name_begin = fmt;
for (; *fmt ; ++fmt) {
case '#':
/* tracetypes (#) */
++fmt; /* skip first '#' */
- if (*fmt == '#') /* Escaped ## */
+ if (*fmt == '#') { /* Escaped ## */
+ g_string_append_c(field_fmt, *fmt);
+ g_string_append_c(field_fmt, *fmt);
break;
+ }
attributes = 0;
fmt = parse_trace_type(info, fmt, &trace_size, &trace_type,
&attributes);
break;
case '%':
/* c types (%) */
+ g_string_append_c(field_fmt, *fmt);
++fmt; /* skip first '%' */
- if (*fmt == '%') /* Escaped %% */
+ if (*fmt == '%') { /* Escaped %% */
+ g_string_append_c(field_fmt, *fmt);
break;
- fmt = parse_c_type(info, fmt, &c_size, &c_type);
+ }
+ fmt = parse_c_type(info, fmt, &c_size, &c_type, field_fmt);
/*
* Output c types if no trace types has been
* specified.
trace_type = LTT_TYPE_STRING;
/* perform trace write */
offset = add_type(info, offset, name, trace_size,
- trace_type, c_size, c_type, attributes, field_count++);
+ trace_type, c_size, c_type, attributes, field_count++,
+ field_fmt);
trace_size = c_size = 0;
trace_type = c_size = LTT_TYPE_NONE;
+ g_string_truncate(field_fmt, 0);
attributes = 0;
name_begin = NULL;
if (name) {
}
break;
case ' ':
+ g_string_truncate(field_fmt, 0);
if (!name_end && name_begin) {
name_end = fmt;
if (name)
}
break; /* Skip white spaces */
default:
+ g_string_append_c(field_fmt, *fmt);
if (!name_begin) {
name_begin = fmt;
name_end = NULL;
info->size = offset;
if (name)
g_free(name);
+ g_string_free(field_fmt, TRUE);
}
int marker_parse_format(const char *format, struct marker_info *info)
return 0;
}
-int marker_format_event(LttTrace *trace, GQuark name, const char *format)
+int marker_format_event(LttTrace *trace, GQuark channel, GQuark name,
+ const char *format)
{
struct marker_info *info;
+ struct marker_data *mdata;
char *fquery;
char *fcopy;
-
- fquery = marker_get_format_from_name(trace, name);
+ GArray *group;
+
+ group = g_datalist_id_get_data(&trace->tracefiles, channel);
+ g_assert(group->len > 0);
+ mdata = g_array_index (group, LttTracefile, 0).mdata;
+
+ fquery = marker_get_format_from_name(mdata, 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));
+ g_error("Marker format mismatch \"%s\" vs \"%s\" for marker %s.%s. "
+ "Kernel issue.", fquery, format,
+ g_quark_to_string(channel), 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,
+ g_hash_table_insert(mdata->markers_format_hash, (gpointer)(gulong)name,
(gpointer)fcopy);
- info = marker_get_info_from_name(trace, name);
+ info = marker_get_info_from_name(mdata, name);
for (; info != NULL; info = info->next) {
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));
+ g_error("Error parsing marker format \"%s\" for marker \"%.s.%s\"",
+ format, g_quark_to_string(channel), g_quark_to_string(name));
}
return 0;
}
-int marker_id_event(LttTrace *trace, GQuark name, guint16 id,
+int marker_id_event(LttTrace *trace, GQuark channel, GQuark name, guint16 id,
uint8_t int_size, uint8_t long_size, uint8_t pointer_size,
uint8_t size_t_size, uint8_t alignment)
{
+ struct marker_data *mdata;
struct marker_info *info, *head;
int found = 0;
+ GArray *group;
+
+ g_debug("Add channel %s event %s %hu\n", g_quark_to_string(channel),
+ g_quark_to_string(name), id);
+
+ group = g_datalist_id_get_data(&trace->tracefiles, channel);
+ g_assert(group->len > 0);
+ mdata = g_array_index (group, LttTracefile, 0).mdata;
- if (trace->markers->len <= id)
- 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);
+ if (mdata->markers->len <= id)
+ mdata->markers = g_array_set_size(mdata->markers,
+ max(mdata->markers->len * 2, id + 1));
+ info = &g_array_index(mdata->markers, struct marker_info, id);
info->name = name;
info->int_size = int_size;
info->long_size = long_size;
info->alignment = alignment;
info->fields = NULL;
info->next = NULL;
- info->format = marker_get_format_from_name(trace, name);
+ info->format = marker_get_format_from_name(mdata, name);
+ info->largest_align = 1;
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);
+ g_error("Error parsing marker format \"%s\" for marker \"%s.%s\"",
+ info->format, g_quark_to_string(channel), g_quark_to_string(name));
+ head = marker_get_info_from_name(mdata, name);
if (!head)
- g_hash_table_insert(trace->markers_hash, (gpointer)(gulong)name,
+ g_hash_table_insert(mdata->markers_hash, (gpointer)(gulong)name,
(gpointer)(gulong)id);
else {
struct marker_info *iter;
if (iter->name == name)
found = 1;
if (!found) {
- g_hash_table_replace(trace->markers_hash, (gpointer)(gulong)name,
+ g_hash_table_replace(mdata->markers_hash, (gpointer)(gulong)name,
(gpointer)(gulong)id);
info->next = head;
}
return 0;
}
-int allocate_marker_data(LttTrace *trace)
+struct marker_data *allocate_marker_data(void)
{
+ struct marker_data *data;
+
+ data = g_new(struct marker_data, 1);
/* Init array to 0 */
- trace->markers = g_array_sized_new(FALSE, TRUE,
+ data->markers = g_array_sized_new(FALSE, TRUE,
sizeof(struct marker_info), DEFAULT_MARKERS_NUM);
- 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,
+ if (!data->markers)
+ goto free_data;
+ data->markers_hash = g_hash_table_new(g_direct_hash, g_direct_equal);
+ if (!data->markers_hash)
+ goto free_markers;
+ data->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;
+ if (!data->markers_format_hash)
+ goto free_markers_hash;
+ return data;
+
+ /* error handling */
+free_markers_hash:
+ g_hash_table_destroy(data->markers_hash);
+free_markers:
+ g_array_free(data->markers, TRUE);
+free_data:
+ g_free(data);
+ return NULL;
}
-void destroy_marker_data(LttTrace *trace)
+void destroy_marker_data(struct marker_data *data)
{
- unsigned int i;
+ unsigned int i, j;
struct marker_info *info;
+ struct marker_field *field;
- for (i=0; i<trace->markers->len; i++) {
- info = &g_array_index(trace->markers, struct marker_info, i);
- if (info->fields)
+ for (i=0; i<data->markers->len; i++) {
+ info = &g_array_index(data->markers, struct marker_info, i);
+ if (info->fields) {
+ for (j = 0; j < info->fields->len; j++) {
+ field = &g_array_index(info->fields, struct marker_field, j);
+ g_string_free(field->fmt, TRUE);
+ }
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);
+ g_hash_table_destroy(data->markers_format_hash);
+ g_hash_table_destroy(data->markers_hash);
+ g_array_free(data->markers, TRUE);
+ g_free(data);
}
projects / lttv.git / blobdiff