X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=2bb0162969c042bf562f4f54e7622ca9eaabf827;hb=9c731a505cf0d0ded02f8e90a823fa90084c7740;hp=1b29605f5a99d01f178766da2c66792710c3abe8;hpb=77175651bea739bd7d5fe0de2c397af2b2d13d96;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 1b29605f..2bb01629 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -3,19 +3,19 @@ * * Complete rewrite from the original version made by XangXiu Yang. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation; + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License Version 2.1 as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -34,26 +34,26 @@ #include #include #include +#include // For realpath #include #include -#include "parser.h" #include #include "ltt-private.h" #include -#include #include -#include +//#include #include - +#include /* Facility names used in this file */ GQuark LTT_FACILITY_NAME_HEARTBEAT, - LTT_EVENT_NAME_HEARTBEAT; + LTT_EVENT_NAME_HEARTBEAT, + LTT_EVENT_NAME_HEARTBEAT_FULL; GQuark LTT_TRACEFILE_NAME_FACILITIES; #ifndef g_open @@ -71,40 +71,63 @@ GQuark LTT_TRACEFILE_NAME_FACILITIES; #define g_close close -/* obtain the time of an event */ - -static inline LttTime getEventTime(LttTracefile * tf); +/* Those macros must be called from within a function where page_size is a known + * variable */ +#define PAGE_MASK (~(page_size-1)) +#define PAGE_ALIGN(addr) (((addr)+page_size-1)&PAGE_MASK) +LttTrace *father_trace = NULL; /* set the offset of the fields belonging to the event, need the information of the archecture */ -void set_fields_offsets(LttTracefile *tf, LttEventType *event_type); -size_t get_fields_offsets(LttTracefile *tf, LttEventType *event_type, void *data); +//void set_fields_offsets(LttTracefile *tf, LttEventType *event_type); +//size_t get_fields_offsets(LttTracefile *tf, LttEventType *event_type, void *data); /* get the size of the field type according to * The facility size information. */ +#if 0 static inline void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, off_t offset_root, off_t offset_parent, enum field_status *fixed_root, enum field_status *fixed_parent, LttField *field); - - -static inline size_t get_field_type_size(LttTracefile *tf, - LttEventType *event_type, - off_t offset_root, off_t offset_parent, - LttField *field, void *data); - +#endif //0 /* map a fixed size or a block information from the file (fd) */ static gint map_block(LttTracefile * tf, guint block_num); /* calculate nsec per cycles for current block */ -static double calc_nsecs_per_cycle(LttTracefile * t); +#if 0 +static guint32 calc_nsecs_per_cycle(LttTracefile * t); +static guint64 cycles_2_ns(LttTracefile *tf, guint64 cycles); +#endif //0 /* go to the next event */ static int ltt_seek_next_event(LttTracefile *tf); +//void ltt_update_event_size(LttTracefile *tf); + +static int open_tracefiles(LttTrace *trace, gchar *root_path, + gchar *relative_path); +static int ltt_process_facility_tracefile(LttTracefile *tf); +static void ltt_tracefile_time_span_get(LttTracefile *tf, + LttTime *start, LttTime *end); +static void group_time_span_get(GQuark name, gpointer data, gpointer user_data); +static gint map_block(LttTracefile * tf, guint block_num); +static int ltt_seek_next_event(LttTracefile *tf); +static void __attribute__((constructor)) init(void); +static void ltt_update_event_size(LttTracefile *tf); + +/* Enable event debugging */ +static int a_event_debug = 0; + +void ltt_event_debug(int state) +{ + a_event_debug = state; +} + +//void precompute_offsets(LttFacility *fac, LttEventType *event); + #if 0 /* Functions to parse system.xml file (using glib xml parser) */ static void parser_start_element (GMarkupParseContext __UNUSED__ *context, @@ -181,6 +204,8 @@ static void parser_characters (GMarkupParseContext __UNUSED__ *context, des->description = g_strdup(text); } #endif //0 + +#if 0 LttFacility *ltt_trace_get_facility_by_num(LttTrace *t, guint num) { @@ -189,6 +214,117 @@ LttFacility *ltt_trace_get_facility_by_num(LttTrace *t, return &g_array_index(t->facilities_by_num, LttFacility, num); } +#endif //0 + +guint ltt_trace_get_num_cpu(LttTrace *t) +{ + return t->num_cpu; +} + + +/* trace can be NULL + * + * Return value : 0 success, 1 bad tracefile + */ +int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t) +{ + guint32 *magic_number = (guint32*)header; + struct ltt_trace_header_any *any = (struct ltt_trace_header_any *)header; + + if(*magic_number == LTT_MAGIC_NUMBER) + tf->reverse_bo = 0; + else if(*magic_number == LTT_REV_MAGIC_NUMBER) + tf->reverse_bo = 1; + else /* invalid magic number, bad tracefile ! */ + return 1; + + /* Get float byte order : might be different from int byte order + * (or is set to 0 if the trace has no float (kernel trace)) */ + tf->float_word_order = any->float_word_order; + tf->alignment = any->alignment; + tf->has_heartbeat = any->has_heartbeat; + + if(t) { + t->arch_type = ltt_get_uint32(LTT_GET_BO(tf), + &any->arch_type); + t->arch_variant = ltt_get_uint32(LTT_GET_BO(tf), + &any->arch_variant); + t->arch_size = any->arch_size; + t->ltt_major_version = any->major_version; + t->ltt_minor_version = any->minor_version; + t->flight_recorder = any->flight_recorder; + // t->compact_facilities = NULL; + } + + switch(any->major_version) { + + case 0: + g_warning("Unsupported trace version : %hhu.%hhu", + any->major_version, any->minor_version); + return 1; + break; + case 1: + switch(any->minor_version) { + case 0: + { + struct ltt_trace_header_1_0 *vheader = + (struct ltt_trace_header_1_0 *)header; + tf->buffer_header_size = + sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_1_0); + tf->tsc_lsb_truncate = vheader->tsc_lsb_truncate; + tf->tscbits = vheader->tscbits; + tf->tsc_msb_cutoff = 32 - tf->tsc_lsb_truncate - tf->tscbits; + tf->compact_event_bits = 32 - vheader->compact_data_shift; + tf->tsc_mask = ((1ULL << (tf->tscbits))-1); + tf->tsc_mask = tf->tsc_mask << tf->tsc_lsb_truncate; + tf->tsc_mask_next_bit = (1ULL<<(tf->tscbits)); + tf->tsc_mask_next_bit = tf->tsc_mask_next_bit << tf->tsc_lsb_truncate; + if(t) { + t->start_freq = ltt_get_uint64(LTT_GET_BO(tf), + &vheader->start_freq); + t->freq_scale = ltt_get_uint32(LTT_GET_BO(tf), + &vheader->freq_scale); + if(father_trace) { + t->start_freq = father_trace->start_freq; + t->freq_scale = father_trace->freq_scale; + } + else { + father_trace = t; + } + t->start_tsc = ltt_get_uint64(LTT_GET_BO(tf), + &vheader->start_tsc); + t->start_monotonic = ltt_get_uint64(LTT_GET_BO(tf), + &vheader->start_monotonic); + t->start_time.tv_sec = ltt_get_uint64(LTT_GET_BO(tf), + &vheader->start_time_sec); + t->start_time.tv_nsec = ltt_get_uint64(LTT_GET_BO(tf), + &vheader->start_time_usec); + t->start_time.tv_nsec *= 1000; /* microsec to nanosec */ + + t->start_time_from_tsc = ltt_time_from_uint64( + (double)t->start_tsc + * (1000000000.0 / tf->trace->freq_scale) + / (double)t->start_freq); + } + } + break; + default: + g_warning("Unsupported trace version : %hhu.%hhu", + any->major_version, any->minor_version); + return 1; + } + break; + default: + g_warning("Unsupported trace version : %hhu.%hhu", + any->major_version, any->minor_version); + return 1; + } + + + return 0; +} + /***************************************************************************** @@ -206,11 +342,12 @@ gint ltt_tracefile_open(LttTrace *t, gchar * fileName, LttTracefile *tf) { struct stat lTDFStat; /* Trace data file status */ struct ltt_block_start_header *header; + int page_size = getpagesize(); //open the file - tf->name = g_quark_from_string(fileName); + tf->long_name = g_quark_from_string(fileName); tf->trace = t; - tf->fd = g_open(fileName, O_RDONLY, 0); + tf->fd = open(fileName, O_RDONLY); if(tf->fd < 0){ g_warning("Unable to open input data file %s\n", fileName); goto end; @@ -223,36 +360,46 @@ gint ltt_tracefile_open(LttTrace *t, gchar * fileName, LttTracefile *tf) } // Is the file large enough to contain a trace - if(lTDFStat.st_size < (off_t)(sizeof(struct ltt_block_start_header))){ + if(lTDFStat.st_size < + (off_t)(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any))){ g_print("The input data file %s does not contain a trace\n", fileName); goto close_file; } /* Temporarily map the buffer start header to get trace information */ /* Multiple of pages aligned head */ - tf->buffer.head = mmap(0, sizeof(struct ltt_block_start_header), PROT_READ, + tf->buffer.head = mmap(0, + PAGE_ALIGN(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any)), PROT_READ, MAP_PRIVATE, tf->fd, 0); - if(tf->buffer.head == NULL) { + if(tf->buffer.head == MAP_FAILED) { perror("Error in allocating memory for buffer of tracefile"); goto close_file; } - g_assert(((guint)tf->buffer.head & (8-1)) == 0); // make sure it's aligned. + g_assert( ( (gulong)tf->buffer.head&(8-1) ) == 0); // make sure it's aligned. header = (struct ltt_block_start_header*)tf->buffer.head; - if(header->trace.magic_number == LTT_MAGIC_NUMBER) - tf->reverse_bo = 0; - else if(header->trace.magic_number == LTT_REV_MAGIC_NUMBER) - tf->reverse_bo = 1; - else /* invalid magic number, bad tracefile ! */ + if(parse_trace_header(header->trace, tf, NULL)) { + g_warning("parse_trace_header error"); goto unmap_file; + } //store the size of the file tf->file_size = lTDFStat.st_size; - tf->block_size = header->buf_size; - tf->num_blocks = tf->file_size / tf->block_size; - - vfree(tf->buffer.head); + tf->buf_size = ltt_get_uint32(LTT_GET_BO(tf), &header->buf_size); + tf->num_blocks = tf->file_size / tf->buf_size; + + if(munmap(tf->buffer.head, + PAGE_ALIGN(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any)))) { + g_warning("unmap size : %u\n", + PAGE_ALIGN(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any))); + perror("munmap error"); + g_assert(0); + } tf->buffer.head = NULL; //read the first block @@ -265,13 +412,26 @@ gint ltt_tracefile_open(LttTrace *t, gchar * fileName, LttTracefile *tf) /* Error */ unmap_file: - munmap(tf->buffer.head, sizeof(struct ltt_block_start_header)); + if(munmap(tf->buffer.head, + PAGE_ALIGN(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any)))) { + g_warning("unmap size : %u\n", + PAGE_ALIGN(sizeof(struct ltt_block_start_header) + + sizeof(struct ltt_trace_header_any))); + perror("munmap error"); + g_assert(0); + } close_file: - g_close(tf->fd); + close(tf->fd); end: return -1; } +LttTrace *ltt_tracefile_get_trace(LttTracefile *tf) +{ + return tf->trace; +} + #if 0 /***************************************************************************** *Open control and per cpu tracefiles @@ -349,9 +509,17 @@ gint ltt_tracefile_open_control(LttTrace *t, gchar * control_name) void ltt_tracefile_close(LttTracefile *t) { + int page_size = getpagesize(); + if(t->buffer.head != NULL) - munmap(t->buffer.head, t->buf_size); - g_close(t->fd); + if(munmap(t->buffer.head, PAGE_ALIGN(t->buf_size))) { + g_warning("unmap size : %u\n", + PAGE_ALIGN(t->buf_size)); + perror("munmap error"); + g_assert(0); + } + + close(t->fd); } @@ -507,49 +675,112 @@ void get_absolute_pathname(const gchar *pathname, gchar * abs_pathname) * The left side is the name, the right side is the number. */ -int get_tracefile_name_number(const gchar *raw_name, +int get_tracefile_name_number(gchar *raw_name, GQuark *name, - guint *num) + guint *num, + gulong *tid, + gulong *pgid, + guint64 *creation) { guint raw_name_len = strlen(raw_name); gchar char_name[PATH_MAX]; - gchar *digit_begin; int i; int underscore_pos; long int cpu_num; gchar *endptr; + gchar *tmpptr; for(i=raw_name_len-1;i>=0;i--) { if(raw_name[i] == '_') break; } - if(i==0) /* Either not found or name length is 0 */ - return -1; - underscore_pos = i; + if(i==-1) { /* Either not found or name length is 0 */ + /* This is a userspace tracefile */ + strncpy(char_name, raw_name, raw_name_len); + char_name[raw_name_len] = '\0'; + *name = g_quark_from_string(char_name); + *num = 0; /* unknown cpu */ + for(i=0;itracefiles; + return &trace->tracefiles; } -void compute_tracefile_group(GArray *group, - struct compute_tracefile_group_args args) +void compute_tracefile_group(GQuark key_id, + GArray *group, + struct compute_tracefile_group_args *args) { int i; LttTracefile *tf; @@ -557,7 +788,7 @@ void compute_tracefile_group(GArray *group, for(i=0; ilen; i++) { tf = &g_array_index (group, LttTracefile, i); if(tf->cpu_online) - args.func(tf, args.func_args); + args->func(tf, args->func_args); } } @@ -584,7 +815,8 @@ gboolean ltt_tracefile_group_has_cpu_online(gpointer data) for(i=0; ilen; i++) { tf = &g_array_index (group, LttTracefile, i); - if(tf->cpu_online) return 1; + if(tf->cpu_online) + return 1; } return 0; } @@ -594,106 +826,136 @@ gboolean ltt_tracefile_group_has_cpu_online(gpointer data) * GData : permits to access them using their tracefile group pathname. * i.e. access control/modules tracefile group by index : * "control/module". + * + * relative path is the path relative to the trace root + * root path is the full path * - * A tracefile group is simply an array where all the per cpu tracefiles sits. + * A tracefile group is simply an array where all the per cpu tracefiles sit. */ -static int open_tracefiles(LttTrace *trace, char *root_path, GData *tracefiles) +int open_tracefiles(LttTrace *trace, gchar *root_path, gchar *relative_path) { - DIR *dir = opendir(root_path); - struct dirent *entry; - struct stat stat_buf; - int ret; - char path[PATH_MAX]; - int path_len; - char *path_ptr; + DIR *dir = opendir(root_path); + struct dirent *entry; + struct stat stat_buf; + int ret; + + gchar path[PATH_MAX]; + int path_len; + gchar *path_ptr; + + int rel_path_len; + gchar rel_path[PATH_MAX]; + gchar *rel_path_ptr; + LttTracefile tmp_tf; + + if(dir == NULL) { + perror(root_path); + return ENOENT; + } - if(dir == NULL) { - perror(root_path); - return ENOENT; - } + strncpy(path, root_path, PATH_MAX-1); + path_len = strlen(path); + path[path_len] = '/'; + path_len++; + path_ptr = path + path_len; + + strncpy(rel_path, relative_path, PATH_MAX-1); + rel_path_len = strlen(rel_path); + rel_path[rel_path_len] = '/'; + rel_path_len++; + rel_path_ptr = rel_path + rel_path_len; + + while((entry = readdir(dir)) != NULL) { + + if(entry->d_name[0] == '.') continue; + + strncpy(path_ptr, entry->d_name, PATH_MAX - path_len); + strncpy(rel_path_ptr, entry->d_name, PATH_MAX - rel_path_len); + + ret = stat(path, &stat_buf); + if(ret == -1) { + perror(path); + continue; + } + + g_debug("Tracefile file or directory : %s\n", path); + + // if(strcmp(rel_path, "/eventdefs") == 0) continue; + + if(S_ISDIR(stat_buf.st_mode)) { - strncpy(path, root_path, PATH_MAX-1); - path_len = strlen(path); - path[path_len] = '/'; - path_len++; - path_ptr = path + path_len; - - while((entry = readdir(dir)) != NULL) { - - if(entry->d_name[0] == '.') continue; - - strncpy(path_ptr, entry->d_name, PATH_MAX - path_len); - - ret = stat(path, &stat_buf); - if(ret == -1) { - perror(path); - continue; - } - - g_debug("Tracefile file or directory : %s\n", path); - - if(S_ISDIR(stat_buf.st_mode)) { - - g_debug("Entering subdirectory...\n"); - ret = open_tracefiles(trace, path, tracefiles); - if(ret < 0) continue; - } else if(S_ISREG(stat_buf.st_mode)) { - g_debug("Opening file.\n"); - - GQuark name; + g_debug("Entering subdirectory...\n"); + ret = open_tracefiles(trace, path, rel_path); + if(ret < 0) continue; + } else if(S_ISREG(stat_buf.st_mode)) { + GQuark name; guint num; + gulong tid, pgid; + guint64 creation; GArray *group; - LttTracefile *tf; - guint len; - - if(get_tracefile_name_number(path, &name, &num)) + num = 0; + tid = pgid = 0; + creation = 0; + if(get_tracefile_name_number(rel_path, &name, &num, &tid, &pgid, &creation)) continue; /* invalid name */ + + g_debug("Opening file.\n"); + if(ltt_tracefile_open(trace, path, &tmp_tf)) { + g_info("Error opening tracefile %s", path); + + continue; /* error opening the tracefile : bad magic number ? */ + } - group = g_datalist_id_get_data(&tracefiles, name); + g_debug("Tracefile name is %s and number is %u", + g_quark_to_string(name), num); + + tmp_tf.cpu_online = 1; + tmp_tf.cpu_num = num; + tmp_tf.name = name; + tmp_tf.tid = tid; + tmp_tf.pgid = pgid; + tmp_tf.creation = creation; + if(tmp_tf.name == g_quark_from_string("/compact") + || tmp_tf.name == g_quark_from_string("/flight-compact")) + tmp_tf.compact = 1; + else + tmp_tf.compact = 0; + group = g_datalist_id_get_data(&trace->tracefiles, name); if(group == NULL) { /* Elements are automatically cleared when the array is allocated. * It makes the cpu_online variable set to 0 : cpu offline, by default. */ group = g_array_sized_new (FALSE, TRUE, sizeof(LttTracefile), 10); - g_datalist_id_set_data_full(&tracefiles, name, + g_datalist_id_set_data_full(&trace->tracefiles, name, group, ltt_tracefile_group_destroy); } + /* Add the per cpu tracefile to the named group */ unsigned int old_len = group->len; if(num+1 > old_len) group = g_array_set_size(group, num+1); - tf = &g_array_index (group, LttTracefile, num); - - if(ltt_tracefile_open(trace, path, tf)) { - g_info("Error opening tracefile %s", path); - g_array_set_size(group, old_len); - - if(!ltt_tracefile_group_has_cpu_online(group)) - g_datalist_id_remove_data(&tracefiles, name); - - continue; /* error opening the tracefile : bad magic number ? */ - } - tf->cpu_online = 1; - tf->cpu_num = num; - } - } - - closedir(dir); + g_array_index (group, LttTracefile, num) = tmp_tf; + g_array_index (group, LttTracefile, num).event.tracefile = + &g_array_index (group, LttTracefile, num); + } + } + + closedir(dir); - return 0; + return 0; } /* ltt_get_facility_description * - * Opens the trace corresponding to the requested facility (identified by fac_id + * Opens the file corresponding to the requested facility (identified by fac_id * and checksum). * * The name searched is : %trace root%/eventdefs/facname_checksum.xml * * Returns 0 on success, or 1 on failure. */ - +#if 0 static int ltt_get_facility_description(LttFacility *f, LttTrace *t, LttTracefile *fac_tf) @@ -702,8 +964,8 @@ static int ltt_get_facility_description(LttFacility *f, const gchar *text; guint textlen; gint err; - int i, j; - LttEventType *et; + gint arch_spec; + gint fac_name_len; text = g_quark_to_string(t->pathname); textlen = strlen(text); @@ -717,10 +979,22 @@ static int ltt_get_facility_description(LttFacility *f, strcat(desc_file_name, text); text = g_quark_to_string(f->name); - textlen+=strlen(text); + fac_name_len = strlen(text); + textlen+=fac_name_len; if(textlen >= PATH_MAX) goto name_error; strcat(desc_file_name, text); + /* arch specific facilities are named like this : name_arch */ + if(fac_name_len+1 < sizeof("_arch")) + arch_spec = 0; + else { + if(!strcmp(&text[fac_name_len+1-sizeof("_arch")], "_arch")) + arch_spec = 1; + else + arch_spec = 0; + } + +#if 0 text = "_"; textlen+=strlen(text); if(textlen >= PATH_MAX) goto name_error; @@ -728,28 +1002,59 @@ static int ltt_get_facility_description(LttFacility *f, err = snprintf(desc_file_name+textlen, PATH_MAX-textlen-1, "%u", f->checksum); - if(err) goto name_error; + if(err < 0) goto name_error; textlen=strlen(desc_file_name); +#endif //0 + + if(arch_spec) { + switch(t->arch_type) { + case LTT_ARCH_TYPE_I386: + text = "_i386"; + break; + case LTT_ARCH_TYPE_PPC: + text = "_ppc"; + break; + case LTT_ARCH_TYPE_SH: + text = "_sh"; + break; + case LTT_ARCH_TYPE_S390: + text = "_s390"; + break; + case LTT_ARCH_TYPE_MIPS: + text = "_mips"; + break; + case LTT_ARCH_TYPE_ARM: + text = "_arm"; + break; + case LTT_ARCH_TYPE_PPC64: + text = "_ppc64"; + break; + case LTT_ARCH_TYPE_X86_64: + text = "_x86_64"; + break; + case LTT_ARCH_TYPE_C2: + text = "_c2"; + break; + case LTT_ARCH_TYPE_POWERPC: + text = "_powerpc"; + break; + default: + g_error("Trace from unsupported architecture."); + } + textlen+=strlen(text); + if(textlen >= PATH_MAX) goto name_error; + strcat(desc_file_name, text); + } + text = ".xml"; textlen+=strlen(text); if(textlen >= PATH_MAX) goto name_error; strcat(desc_file_name, text); - + err = ltt_facility_open(f, t, desc_file_name); if(err) goto facility_error; - - for(i=0;ifacilities_by_num->len;i++){ - f = &g_array_index(t->facilities_by_num, LttFacility, i); - if(f->exists) { - for(j=0; jevents->len; j++){ - et = &g_array_index(f->events, LttEventType, j); - set_fields_offsets(fac_tf, et); - } - } - } - return 0; @@ -761,25 +1066,20 @@ name_error: static void ltt_fac_ids_destroy(gpointer data) { GArray *fac_ids = (GArray *)data; - int i; - LttFacility *fac; - - for(i=0; ilen; i++) { - fac = &g_array_index (fac_ids, LttFacility, i); - ltt_facility_close(fac); - } g_array_free(fac_ids, TRUE); } - +#endif //0 /* Presumes the tracefile is already seeked at the beginning. It makes sense, * because it must be done just after the opening */ -static int ltt_process_facility_tracefile(LttTracefile *tf) +int ltt_process_facility_tracefile(LttTracefile *tf) { int err; - LttFacility *fac; - GArray *fac_ids; + //LttFacility *fac; + //GArray *fac_ids; + guint i; + //LttEventType *et; while(1) { err = ltt_tracefile_read_seek(tf); @@ -798,104 +1098,70 @@ static int ltt_process_facility_tracefile(LttTracefile *tf) * 0 : facility load * 1 : facility unload * 2 : state dump facility load - * Facility 1 : (heartbeat) - * 0 : heartbeat + * 3 : heartbeat */ - if(tf->event.facility_id > 1) { /* Should only contain core and heartbeat - facilities */ + if(tf->event.event_id >= MARKER_CORE_IDS) { + /* Should only contain core facility */ g_warning("Error in processing facility file %s, " - "should not contain facility id %u.", g_quark_to_string(tf->name), - tf->event.facility_id); + "should not contain event id %u.", g_quark_to_string(tf->name), + tf->event.event_id); err = EPERM; - goto fac_id_error; - } else if(tf->event.facility_id == LTT_FACILITY_CORE) { + goto event_id_error; + } else { - struct LttFacilityLoad *fac_load_data; - char *fac_name; + char *pos; + const char *marker_name, *format; + uint16_t id; + guint8 int_size, long_size, pointer_size, size_t_size, alignment; // FIXME align - switch((enum ltt_core_events)tf->event.event_id) { - case LTT_EVENT_FACILITY_LOAD: - fac_load_data = - (struct LttFacilityLoad *)tf->event.data; - fac_name = - (char*)(tf->event.data + sizeof(struct LttFacilityLoad)); - fac = &g_array_index (tf->trace->facilities_by_num, LttFacility, - ltt_get_uint32(LTT_GET_BO(tf), &fac_load_data->id)); - g_assert(fac->exists == 0); - fac->name = g_quark_from_string(fac_name); - fac->checksum = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->checksum); - fac->id = ltt_get_uint32(LTT_GET_BO(tf), &fac_load_data->id); - fac->pointer_size = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->pointer_size); - fac->size_t_size = ltt_get_uin32(LTT_GET_BO(tf), - &fac_load_data->size_t_size); - fac->alignment = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->alignment); - - if(ltt_get_facility_description(fac, tf->trace, tf)) - goto facility_error; - - fac->trace = tf->trace; - fac->exists = 1; - - fac_ids = g_datalist_id_get_data(&tf->trace->facilities_by_name, - fac->name); - if(fac_ids == NULL) { - fac_ids = g_array_sized_new (FALSE, TRUE, sizeof(guint), 1); - g_datalist_id_set_data_full(&tf->trace->facilities_by_name, - fac->name, - fac_ids, ltt_fac_ids_destroy); - } - g_array_append_val(fac_ids, fac->id); - + switch((enum marker_id)tf->event.event_id) { + case MARKER_ID_SET_MARKER_ID: + marker_name = pos = tf->event.data; + g_debug("Doing MARKER_ID_SET_MARKER_ID of marker %s", marker_name); + pos += strlen(marker_name) + 1; + //remove genevent compatibility + //pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->alignment); + pos += ltt_align((size_t)pos, sizeof(uint16_t), tf->alignment); + id = ltt_get_uint16(LTT_GET_BO(tf), pos); + g_debug("In MARKER_ID_SET_MARKER_ID of marker %s id %hu", + marker_name, id); + pos += sizeof(guint16); + int_size = *(guint8*)pos; + pos += sizeof(guint8); + long_size = *(guint8*)pos; + pos += sizeof(guint8); + pointer_size = *(guint8*)pos; + pos += sizeof(guint8); + size_t_size = *(guint8*)pos; + pos += sizeof(guint8); + alignment = *(guint8*)pos; + pos += sizeof(guint8); + marker_id_event(tf->trace, g_quark_from_string(marker_name), + id, int_size, long_size, + pointer_size, size_t_size, alignment); break; - case LTT_EVENT_FACILITY_UNLOAD: - /* We don't care about unload : facilities ID are valid for the whole - * trace. They simply won't be used after the unload. */ - break; - case LTT_EVENT_STATE_DUMP_FACILITY_LOAD: - fac_load_data = - (struct LttFacilityLoad *)tf->event.data; - fac_name = - (char*)(tf->event.data + sizeof(struct LttFacilityLoad)); - fac = &g_array_index (tf->trace->facilities_by_num, LttFacility, - ltt_get_uint32(LTT_GET_BO(tf), &fac_load_data->id)); - g_assert(fac->exists == 0); - fac->name = g_quark_from_string(fac_name); - fac->checksum = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->checksum); - fac->id = ltt_get_uint8(LTT_GET_BO(tf), &fac_load_data->id); - fac->pointer_size = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->pointer_size); - fac->size_t_size = ltt_get_uin32(LTT_GET_BO(tf), - &fac_load_data->size_t_size); - fac->alignment = ltt_get_uint32(LTT_GET_BO(tf), - &fac_load_data->alignment); - if(ltt_get_facility_description(fac, tf->trace, tf)) - goto facility_error; - - fac->trace = tf->trace; - - fac->exists = 1; - - fac_ids = g_datalist_id_get_data(&tf->trace->facilities_by_name, - fac->name); - if(fac_ids == NULL) { - fac_ids = g_array_sized_new (FALSE, TRUE, sizeof(guint), 1); - g_datalist_id_set_data_full(&tf->trace->facilities_by_name, - fac->name, - fac_ids, ltt_fac_ids_destroy); - } - g_array_append_val(fac_ids, fac->id); - + case MARKER_ID_SET_MARKER_FORMAT: + marker_name = pos = tf->event.data; + g_debug("Doing MARKER_ID_SET_MARKER_FORMAT of marker %s", + marker_name); + pos += strlen(marker_name) + 1; + //break genevent. + //pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->alignment); + format = pos; + pos += strlen(format) + 1; + //break genevent + //pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->alignment); + marker_format_event(tf->trace, g_quark_from_string(marker_name), + format); + /* get information from dictionnary TODO */ break; - case LTT_EVENT_HEARTBEAT: + case MARKER_ID_HEARTBEAT_32: + case MARKER_ID_HEARTBEAT_64: break; default: g_warning("Error in processing facility file %s, " - "unknown event id %hhu in core facility.", + "unknown event id %hhu.", g_quark_to_string(tf->name), tf->event.event_id); err = EPERM; @@ -906,11 +1172,10 @@ static int ltt_process_facility_tracefile(LttTracefile *tf) return 0; /* Error handling */ -facility_error: event_id_error: -fac_id_error: update_error: seek_error: + g_warning("An error occured in facility tracefile parsing"); return err; } @@ -921,7 +1186,13 @@ LttTrace *ltt_trace_open(const gchar *pathname) LttTrace * t; LttTracefile *tf; GArray *group; - int i; + int i, ret; + struct ltt_block_start_header *header; + DIR *dir; + struct dirent *entry; + guint control_found = 0; + struct stat stat_buf; + gchar path[PATH_MAX]; t = g_new(LttTrace, 1); if(!t) goto alloc_error; @@ -929,50 +1200,81 @@ LttTrace *ltt_trace_open(const gchar *pathname) get_absolute_pathname(pathname, abs_path); t->pathname = g_quark_from_string(abs_path); - /* Open all the tracefiles */ g_datalist_init(&t->tracefiles); - if(open_tracefiles(t, abs_path, t->tracefiles)) + + /* Test to see if it looks like a trace */ + dir = opendir(abs_path); + if(dir == NULL) { + perror(abs_path); goto open_error; + } + while((entry = readdir(dir)) != NULL) { + strcpy(path, abs_path); + strcat(path, "/"); + strcat(path, entry->d_name); + ret = stat(path, &stat_buf); + if(ret == -1) { + perror(path); + continue; + } + if(S_ISDIR(stat_buf.st_mode)) { + if(strcmp(entry->d_name, "control") == 0) { + control_found = 1; + } + } + } + closedir(dir); + + if(!control_found) goto find_error; - /* Prepare the facilities containers : array and mapping */ - /* Array is zeroed : the "exists" field is set to false by default */ - t->facilities_by_num = g_array_sized_new (FALSE, - TRUE, sizeof(LttFacility), - NUM_FACILITIES); - t->facilities_by_num = g_array_set_size(t->facilities_by_num, NUM_FACILITIES); - - g_datalist_init(&t->facilities_by_name); + /* Open all the tracefiles */ + if(open_tracefiles(t, abs_path, "")) { + g_warning("Error opening tracefile %s", abs_path); + goto find_error; + } /* Parse each trace control/facilitiesN files : get runtime fac. info */ group = g_datalist_id_get_data(&t->tracefiles, LTT_TRACEFILE_NAME_FACILITIES); if(group == NULL) { g_error("Trace %s has no facility tracefile", abs_path); + g_assert(0); goto facilities_error; } + /* Get the trace information for the control/facility 0 tracefile */ + g_assert(group->len > 0); + tf = &g_array_index (group, LttTracefile, 0); + header = (struct ltt_block_start_header*)tf->buffer.head; + g_assert(parse_trace_header(header->trace, + tf, t) == 0); + + t->num_cpu = group->len; + + ret = allocate_marker_data(t); + if (ret) + g_error("Error in allocating marker data"); + for(i=0; ilen; i++) { tf = &g_array_index (group, LttTracefile, i); if(ltt_process_facility_tracefile(tf)) goto facilities_error; } - - return t; /* Error handling */ facilities_error: - g_datalist_clear(&t->facilities_by_name); - g_array_free(t->facilities_by_num, TRUE); -open_error: + destroy_marker_data(t); +find_error: g_datalist_clear(&t->tracefiles); +open_error: g_free(t); alloc_error: return NULL; } -GQuark ltt_trace_name(LttTrace *t) +GQuark ltt_trace_name(const LttTrace *t) { return t->pathname; } @@ -990,8 +1292,6 @@ LttTrace *ltt_trace_copy(LttTrace *self) void ltt_trace_close(LttTrace *t) { - g_datalist_clear(&t->facilities_by_name); - g_array_free(t->facilities_by_num, TRUE); g_datalist_clear(&t->tracefiles); g_free(t); } @@ -1000,7 +1300,7 @@ void ltt_trace_close(LttTrace *t) /***************************************************************************** *Get the system description of the trace ****************************************************************************/ - +#if 0 LttFacility *ltt_trace_facility_by_id(LttTrace *t, guint8 id) { g_assert(id < t->facilities_by_num->len); @@ -1018,6 +1318,7 @@ GArray *ltt_trace_facility_get_by_name(LttTrace *t, GQuark name) { return g_datalist_id_get_data(&t->facilities_by_name, name); } +#endif //0 /***************************************************************************** * Functions to discover all the event types in the trace @@ -1074,10 +1375,9 @@ LttTracefile *ltt_trace_find_tracefile(LttTrace *t, const gchar *name) * Get the start time and end time of the trace ****************************************************************************/ -static void ltt_tracefile_time_span_get(LttTracefile *tf, +void ltt_tracefile_time_span_get(LttTracefile *tf, LttTime *start, LttTime *end) { - struct ltt_block_start_header * header; int err; err = map_block(tf, 0); @@ -1101,7 +1401,7 @@ struct tracefile_time_span_get_args { LttTime *end; }; -static void group_time_span_get(GQuark name, gpointer data, gpointer user_data) +void group_time_span_get(GQuark name, gpointer data, gpointer user_data) { struct tracefile_time_span_get_args *args = (struct tracefile_time_span_get_args*)user_data; @@ -1140,11 +1440,37 @@ void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end) *Get the name of a tracefile ****************************************************************************/ -GQuark ltt_tracefile_name(LttTracefile *tf) +GQuark ltt_tracefile_name(const LttTracefile *tf) { return tf->name; } +GQuark ltt_tracefile_long_name(const LttTracefile *tf) +{ + return tf->long_name; +} + + + +guint ltt_tracefile_cpu(LttTracefile *tf) +{ + return tf->cpu_num; +} + +guint ltt_tracefile_tid(LttTracefile *tf) +{ + return tf->tid; +} + +guint ltt_tracefile_pgid(LttTracefile *tf) +{ + return tf->pgid; +} + +guint64 ltt_tracefile_creation(LttTracefile *tf) +{ + return tf->creation; +} /***************************************************************************** * Get the number of blocks in the tracefile ****************************************************************************/ @@ -1159,12 +1485,12 @@ guint ltt_tracefile_block_number(LttTracefile *tf) * the time passed in parameter. * * If the time parameter is outside the tracefile time span, seek to the first - * or the last event of the tracefile. + * event or if after, return ERANGE. * * If the time parameter is before the first event, we have to seek specially to * there. * - * If the time is after the end of the trace, get the last event. + * If the time is after the end of the trace, return ERANGE. * * Do a binary search to find the right block, then a sequential search in the * block to find the event. @@ -1179,6 +1505,7 @@ guint ltt_tracefile_block_number(LttTracefile *tf) * you will jump over an event if you do. * * Return value : 0 : no error, the tf->event can be used + * ERANGE : time if after the last event of the trace * otherwise : this is an error. * * */ @@ -1200,6 +1527,8 @@ int ltt_tracefile_seek_time(LttTracefile *tf, LttTime time) * go to the first event. */ if(ltt_time_compare(time, tf->buffer.begin.timestamp) <= 0) { ret = ltt_tracefile_read(tf); + if(ret == ERANGE) goto range; + else if (ret) goto fail; goto found; /* There is either no event in the trace or the event points to the first event in the trace */ } @@ -1210,16 +1539,9 @@ int ltt_tracefile_seek_time(LttTracefile *tf, LttTime time) goto fail; } - /* If the time is after the end of the trace, get the last event. */ - if(ltt_time_compare(time, tf->buffer.end.timestamp) >= 0) { - /* While the ltt_tracefile_read doesn't return ERANGE or EPERM, - * continue reading. - */ - while(1) { - ret = ltt_tracefile_read(tf); - if(ret == ERANGE) goto found; /* ERANGE or EPERM */ - else if(ret) goto fail; - } + /* If the time is after the end of the trace, return ERANGE. */ + if(ltt_time_compare(time, tf->buffer.end.timestamp) > 0) { + goto range; } /* Binary search the block */ @@ -1243,27 +1565,27 @@ int ltt_tracefile_seek_time(LttTracefile *tf, LttTime time) * (or in the next buffer first event) */ while(1) { ret = ltt_tracefile_read(tf); - if(ret == ERANGE) goto found; /* ERANGE or EPERM */ + if(ret == ERANGE) goto range; /* ERANGE or EPERM */ else if(ret) goto fail; - if(ltt_time_compare(time, tf->event.event_time) >= 0) - break; + if(ltt_time_compare(time, tf->event.event_time) <= 0) + goto found; } - } if(ltt_time_compare(time, tf->buffer.begin.timestamp) < 0) { + } else if(ltt_time_compare(time, tf->buffer.begin.timestamp) < 0) { /* go to lower part */ - high = block_num; + high = block_num - 1; } else if(ltt_time_compare(time, tf->buffer.end.timestamp) > 0) { /* go to higher part */ - low = block_num; + low = block_num + 1; } else {/* The event is right in the buffer! (or in the next buffer first event) */ while(1) { - ltt_tracefile_read(tf); - if(ret == ERANGE) goto found; /* ERANGE or EPERM */ + ret = ltt_tracefile_read(tf); + if(ret == ERANGE) goto range; /* ERANGE or EPERM */ else if(ret) goto fail; - if(ltt_time_compare(time, tf->event.event_time) >= 0) + if(ltt_time_compare(time, tf->event.event_time) <= 0) break; } goto found; @@ -1272,6 +1594,8 @@ int ltt_tracefile_seek_time(LttTracefile *tf, LttTime time) found: return 0; +range: + return ERANGE; /* Error handling */ fail: @@ -1297,32 +1621,58 @@ int ltt_tracefile_seek_position(LttTracefile *tf, const LttEventPosition *ep) { tf->event.offset = ep->offset; + /* Put back the event real tsc */ + tf->event.tsc = ep->tsc; + tf->buffer.tsc = ep->tsc; + err = ltt_tracefile_read_update_event(tf); if(err) goto fail; err = ltt_tracefile_read_op(tf); if(err) goto fail; - return; + return 0; fail: g_error("ltt_tracefile_seek_time failed on tracefile %s", g_quark_to_string(tf->name)); + return 1; } -/* Calculate the real event time based on the buffer boundaries */ -LttTime ltt_interpolate_time(LttTracefile *tf, LttEvent *event) +LttTime ltt_interpolate_time_from_tsc(LttTracefile *tf, guint64 tsc) { LttTime time; + + if(tsc > tf->trace->start_tsc) { + time = ltt_time_from_uint64( + (double)(tsc - tf->trace->start_tsc) + * (1000000000.0 / tf->trace->freq_scale) + / (double)tf->trace->start_freq); + time = ltt_time_add(tf->trace->start_time_from_tsc, time); + } else { + time = ltt_time_from_uint64( + (double)(tf->trace->start_tsc - tsc) + * (1000000000.0 / tf->trace->freq_scale) + / (double)tf->trace->start_freq); + time = ltt_time_sub(tf->trace->start_time_from_tsc, time); + } + return time; +} - g_assert(tf->trace->has_tsc); +/* Calculate the real event time based on the buffer boundaries */ +LttTime ltt_interpolate_time(LttTracefile *tf, LttEvent *event) +{ + return ltt_interpolate_time_from_tsc(tf, tf->buffer.tsc); +} - time = ltt_time_from_uint64( - (guint64)tf->buffer.tsc*tf->buffer.nsecs_per_cycle); - time = ltt_time_add(tf->buffer.begin.timestamp, time); - return time; +/* Get the current event of the tracefile : valid until the next read */ +LttEvent *ltt_tracefile_get_event(LttTracefile *tf) +{ + return &tf->event; } + + /***************************************************************************** *Function name * ltt_tracefile_read : Read the next event in the tracefile @@ -1331,7 +1681,8 @@ LttTime ltt_interpolate_time(LttTracefile *tf, LttEvent *event) *Return value * * Returns 0 if an event can be used in tf->event. - * Returns ERANGE on end of trace. The event in tf->event still can be used. + * Returns ERANGE on end of trace. The event in tf->event still can be used + * (if the last block was not empty). * Returns EPERM on error. * * This function does make the tracefile event structure point to the event @@ -1391,9 +1742,6 @@ int ltt_tracefile_read_seek(LttTracefile *tf) /* do specific operation on events */ int ltt_tracefile_read_op(LttTracefile *tf) { - int err; - LttFacility *f; - void * pos; LttEvent *event; event = &tf->event; @@ -1408,68 +1756,149 @@ int ltt_tracefile_read_op(LttTracefile *tf) return 0; } +static void print_debug_event_header(LttEvent *ev, void *start_pos, void *end_pos) +{ + unsigned int offset = 0; + int i, j; + + g_printf("Event header (tracefile %s offset %llx):\n", + g_quark_to_string(ev->tracefile->long_name), + ((uint64_t)ev->tracefile->buffer.index * ev->tracefile->buf_size) + + (long)start_pos - (long)ev->tracefile->buffer.head); + + while (offset < (long)end_pos - (long)start_pos) { + g_printf("%8lx", (long)start_pos - (long)ev->tracefile->buffer.head + offset); + g_printf(" "); + + for (i = 0; i < 4 ; i++) { + for (j = 0; j < 4; j++) { + if (offset + ((i * 4) + j) < + (long)end_pos - (long)start_pos) + g_printf("%02hhX", + ((char*)start_pos)[offset + ((i * 4) + j)]); + else + g_printf(" "); + g_printf(" "); + } + if (i < 4) + g_printf(" "); + } + offset+=16; + g_printf("\n"); + } +} + /* same as ltt_tracefile_read, but does not seek to the next event nor call * event specific operation. */ int ltt_tracefile_read_update_event(LttTracefile *tf) { - int err; - LttFacility *f; void * pos; LttEvent *event; + void *pos_aligned; event = &tf->event; - pos = event->offset; + pos = tf->buffer.head + event->offset; /* Read event header */ - //TODO align + /* Align the head */ + if(!tf->compact) + pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->alignment); + else { + g_assert(tf->has_heartbeat); + pos += ltt_align((size_t)pos, sizeof(uint32_t), tf->alignment); + } + pos_aligned = pos; - if(tf->trace->has_tsc) { - event->time.timestamp = ltt_get_uint32(LTT_GET_BO(tf), + if(tf->has_heartbeat) { + event->timestamp = ltt_get_uint32(LTT_GET_BO(tf), pos); - /* 32 bits -> 64 bits tsc */ - /* note : still works for seek and non seek cases. */ - if(event->time.timestamp < (0xFFFFFFFFULL&tf->buffer.tsc)) { - tf->buffer.tsc = ((tf->buffer.tsc&0xFFFFFFFF00000000ULL) - + 0x100000000ULL) - | (guint64)event->time.timestamp; - event->tsc = tf->buffer.tsc; + if(!tf->compact) { + /* 32 bits -> 64 bits tsc */ + /* note : still works for seek and non seek cases. */ + if(event->timestamp < (0xFFFFFFFFULL&tf->buffer.tsc)) { + tf->buffer.tsc = ((tf->buffer.tsc&0xFFFFFFFF00000000ULL) + + 0x100000000ULL) + | (guint64)event->timestamp; + event->tsc = tf->buffer.tsc; + } else { + /* no overflow */ + tf->buffer.tsc = (tf->buffer.tsc&0xFFFFFFFF00000000ULL) + | (guint64)event->timestamp; + event->tsc = tf->buffer.tsc; + event->compact_data = 0; + } } else { - /* no overflow */ - tf->buffer.tsc = (tf->buffer.tsc&0xFFFFFFFF00000000ULL) - | (guint64)event->time.timestamp; - event->tsc = tf->buffer.tsc; + /* Compact header */ + /* We keep the LSB of the previous timestamp, to make sure + * we never go back */ + event->event_id = event->timestamp >> tf->tscbits; + event->event_id = event->event_id & ((1 << tf->compact_event_bits) - 1); + event->compact_data = event->timestamp >> + (tf->compact_event_bits + tf->tscbits); + //printf("tsc bits %u, ev bits %u init data %u\n", + // tf->tscbits, tf->trace->compact_event_bits, event->compact_data); + /* Put the compact data back in original endianness */ + event->compact_data = ltt_get_uint32(LTT_GET_BO(tf), &event->compact_data); + event->event_size = 0xFFFF; + //printf("Found compact event %d\n", event->event_id); + //printf("Compact data %d\n", event->compact_data); + event->timestamp = event->timestamp << tf->tsc_lsb_truncate; + event->timestamp = event->timestamp & tf->tsc_mask; + //printf("timestamp 0x%lX\n", event->timestamp); + //printf("mask 0x%llX\n", tf->tsc_mask); + //printf("mask_next 0x%llX\n", tf->tsc_mask_next_bit); + //printf("previous tsc 0x%llX\n", tf->buffer.tsc); + //printf("previous tsc&mask 0x%llX\n", tf->tsc_mask&tf->buffer.tsc); + //printf("previous tsc&(~mask) 0x%llX\n", tf->buffer.tsc&(~tf->tsc_mask)); + if(event->timestamp < (tf->tsc_mask&tf->buffer.tsc)) { + //printf("wrap\n"); + tf->buffer.tsc = ((tf->buffer.tsc&(~tf->tsc_mask)) + + tf->tsc_mask_next_bit) + | (guint64)event->timestamp; + event->tsc = tf->buffer.tsc; + } else { + //printf("no wrap\n"); + /* no overflow */ + tf->buffer.tsc = (tf->buffer.tsc&(~tf->tsc_mask)) + | (guint64)event->timestamp; + event->tsc = tf->buffer.tsc; + } + //printf("current tsc 0x%llX\n", tf->buffer.tsc); } + pos += sizeof(guint32); + } else { + event->tsc = ltt_get_uint64(LTT_GET_BO(tf), pos); + tf->buffer.tsc = event->tsc; + event->compact_data = 0; + pos += sizeof(guint64); + } + event->event_time = ltt_interpolate_time(tf, event); - event->event_time = ltt_interpolate_time(tf, event); + if(!tf->compact) { + event->event_id = *(guint16*)pos; + pos += sizeof(guint16); - pos += sizeof(guint32); + event->event_size = ltt_get_uint16(LTT_GET_BO(tf), pos); + pos += sizeof(guint16); } else { - event->time.delta.tv_sec = 0; - event->time.delta.tv_nsec = ltt_get_uint32(LTT_GET_BO(tf), - pos) * NSEC_PER_USEC; - tf->buffer.tsc = 0; - event->tsc = tf->buffer.tsc; - - event->event_time = ltt_time_add(tf->buffer.begin.timestamp, - event->time.delta); - pos += sizeof(guint32); + /* Compact event */ + event->event_size = 0xFFFF; } - event->facility_id = ltt_get_uint8(LTT_GET_BO(tf), - pos); - pos += sizeof(guint8); + if (a_event_debug) + print_debug_event_header(event, pos_aligned, pos); - event->event_id = ltt_get_uint8(LTT_GET_BO(tf), - pos); - pos += sizeof(guint8); + /* Align the head */ + if(!tf->compact) + pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->alignment); event->data = pos; /* get the data size and update the event fields with the current - * information */ - event->data_size = ltt_update_event_size(tf); + * information. Also update the time if a heartbeat_full event is found. */ + ltt_update_event_size(tf); return 0; } @@ -1487,62 +1916,119 @@ int ltt_tracefile_read_update_event(LttTracefile *tf) * EIO : can not read from the file ****************************************************************************/ -static gint map_block(LttTracefile * tf, guint block_num) +gint map_block(LttTracefile * tf, guint block_num) { + int page_size = getpagesize(); struct ltt_block_start_header *header; g_assert(block_num < tf->num_blocks); - if(tf->buffer.head != NULL) - munmap(tf->buffer.head, tf->buf_size); + if(tf->buffer.head != NULL) { + if(munmap(tf->buffer.head, PAGE_ALIGN(tf->buf_size))) { + g_warning("unmap size : %u\n", + PAGE_ALIGN(tf->buf_size)); + perror("munmap error"); + g_assert(0); + } + } + /* Multiple of pages aligned head */ - tf->buffer.head = mmap(0, tf->block_size, PROT_READ, tf->fd, MAP_PRIVATE, - (off_t)tf->block_size * (off_t)block_num); + tf->buffer.head = mmap(0, + PAGE_ALIGN(tf->buf_size), + PROT_READ, MAP_PRIVATE, tf->fd, + PAGE_ALIGN((off_t)tf->buf_size * (off_t)block_num)); - if(tf->buffer.head == NULL) { + if(tf->buffer.head == MAP_FAILED) { perror("Error in allocating memory for buffer of tracefile"); + g_assert(0); goto map_error; } - g_assert(((guint)tf->buffer.head) & (8-1) == 0); // make sure it's aligned. + g_assert( ( (gulong)tf->buffer.head&(8-1) ) == 0); // make sure it's aligned. tf->buffer.index = block_num; header = (struct ltt_block_start_header*)tf->buffer.head; - tf->buffer.begin.timestamp = ltt_get_time(LTT_GET_BO(tf), - &header->begin.timestamp); - tf->buffer.begin.timestamp.tv_nsec *= NSEC_PER_USEC; +#if 0 + tf->buffer.begin.timestamp = ltt_time_add( + ltt_time_from_uint64( + ltt_get_uint64(LTT_GET_BO(tf), + &header->begin.timestamp) + - tf->trace->start_monotonic), + tf->trace->start_time); +#endif //0 + //g_debug("block %u begin : %lu.%lu", block_num, + // tf->buffer.begin.timestamp.tv_sec, tf->buffer.begin.timestamp.tv_nsec); tf->buffer.begin.cycle_count = ltt_get_uint64(LTT_GET_BO(tf), &header->begin.cycle_count); - tf->buffer.end.timestamp = ltt_get_time(LTT_GET_BO(tf), - &header->end.timestamp); - tf->buffer.end.timestamp.tv_nsec *= NSEC_PER_USEC; + tf->buffer.begin.freq = ltt_get_uint64(LTT_GET_BO(tf), + &header->begin.freq); + if(tf->buffer.begin.freq == 0) + tf->buffer.begin.freq = tf->trace->start_freq; + + tf->buffer.begin.timestamp = ltt_interpolate_time_from_tsc(tf, + tf->buffer.begin.cycle_count); +#if 0 + ltt_time_add( + ltt_time_from_uint64( + (double)(tf->buffer.begin.cycle_count + - tf->trace->start_tsc) * 1000000.0 + / (double)tf->trace->start_freq), + tf->trace->start_time_from_tsc); +#endif //0 +#if 0 + + tf->buffer.end.timestamp = ltt_time_add( + ltt_time_from_uint64( + ltt_get_uint64(LTT_GET_BO(tf), + &header->end.timestamp) + - tf->trace->start_monotonic), + tf->trace->start_time); +#endif //0 + //g_debug("block %u end : %lu.%lu", block_num, + // tf->buffer.end.timestamp.tv_sec, tf->buffer.end.timestamp.tv_nsec); tf->buffer.end.cycle_count = ltt_get_uint64(LTT_GET_BO(tf), &header->end.cycle_count); - tf->buffer.lost_size = ltt_get_uint32(LTT_GET_BO(tf), - &header->lost_size); + tf->buffer.end.freq = ltt_get_uint64(LTT_GET_BO(tf), + &header->end.freq); + if(tf->buffer.end.freq == 0) + tf->buffer.end.freq = tf->trace->start_freq; + tf->buffer.lost_size = ltt_get_uint32(LTT_GET_BO(tf), + &header->lost_size); + tf->buffer.end.timestamp = ltt_interpolate_time_from_tsc(tf, + tf->buffer.end.cycle_count); +#if 0 + ltt_time_add( + ltt_time_from_uint64( + (double)(tf->buffer.end.cycle_count + - tf->trace->start_tsc) * 1000000.0 + / (double)tf->trace->start_freq), + tf->trace->start_time_from_tsc); +#endif //0 tf->buffer.tsc = tf->buffer.begin.cycle_count; tf->event.tsc = tf->buffer.tsc; + tf->buffer.freq = tf->buffer.begin.freq; /* FIXME * eventually support variable buffer size : will need a partial pre-read of * the headers to create an index when we open the trace... eventually. */ - g_assert(tf->block_size == ltt_get_uint32(LTT_GET_BO(tf), + g_assert(tf->buf_size == ltt_get_uint32(LTT_GET_BO(tf), &header->buf_size)); /* Now that the buffer is mapped, calculate the time interpolation for the * block. */ - tf->buffer.nsecs_per_cycle = calc_nsecs_per_cycle(tf); +// tf->buffer.nsecs_per_cycle = calc_nsecs_per_cycle(tf); + //tf->buffer.cyc2ns_scale = calc_nsecs_per_cycle(tf); /* Make the current event point to the beginning of the buffer : * it means that the event read must get the first event. */ tf->event.tracefile = tf; tf->event.block = block_num; - tf->event.offset = tf->buffer.head; + tf->event.offset = 0; return 0; @@ -1551,49 +2037,184 @@ map_error: } -/* It will update the fields offsets too */ -void ltt_update_event_size(LttTracefile *tf) +static void print_debug_event_data(LttEvent *ev) { - ssize_t size = 0; + unsigned int offset = 0; + int i, j; - /* Specific handling of core events : necessary to read the facility control - * tracefile. */ - LttFacility *f = ltt_trace_get_facility_by_num(tf->trace, - tf->event.facility_id); + if (!max(ev->event_size, ev->data_size)) + return; + + g_printf("Event data (tracefile %s offset %llx):\n", + g_quark_to_string(ev->tracefile->long_name), + ((uint64_t)ev->tracefile->buffer.index * ev->tracefile->buf_size) + + (long)ev->data - (long)ev->tracefile->buffer.head); - if(unlikely(f == NULL)) { - if(likely(tf->event.facility_id == LTT_FACILITY_CORE)) { - switch((enum ltt_core_events)tf->event.event_id) { - case LTT_EVENT_FACILITY_LOAD: - size = sizeof(struct LttFacilityLoad); + while (offset < max(ev->event_size, ev->data_size)) { + g_printf("%8lx", (long)ev->data + offset + - (long)ev->tracefile->buffer.head); + g_printf(" "); + + for (i = 0; i < 4 ; i++) { + for (j = 0; j < 4; j++) { + if (offset + ((i * 4) + j) < max(ev->event_size, ev->data_size)) + g_printf("%02hhX", ((char*)ev->data)[offset + ((i * 4) + j)]); + else + g_printf(" "); + g_printf(" "); + } + if (i < 4) + g_printf(" "); + } + + g_printf(" "); + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (offset + ((i * 4) + j) < max(ev->event_size, ev->data_size)) { + if (isprint(((char*)ev->data)[offset + ((i * 4) + j)])) + g_printf("%c", ((char*)ev->data)[offset + ((i * 4) + j)]); + else + g_printf("."); + } else + g_printf(" "); + } + } + offset+=16; + g_printf("\n"); + } +} + +/* It will update the fields offsets too */ +void ltt_update_event_size(LttTracefile *tf) +{ + off_t size = 0; + char *tscdata; + struct marker_info *info; + + switch((enum marker_id)tf->event.event_id) { + case MARKER_ID_SET_MARKER_ID: + size = strlen((char*)tf->event.data) + 1; + g_debug("marker %s id set", (char*)tf->event.data); + size += ltt_align(size, sizeof(guint16), tf->alignment); + size += sizeof(guint16); + size += sizeof(guint8); + size += sizeof(guint8); + size += sizeof(guint8); + size += sizeof(guint8); + size += sizeof(guint8); break; - case LTT_EVENT_FACILITY_UNLOAD: - size = sizeof(struct LttFacilityUnload); + case MARKER_ID_SET_MARKER_FORMAT: + g_debug("marker %s format set", (char*)tf->event.data); + size = strlen((char*)tf->event.data) + 1; + size += strlen((char*)tf->event.data + size) + 1; break; - case LTT_EVENT_STATE_DUMP_FACILITY_LOAD: - size = sizeof(struct LttStateDumpFacilityLoad); + case MARKER_ID_HEARTBEAT_32: + g_debug("Update Event heartbeat 32 bits"); break; - case LTT_EVENT_HEARTBEAT: - size = sizeof(TimeHeartbeat); + 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 = ltt_align(size, sizeof(guint64), tf->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; + } - } - } - } else { - LttEventType *event_type = - ltt_facility_eventtype_get(f, tf->event.event_id); - size = get_fields_offsets(tf, event_type, tf->event.data); + info = marker_get_info_from_id(tf->trace, tf->event.event_id); + + if (tf->event.event_id >= MARKER_CORE_IDS) + g_assert(info != NULL); + + /* Do not update field offsets of core markers when initially reading the + * facility tracefile when the infos about these markers do not exist yet. + */ + if (likely(info && info->fields)) { + if (info->size != -1) + size = info->size; + else + size = marker_update_fields_offsets(marker_get_info_from_id(tf->trace, + tf->event.event_id), tf->event.data); + } + + 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 (a_event_debug) + print_debug_event_data(&tf->event); + + /* Having a marker load or marker format event out of the facilities + * tracefiles is a serious bug. */ + switch((enum marker_id)tf->event.event_id) { + case MARKER_ID_SET_MARKER_ID: + case MARKER_ID_SET_MARKER_FORMAT: + if (tf->name != g_quark_from_string("/control/facilities")) + g_error("Trace inconsistency : metadata event found in data " + "tracefile %s", g_quark_to_string(tf->long_name)); + } + + if (tf->event.data_size != tf->event.event_size) { + struct marker_info *info = marker_get_info_from_id(tf->trace, + tf->event.event_id); + g_error("Kernel/LTTV event size differs for event %s: kernel %u, LTTV %u", + g_quark_to_string(info->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); + + if(!event_type) { + g_warning("Unknown event id %hhu in facility %s in tracefile %s", + tf->event.event_id, + g_quark_to_string(f->name), + g_quark_to_string(tf->name)); + goto event_type_error; } + /* Compute the dynamic offsets */ + compute_offsets(tf, f, event_type, &size, tf->event.data); + + //g_debug("Event root field : f.e %hhu.%hhu size %zd", + // tf->event.facility_id, + // tf->event.event_id, size); + +no_offset: 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); + } + //g_assert(tf->event.data_size == tf->event.event_size); + + return; + +event_type_error: event_id_error: - return -1; + if(tf->event.event_size == 0xFFFF) { + g_error("Cannot jump over an unknown event bigger than 0xFFFE bytes"); + } + /* 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 } @@ -1608,31 +2229,35 @@ event_id_error: * ERANGE if we are at the end of the buffer. * ENOPROTOOPT if an error occured when getting the current event size. */ -static int ltt_seek_next_event(LttTracefile *tf) +int ltt_seek_next_event(LttTracefile *tf) { int ret = 0; void *pos; - ssize_t event_size; /* seek over the buffer header if we are at the buffer start */ - if(tf->event.offset == tf->buffer.head) { - tf->event.offset += sizeof(struct ltt_block_start_header); - goto found; - } + if(tf->event.offset == 0) { + tf->event.offset += tf->buffer_header_size; - - if(tf->event.offset == tf->buffer.head + tf->buffer.lost_size) { - ret = ERANGE; + if(tf->event.offset == tf->buf_size - tf->buffer.lost_size) { + ret = ERANGE; + } goto found; } + pos = tf->event.data; if(tf->event.data_size < 0) goto error; pos += (size_t)tf->event.data_size; - tf->event.offset = pos; + tf->event.offset = pos - tf->buffer.head; + + if(tf->event.offset == tf->buf_size - tf->buffer.lost_size) { + ret = ERANGE; + goto found; + } + g_assert(tf->event.offset < tf->buf_size - tf->buffer.lost_size); found: return ret; @@ -1643,36 +2268,33 @@ error: return ENOPROTOOPT; } - +#if 0 /***************************************************************************** *Function name * calc_nsecs_per_cycle : calculate nsecs per cycle for current block + * + * 1.0 / (freq(khz) *1000) * 1000000000 *Input Params * t : tracefile ****************************************************************************/ - -static double calc_nsecs_per_cycle(LttTracefile * tf) +/* from timer_tsc.c */ +#define CYC2NS_SCALE_FACTOR 10 +static guint32 calc_nsecs_per_cycle(LttTracefile * tf) { - LttTime lBufTotalTime; /* Total time for this buffer */ - double lBufTotalNSec; /* Total time for this buffer in nsecs */ - LttCycleCount lBufTotalCycle;/* Total cycles for this buffer */ - - /* Calculate the total time for this buffer */ - lBufTotalTime = ltt_time_sub( - ltt_get_time(LTT_GET_BO(tf), &tf->buffer.end.timestamp), - ltt_get_time(LTT_GET_BO(tf), &tf->buffer.begin.timestamp)); - - /* Calculate the total cycles for this bufffer */ - lBufTotalCycle = ltt_get_uint64(LTT_GET_BO(tf), &tf->buffer.end.cycle_count); - lBufTotalCycle -= ltt_get_uint64(LTT_GET_BO(tf), - &tf->buffer.begin.cycle_count); - - /* Convert the total time to double */ - lBufTotalNSec = ltt_time_to_double(lBufTotalTime); + //return 1e6 / (double)tf->buffer.freq; + guint32 cpu_mhz = tf->buffer.freq / 1000; + guint32 cyc2ns_scale = (1000 << CYC2NS_SCALE_FACTOR)/cpu_mhz; - return lBufTotalNSec / (double)lBufTotalCycle; + return cyc2ns_scale; + // return 1e6 / (double)tf->buffer.freq; +} +static guint64 cycles_2_ns(LttTracefile *tf, guint64 cycles) +{ + return (cycles * tf->buffer.cyc2ns_scale) >> CYC2NS_SCALE_FACTOR; } +#endif //0 + #if 0 void setFieldsOffset(LttTracefile *tf, LttEventType *evT,void *evD) { @@ -1684,7 +2306,7 @@ void setFieldsOffset(LttTracefile *tf, LttEventType *evT,void *evD) evT, 0,0,rootFld, evD); } #endif //0 - +#if 0 /***************************************************************************** *Function name * set_fields_offsets : set the precomputable offset of the fields @@ -1704,6 +2326,392 @@ void set_fields_offsets(LttTracefile *tf, LttEventType *event_type) field); } +#endif //0 + + +/***************************************************************************** + *Function name + * get_alignment : Get the alignment needed for a field. + *Input params + * field : field + * + * returns : The size on which it must be aligned. + * + ****************************************************************************/ +#if 0 +off_t get_alignment(LttField *field) +{ + LttType *type = &field->field_type; + + switch(type->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: + case LTT_INT: + case LTT_UINT: + case LTT_LONG: + case LTT_ULONG: + case LTT_SIZE_T: + case LTT_SSIZE_T: + case LTT_OFF_T: + case LTT_FLOAT: + case LTT_ENUM: + /* Align offset on type size */ + g_assert(field->field_size != 0); + return field->field_size; + break; + case LTT_STRING: + return 1; + break; + case LTT_ARRAY: + g_assert(type->fields->len == 1); + { + LttField *child = &g_array_index(type->fields, LttField, 0); + return get_alignment(child); + } + break; + case LTT_SEQUENCE: + g_assert(type->fields->len == 2); + { + off_t localign = 1; + LttField *child = &g_array_index(type->fields, LttField, 0); + + localign = max(localign, get_alignment(child)); + + child = &g_array_index(type->fields, LttField, 1); + localign = max(localign, get_alignment(child)); + + return localign; + } + break; + case LTT_STRUCT: + case LTT_UNION: + { + guint i; + off_t localign = 1; + + for(i=0; ifields->len; i++) { + LttField *child = &g_array_index(type->fields, LttField, i); + localign = max(localign, get_alignment(child)); + } + return localign; + } + break; + case LTT_NONE: + default: + g_error("get_alignment : unknown type"); + return -1; + } +} + +#endif //0 + +/***************************************************************************** + *Function name + * field_compute_static_size : Determine the size of fields known by their + * sole definition. Unions, arrays and struct sizes might be known, but + * the parser does not give that information. + *Input params + * tf : tracefile + * field : field + * + ****************************************************************************/ +#if 0 +void field_compute_static_size(LttFacility *fac, LttField *field) +{ + LttType *type = &field->field_type; + + switch(type->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: + case LTT_INT: + case LTT_UINT: + case LTT_LONG: + case LTT_ULONG: + case LTT_SIZE_T: + case LTT_SSIZE_T: + case LTT_OFF_T: + case LTT_FLOAT: + case LTT_ENUM: + case LTT_STRING: + /* nothing to do */ + break; + case LTT_ARRAY: + /* note this : array type size is the number of elements in the array, + * while array field size of the length of the array in bytes */ + g_assert(type->fields->len == 1); + { + LttField *child = &g_array_index(type->fields, LttField, 0); + field_compute_static_size(fac, child); + + if(child->field_size != 0) { + field->field_size = type->size * child->field_size; + field->dynamic_offsets = g_array_sized_new(FALSE, TRUE, + sizeof(off_t), type->size); + } else { + field->field_size = 0; + } + } + break; + case LTT_SEQUENCE: + g_assert(type->fields->len == 2); + { + off_t local_offset = 0; + LttField *child = &g_array_index(type->fields, LttField, 1); + field_compute_static_size(fac, child); + field->field_size = 0; + type->size = 0; + if(child->field_size != 0) { + field->dynamic_offsets = g_array_sized_new(FALSE, TRUE, + sizeof(off_t), SEQUENCE_AVG_ELEMENTS); + } + } + break; + case LTT_STRUCT: + case LTT_UNION: + { + guint i; + for(i=0;ifields->len;i++) { + LttField *child = &g_array_index(type->fields, LttField, i); + field_compute_static_size(fac, child); + if(child->field_size != 0) { + type->size += ltt_align(type->size, get_alignment(child), + fac->alignment); + type->size += child->field_size; + } else { + /* As soon as we find a child with variable size, we have + * a variable size */ + type->size = 0; + break; + } + } + field->field_size = type->size; + } + break; + default: + g_error("field_static_size : unknown type"); + } + +} +#endif //0 + + +/***************************************************************************** + *Function name + * precompute_fields_offsets : set the precomputable offset of the fields + *Input params + * fac : facility + * field : the field + * offset : pointer to the current offset, must be incremented + * + * return : 1 : found a variable length field, stop the processing. + * 0 otherwise. + ****************************************************************************/ + +#if 0 +gint precompute_fields_offsets(LttFacility *fac, LttField *field, off_t *offset, gint is_compact) +{ + LttType *type = &field->field_type; + + if(unlikely(is_compact)) { + g_assert(field->field_size != 0); + /* FIXME THIS IS A HUUUUUGE hack : + * offset is between the compact_data field in struct LttEvent + * and the address of the field root in the memory map. + * ark. Both will stay at the same addresses while the event + * is readable, so it's ok. + */ + field->offset_root = 0; + field->fixed_root = FIELD_FIXED; + return 0; + } + + switch(type->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: + case LTT_INT: + case LTT_UINT: + case LTT_LONG: + case LTT_ULONG: + case LTT_SIZE_T: + case LTT_SSIZE_T: + case LTT_OFF_T: + case LTT_FLOAT: + case LTT_ENUM: + g_assert(field->field_size != 0); + /* Align offset on type size */ + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + field->fixed_root = FIELD_FIXED; + /* Increment offset */ + *offset += field->field_size; + return 0; + break; + case LTT_STRING: + field->offset_root = *offset; + field->fixed_root = FIELD_FIXED; + return 1; + break; + case LTT_ARRAY: + g_assert(type->fields->len == 1); + { + LttField *child = &g_array_index(type->fields, LttField, 0); + + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + + /* remember offset */ + field->offset_root = *offset; + field->array_offset = *offset; + field->fixed_root = FIELD_FIXED; + + /* Let the child be variable */ + //precompute_fields_offsets(tf, child, offset); + + if(field->field_size != 0) { + /* Increment offset */ + /* field_size is the array size in bytes */ + *offset += field->field_size; + return 0; + } else { + return 1; + } + } + break; + case LTT_SEQUENCE: + g_assert(type->fields->len == 2); + { + LttField *child; + guint ret; + + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + + /* remember offset */ + field->offset_root = *offset; + field->fixed_root = FIELD_FIXED; + + child = &g_array_index(type->fields, LttField, 0); + ret = precompute_fields_offsets(fac, child, offset, is_compact); + g_assert(ret == 0); /* Seq len cannot have variable len */ + + child = &g_array_index(type->fields, LttField, 1); + *offset += ltt_align(*offset, get_alignment(child), + fac->alignment); + field->array_offset = *offset; + /* Let the child be variable. */ + //ret = precompute_fields_offsets(fac, child, offset); + + /* Cannot precompute fields offsets of sequence members, and has + * variable length. */ + return 1; + } + break; + case LTT_STRUCT: + { + LttField *child; + guint i; + gint ret=0; + + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + field->fixed_root = FIELD_FIXED; + + for(i=0; i< type->fields->len; i++) { + child = &g_array_index(type->fields, LttField, i); + ret = precompute_fields_offsets(fac, child, offset, is_compact); + + if(ret) break; + } + return ret; + } + break; + case LTT_UNION: + { + LttField *child; + guint i; + gint ret=0; + + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + field->fixed_root = FIELD_FIXED; + + for(i=0; i< type->fields->len; i++) { + *offset = field->offset_root; + child = &g_array_index(type->fields, LttField, i); + ret = precompute_fields_offsets(fac, child, offset, is_compact); + + if(ret) break; + } + *offset = field->offset_root + field->field_size; + return ret; + } + + break; + case LTT_NONE: + default: + g_error("precompute_fields_offsets : unknown type"); + return 1; + } + +} + +#endif //0 + +#if 0 +/***************************************************************************** + *Function name + * precompute_offsets : set the precomputable offset of an event type + *Input params + * tf : tracefile + * event : event type + * + ****************************************************************************/ +void precompute_offsets(LttFacility *fac, LttEventType *event) +{ + guint i; + off_t offset = 0; + gint ret; + + /* First, compute the size of fixed size fields. Will determine size for + * arrays, struct and unions, which is not done by the parser */ + for(i=0; ifields->len; i++) { + LttField *field = &g_array_index(event->fields, LttField, i); + field_compute_static_size(fac, field); + } + + /* Precompute all known offsets */ + for(i=0; ifields->len; i++) { + LttField *field = &g_array_index(event->fields, LttField, i); + if(event->has_compact_data && i == 0) + ret = precompute_fields_offsets(fac, field, &offset, 1); + else + ret = precompute_fields_offsets(fac, field, &offset, 0); + if(ret) break; + } +} +#endif //0 + /***************************************************************************** @@ -1718,6 +2726,15 @@ void set_fields_offsets(LttTracefile *tf, LttEventType *event_type) * fixed_parent : Do we know a fixed offset to the parent ? * field : field ****************************************************************************/ + + + +// preset the fixed size offsets. Calculate them just like genevent-new : an +// increment of a *to value that represents the offset from the start of the +// event data. +// The preset information is : offsets up to (and including) the first element +// of variable size. All subsequent fields must be flagged "VARIABLE OFFSET". +#if 0 void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, off_t offset_root, off_t offset_parent, enum field_status *fixed_root, enum field_status *fixed_parent, @@ -1751,6 +2768,12 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, size_t max_size; switch(type->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: case LTT_INT: case LTT_UINT: case LTT_FLOAT: @@ -1764,7 +2787,7 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, break; case LTT_LONG: case LTT_ULONG: - field->field_size = (off_t)event_type->facility->pointer_size; + field->field_size = (off_t)event_type->facility->long_size; field->fixed_size = FIELD_FIXED; break; case LTT_SIZE_T: @@ -1782,10 +2805,14 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, field->child[0]); field->fixed_size = FIELD_VARIABLE; field->field_size = 0; + *fixed_root = FIELD_VARIABLE; + *fixed_parent = FIELD_VARIABLE; break; case LTT_STRING: field->fixed_size = FIELD_VARIABLE; field->field_size = 0; + *fixed_root = FIELD_VARIABLE; + *fixed_parent = FIELD_VARIABLE; break; case LTT_ARRAY: local_fixed_root = FIELD_VARIABLE; @@ -1795,10 +2822,13 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, &local_fixed_root, &local_fixed_parent, field->child[0]); field->fixed_size = field->child[0]->fixed_size; - if(field->fixed_size == FIELD_FIXED) + if(field->fixed_size == FIELD_FIXED) { field->field_size = type->element_number * field->child[0]->field_size; - else + } else { field->field_size = 0; + *fixed_root = FIELD_VARIABLE; + *fixed_parent = FIELD_VARIABLE; + } break; case LTT_STRUCT: current_root_offset = field->offset_root; @@ -1844,6 +2874,8 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, max_size = max(max_size, field->child[i]->field_size); } if(final_child_status != FIELD_FIXED) { + g_error("LTTV does not support variable size fields in unions."); + /* This will stop the application. */ *fixed_root = final_child_status; *fixed_parent = final_child_status; field->field_size = 0; @@ -1853,159 +2885,142 @@ void preset_field_type_size(LttTracefile *tf, LttEventType *event_type, field->fixed_size = FIELD_FIXED; } break; + case LTT_NONE: + g_error("unexpected type NONE"); + break; } } - +#endif //0 /***************************************************************************** *Function name - * get_field_type_size : set the fixed and dynamic sizes of the field type - * from the data read. + * check_fields_compatibility : Check for compatibility between two fields : + * do they use the same inner structure ? *Input params - * tf : tracefile - * event_type : event type - * offset_root : offset from the root - * offset_parent : offset from the parent - * field : field - * data : a pointer to the event data. - *Returns the field type size. + * event_type1 : event type + * event_type2 : event type + * field1 : field + * field2 : field + *Returns : 0 if identical + * 1 if not. ****************************************************************************/ -size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, - off_t offset_root, off_t offset_parent, - LttField *field, void *data) +// this function checks for equality of field types. Therefore, it does not use +// per se offsets. For instance, an aligned version of a structure is +// compatible with an unaligned version of the same structure. +#if 0 +gint check_fields_compatibility(LttEventType *event_type1, + LttEventType *event_type2, + LttField *field1, LttField *field2) { - size_t size = 0; - guint i; - LttType *type; - - g_assert(field->fixed_root != FIELD_UNKNOWN); - g_assert(field->fixed_parent != FIELD_UNKNOWN); - g_assert(field->fixed_size != FIELD_UNKNOWN); + guint different = 0; + LttType *type1; + LttType *type2; - field->offset_root = offset_root; - field->offset_parent = offset_parent; - - type = field->field_type; + if(field1 == NULL) { + if(field2 == NULL) goto end; + else { + different = 1; + goto end; + } + } else if(field2 == NULL) { + different = 1; + goto end; + } - switch(type->type_class) { + type1 = &field1->field_type; + type2 = &field2->field_type; + + if(type1->type_class != type2->type_class) { + different = 1; + goto end; + } + if(type1->network != type2->network) { + different = 1; + goto end; + } + + switch(type1->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: case LTT_INT: case LTT_UINT: - case LTT_FLOAT: - case LTT_ENUM: - case LTT_POINTER: case LTT_LONG: case LTT_ULONG: case LTT_SIZE_T: case LTT_SSIZE_T: case LTT_OFF_T: - g_assert(field->fixed_size == FIELD_FIXED); - size = field->field_size; - break; - case LTT_SEQUENCE: - { - gint seqnum = ltt_get_uint(LTT_GET_BO(tf), - field->sequ_number_size, - data + offset_root); - - if(field->child[0]->fixed_size == FIELD_FIXED) { - size = field->sequ_number_size + - (seqnum * get_field_type_size(tf, event_type, - offset_root, offset_parent, - field->child[0], data)); - } else { - size += field->sequ_number_size; - for(i=0;ichild[0], data); - offset_root += child_size; - offset_parent += child_size; - size += child_size; - } - } - field->field_size = size; - } + case LTT_FLOAT: + case LTT_ENUM: + if(field1->field_size != field2->field_size) + different = 1; break; case LTT_STRING: - size = strlen((char*)(data+offset_root)) + 1;// length + \0 - field->field_size = size; break; case LTT_ARRAY: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - for(i=0;ifield_type->element_number;i++) { - size_t child_size; - child_size = get_field_type_size(tf, event_type, - offset_root, offset_parent, - field->child[0], data); - offset_root += child_size; - offset_parent += child_size; - size += child_size; - } - field->field_size = size; + { + LttField *child1 = &g_array_index(type1->fields, LttField, 0); + LttField *child2 = &g_array_index(type2->fields, LttField, 0); + + if(type1->size != type2->size) + different = 1; + if(check_fields_compatibility(event_type1, event_type2, child1, child2)) + different = 1; } break; - case LTT_STRUCT: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - size_t current_root_offset = offset_root; - size_t current_offset = 0; - size_t child_size = 0; - for(i=0;ielement_number;i++) { - child_size = get_field_type_size(tf, - event_type, current_root_offset, current_offset, - field->child[i], data); - current_offset += child_size; - current_root_offset += child_size; - - } - size = current_offset; - field->field_size = size; + case LTT_SEQUENCE: + { + LttField *child1 = &g_array_index(type1->fields, LttField, 1); + LttField *child2 = &g_array_index(type2->fields, LttField, 1); + + if(check_fields_compatibility(event_type1, event_type2, child1, child2)) + different = 1; } break; + case LTT_STRUCT: case LTT_UNION: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - size_t current_root_offset = field->offset_root; - size_t current_offset = 0; - for(i=0;ielement_number;i++) { - size = get_field_type_size(tf, event_type, - current_root_offset, current_offset, - field->child[i], data); - size = max(size, field->child[i]->field_size); + { + LttField *child; + guint i; + + if(type1->fields->len != type2->fields->len) { + different = 1; + goto end; + } + + for(i=0; i< type1->fields->len; i++) { + LttField *child1; + LttField *child2; + child1 = &g_array_index(type1->fields, LttField, i); + child2 = &g_array_index(type2->fields, LttField, i); + different = check_fields_compatibility(event_type1, + event_type2, child1, child2); + + if(different) break; } - field->field_size = size; } break; + case LTT_NONE: + default: + g_error("check_fields_compatibility : unknown type"); } - return size; +end: + return different; } +#endif //0 - -/***************************************************************************** - *Function name - * check_fields_compatibility : Check for compatibility between two fields : - * do they use the same inner structure ? - *Input params - * event_type1 : event type - * event_type2 : event type - * field1 : field - * field2 : field - *Returns : 0 if identical - * 1 if not. - ****************************************************************************/ +#if 0 gint check_fields_compatibility(LttEventType *event_type1, LttEventType *event_type2, LttField *field1, LttField *field2) { guint different = 0; - enum field_status local_fixed_root, local_fixed_parent; guint i; LttType *type1; LttType *type2; @@ -2031,11 +3046,6 @@ gint check_fields_compatibility(LttEventType *event_type1, type1 = field1->field_type; type2 = field2->field_type; - size_t current_root_offset; - size_t current_offset; - enum field_status current_child_status, final_child_status; - size_t max_size; - if(type1->type_class != type2->type_class) { different = 1; goto end; @@ -2046,6 +3056,13 @@ gint check_fields_compatibility(LttEventType *event_type1, } switch(type1->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: case LTT_INT: case LTT_UINT: case LTT_FLOAT: @@ -2118,179 +3135,12 @@ gint check_fields_compatibility(LttEventType *event_type1, end: return different; } - - - - -#if 0 -/***************************************************************************** - *Function name - * getFieldtypeSize: get the size of the field type (primitive type) - *Input params - * evT : event type - * offsetRoot : offset from the root - * offsetParent : offset from the parrent - * fld : field - * evD : event data, it may be NULL - *Return value - * int : size of the field - ****************************************************************************/ - -static inline gint getFieldtypeSize(LttTracefile *tf, - LttEventType * evT, gint offsetRoot, - gint offsetParent, LttField * fld, void *evD) -{ - gint size, size1, element_number, i, offset1, offset2; - LttType * type = fld->field_type; - - /* This likely has been tested with gcov : half of them.. */ - if(unlikely(fld->field_fixed == 1)){ - /* tested : none */ - if(unlikely(fld == evT->root_field)) { - size = fld->field_size; - goto end_getFieldtypeSize; - } - } - - /* From gcov profiling : half string, half struct, can we gain something - * from that ? (Mathieu) */ - switch(type->type_class) { - case LTT_ARRAY: - element_number = (int) type->element_number; - if(fld->field_fixed == -1){ - size = getFieldtypeSize(tf, evT, offsetRoot, - 0,fld->child[0], NULL); - if(size == 0){ //has string or sequence - fld->field_fixed = 0; - }else{ - fld->field_fixed = 1; - size *= element_number; - } - }else if(fld->field_fixed == 0){// has string or sequence - size = 0; - for(i=0;ichild[0], evD+size); - } - }else size = fld->field_size; - if(unlikely(!evD)){ - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - } - - break; - - case LTT_SEQUENCE: - size1 = (int) ltt_type_size(fac, type); - if(fld->field_fixed == -1){ - fld->sequ_number_size = size1; - fld->field_fixed = 0; - size = getFieldtypeSize(evT, offsetRoot, - 0,fld->child[0], NULL); - fld->element_size = size; - }else{//0: sequence - element_number = getIntNumber(tf,size1,evD); - type->element_number = element_number; - if(fld->element_size > 0){ - size = element_number * fld->element_size; - }else{//sequence has string or sequence - size = 0; - for(i=0;ichild[0], evD+size+size1); - } - } - size += size1; - } - if(unlikely(!evD)){ - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - } - - break; - - case LTT_STRING: - size = 0; - if(fld->field_fixed == -1){ - fld->field_fixed = 0; - }else{//0: string - /* Hope my implementation is faster than strlen (Mathieu) */ - char *ptr=(char*)evD; - size = 1; - /* from gcov : many many strings are empty, make it the common case.*/ - while(unlikely(*ptr != '\0')) { size++; ptr++; } - //size = ptr - (char*)evD + 1; //include end : '\0' - } - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - - break; - - case LTT_STRUCT: - element_number = (int) type->element_number; - size = 0; - /* tested with gcov */ - if(unlikely(fld->field_fixed == -1)){ - offset1 = offsetRoot; - offset2 = 0; - for(i=0;ichild[i], NULL); - if(likely(size1 > 0 && size >= 0)){ - size += size1; - if(likely(offset1 >= 0)) offset1 += size1; - offset2 += size1; - }else{ - size = -1; - offset1 = -1; - offset2 = -1; - } - } - if(unlikely(size == -1)){ - fld->field_fixed = 0; - size = 0; - }else fld->field_fixed = 1; - }else if(likely(fld->field_fixed == 0)){ - offset1 = offsetRoot; - offset2 = 0; - for(i=0;unlikely(ichild[i], evD+offset2); - offset1 += size; - offset2 += size; - } - size = offset2; - }else size = fld->field_size; - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - break; - - default: - if(unlikely(fld->field_fixed == -1)){ - size = (int) ltt_type_size(LTT_GET_BO(tf), type); - fld->field_fixed = 1; - }else size = fld->field_size; - if(unlikely(!evD)){ - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - } - break; - } - - fld->offset_root = offsetRoot; - fld->offset_parent = offsetParent; - fld->field_size = size; - -end_getFieldtypeSize: - - return size; -} #endif //0 + /***************************************************************************** *Function name - * get_int : get an integer number + * ltt_get_int : get an integer number *Input params * reverse_byte_order: must we reverse the byte order ? * size : the size of the integer @@ -2299,7 +3149,7 @@ end_getFieldtypeSize: * gint64 : a 64 bits integer ****************************************************************************/ -gint64 get_int(gboolean reverse_byte_order, gint size, void *data) +gint64 ltt_get_int(gboolean reverse_byte_order, gint size, void *data) { gint64 val; @@ -2318,7 +3168,7 @@ gint64 get_int(gboolean reverse_byte_order, gint size, void *data) /***************************************************************************** *Function name - * get_uint : get an unsigned integer number + * ltt_get_uint : get an unsigned integer number *Input params * reverse_byte_order: must we reverse the byte order ? * size : the size of the integer @@ -2327,7 +3177,7 @@ gint64 get_int(gboolean reverse_byte_order, gint size, void *data) * guint64 : a 64 bits unsigned integer ****************************************************************************/ -guint64 get_uint(gboolean reverse_byte_order, gint size, void *data) +guint64 ltt_get_uint(gboolean reverse_byte_order, gint size, void *data) { guint64 val; @@ -2370,17 +3220,24 @@ char * ltt_trace_system_description_description (LttSystemDescription * s) } -/* get the start time of the trace */ - -LttTime ltt_trace_system_description_trace_start_time(LttSystemDescription *s) +/* get the NTP corrected start time of the trace */ +LttTime ltt_trace_start_time(LttTrace *t) { - return s->trace_start; + return t->start_time; } +/* get the monotonic start time of the trace */ +LttTime ltt_trace_start_time_monotonic(LttTrace *t) +{ + return t->start_time_from_tsc; +} LttTracefile *ltt_tracefile_new() { - return g_new(LttTracefile, 1); + LttTracefile *tf; + tf = g_new(LttTracefile, 1); + tf->event.tracefile = tf; + return tf; } void ltt_tracefile_destroy(LttTracefile *tf) @@ -2395,11 +3252,11 @@ void ltt_tracefile_copy(LttTracefile *dest, const LttTracefile *src) /* Before library loading... */ -static void __attribute__((constructor)) init(void) +void init(void) { LTT_FACILITY_NAME_HEARTBEAT = g_quark_from_string("heartbeat"); LTT_EVENT_NAME_HEARTBEAT = g_quark_from_string("heartbeat"); + LTT_EVENT_NAME_HEARTBEAT_FULL = g_quark_from_string("heartbeat_full"); - LTT_TRACEFILE_NAME_FACILITIES = g_quark_from_string("control/facilities"); + LTT_TRACEFILE_NAME_FACILITIES = g_quark_from_string("/control/facilities"); } -