From: compudj Date: Mon, 13 Aug 2007 04:35:31 +0000 (+0000) Subject: start marker work X-Git-Tag: v0.12.20~897 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d2007fbdaf35a3299861d6d2994f0185c7b64647;p=lttv.git start marker work git-svn-id: http://ltt.polymtl.ca/svn@2592 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index c565aa22..b1e69c0d 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -25,7 +25,6 @@ #include #include - #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) #endif @@ -451,6 +450,9 @@ struct _LttTrace{ uint8_t compact_event_bits; GData *tracefiles; //tracefiles groups + /* Support for markers */ + GArray *markers; //indexed by marker ID + GHashTable *markers_hash; //indexed by name hash }; /* The characteristics of the system on which the trace was obtained diff --git a/ltt/branches/poly/ltt/markers.c b/ltt/branches/poly/ltt/markers.c new file mode 100644 index 00000000..e760a256 --- /dev/null +++ b/ltt/branches/poly/ltt/markers.c @@ -0,0 +1,66 @@ +/* + * Marker support code. + * + * Mathieu Desnoyers, August 2007 + * License: LGPL. + */ + +#include +#include +#include + +#define DEFAULT_MARKERS_NUM 100 + +int marker_format_event(LttTrace *trace, const char *name, const char *format) +{ + struct marker_info *info; + + 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); + if (info->format) + g_free(info->format); + info->format = g_new(char, strlen(format)+1); + strcpy(info->format, format); + /* TODO deal with format string */ +} + +int marker_id_event(LttTrace *trace, const char *name, uint16_t id) +{ + struct marker_info *info; + + if (trace->markers->len < id) + trace->markers = g_array_set_size(trace->markers, id+1); + info = &g_array_index(trace->markers, struct marker_info, id); + if (info->name) + g_free(info->name); + info->name = g_new(char, strlen(name)+1); + strcpy(info->name, name); + g_hash_table_insert(trace->markers_hash, (gpointer)name, info); +} + +int allocate_marker_data(LttTrace *trace) +{ + /* Init array to 0 */ + trace->markers = g_array_sized_new(FALSE, TRUE, + sizeof(struct marker_info), DEFAULT_MARKERS_NUM); + trace->markers_hash = g_hash_table_new(g_str_hash, g_str_equal); +} + +int destroy_marker_data(LttTrace *trace) +{ + unsigned int i; + struct marker_info *info; + + for (i=0; imarkers->len; i++) { + info = &g_array_index(trace->markers, struct marker_info, i); + if (info->name) + g_free(info->name); + if (info->format) + g_free(info->format); + } + g_array_free(trace->markers, TRUE); + g_hash_table_destroy(trace->markers_hash); +} diff --git a/ltt/branches/poly/ltt/markers.h b/ltt/branches/poly/ltt/markers.h new file mode 100644 index 00000000..32a9080e --- /dev/null +++ b/ltt/branches/poly/ltt/markers.h @@ -0,0 +1,44 @@ +/* + * Marker support header. + * + * Mathieu Desnoyers, Auguest 2007 + * License: LGPL. + */ + +#include +#include + +struct marker_info { + char *name; + char *format; + unsigned long size; /* size if known statically, else 0 */ +}; + +enum marker_id { + MARKER_ID_SET_MARKER_ID = 0, /* Static IDs available (range 0-7) */ + MARKER_ID_SET_MARKER_FORMAT, + MARKER_ID_HEARTBEAT_32, + MARKER_ID_HEARTBEAT_64, + MARKER_ID_COMPACT, /* Compact IDs (range: 8-127) */ + MARKER_ID_DYNAMIC, /* Dynamic IDs (range: 128-65535) */ +}; + +static inline uint16_t marker_get_id_from_info(LttTrace *trace, + struct marker_info *info) +{ + return ((unsigned long)info - (unsigned long)trace->markers->data) + / sizeof(struct marker_info); +} + +static inline struct marker_info *marker_get_info_from_id(LttTrace *trace, + uint16_t id) +{ + if (unlikely(trace->markers->len < id)) + return NULL; + return &g_array_index(trace->markers, struct marker_info, id); +} + +int marker_format_event(LttTrace *trace, const char *name, const char *format); +int marker_id_event(LttTrace *trace, const char *name, uint16_t id); +int allocate_marker_data(LttTrace *trace); +int destroy_marker_data(LttTrace *trace); diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index a2cf1822..7e4c6469 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -49,7 +49,7 @@ #include #include #include - +#include /* Facility names used in this file */ @@ -2133,64 +2133,61 @@ map_error: void ltt_update_event_size(LttTracefile *tf) { off_t size = 0; - LttFacility *f = ltt_trace_get_facility_by_num(tf->trace, - tf->event.facility_id); char *tscdata; + struct marker_info *info; - if(!f->exists) { - /* Specific handling of core events : necessary to read the facility control - * tracefile. */ - - if(likely(tf->event.facility_id == LTT_FACILITY_CORE)) { - switch((enum ltt_core_events)tf->event.event_id) { - case LTT_EVENT_FACILITY_LOAD: + switch((enum marker_id)tf->event.event_id) { + case MARKER_ID_SET_MARKER_ID: size = strlen((char*)tf->event.data) + 1; - //g_debug("Update Event facility load of facility %s", (char*)tf->event.data); - size += ltt_align(size, sizeof(guint32), tf->has_alignment); - size += sizeof(struct LttFacilityLoad); - break; - case LTT_EVENT_FACILITY_UNLOAD: - //g_debug("Update Event facility unload"); - size = sizeof(struct LttFacilityUnload); + //g_debug("marker %s id set", (char*)tf->event.data); + size += ltt_align(size, sizeof(guint16), tf->has_alignment); + size += sizeof(guint16); break; - case LTT_EVENT_STATE_DUMP_FACILITY_LOAD: + case MARKER_ID_SET_MARKER_FORMAT: + //g_debug("marker %s format set", (char*)tf->event.data); size = strlen((char*)tf->event.data) + 1; - size += ltt_align(size, sizeof(guint32), tf->has_alignment); - //g_debug("Update Event facility load state dump of facility %s", - // (char*)tf->event.data); - size += sizeof(struct LttStateDumpFacilityLoad); + size += strlen((char*)tf->event.data) + 1; break; - case LTT_EVENT_HEARTBEAT: - //g_debug("Update Event heartbeat"); - size = sizeof(TimeHeartbeat); + case MARKER_ID_HEARTBEAT_32: + //g_debug("Update Event heartbeat 32 bits"); + size = ltt_align(size, sizeof(guint32), tf->has_alignment); + size += sizeof(guint32); break; - case LTT_EVENT_HEARTBEAT_FULL: - //g_debug("Update Event heartbeat full"); + case MARKER_ID_HEARTBEAT_64: + //g_debug("Update Event heartbeat 64 bits"); tscdata = (char*)(tf->event.data); tf->event.tsc = ltt_get_uint64(LTT_GET_BO(tf), tscdata); tf->buffer.tsc = tf->event.tsc; tf->event.event_time = ltt_interpolate_time(tf, &tf->event); - size = sizeof(TimeHeartbeatFull); - size += ltt_align(size, sizeof(guint64), tf->has_alignment); + size = ltt_align(size, sizeof(guint64), tf->has_alignment); + size += sizeof(guint64); break; default: - g_warning("Error in getting event size : tracefile %s, " - "unknown event id %hhu in core facility.", - g_quark_to_string(tf->name), - tf->event.event_id); - goto event_id_error; - + info = marker_get_info_from_id(tf->trace, tf->event.event_id); + g_assert(info != NULL); + if (info->size) { + size = info->size; + } else { + /* Must compute the event size dynamically TODO */ + } - goto no_offset; /* Skip the field computation */ - } else { - g_warning("Unknown facility %hhu (0x%hhx) in tracefile %s", - tf->event.facility_id, - tf->event.facility_id, - g_quark_to_string(tf->name)); - goto facility_error; - } } + tf->event.data_size = size; + + /* Check consistency between kernel and LTTV structure sizes */ + if(tf->event.event_size == 0xFFFF) { + /* Event size too big to fit in the event size field */ + tf->event.event_size = tf->event.data_size; + } + if (tf->event.data_size != tf->event.event_size) { + g_error("Kernel/LTTV event size differs for event %s.%s: kernel %u, LTTV %u", + g_quark_to_string(f->name), g_quark_to_string(event_type->name), + tf->event.event_size, tf->event.data_size); + exit(-1); + } + +#if 0 LttEventType *event_type = ltt_facility_eventtype_get(f, tf->event.event_id); @@ -2227,7 +2224,6 @@ no_offset: return; -facility_error: event_type_error: event_id_error: if(tf->event.event_size == 0xFFFF) { @@ -2236,6 +2232,7 @@ event_id_error: /* The facility is unknown : use the kernel information about this event * to jump over it. */ tf->event.data_size = tf->event.event_size; +#endif //0 }