X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=a111e41fd3a706c323636ed24e366f833f2c6fb1;hb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;hp=2d2bba390df0a3c86ac920e26362137c76624b4f;hpb=a614481acfb491a17b6cf4cd8badaee969e07a90;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 2d2bba39..a111e41f 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -1,17 +1,67 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 Xiangxiu Yang, Mathieu Desnoyers + * + * 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 program 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. + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include +#include +#include #include #include -#include -#include +#include +#include +#include +#include + +// For realpath +#include +#include + #include "parser.h" #include #include "ltt-private.h" #include #include +#include +#include +#include + +#ifndef g_open +#define g_open open +#endif + #define DIR_NAME_SIZE 256 +#define __UNUSED__ __attribute__((__unused__)) + +#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) +#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) + +#define g_close close + +/* obtain the time of an event */ + +static inline LttTime getEventTime(LttTracefile * tf); + /* set the offset of the fields belonging to the event, need the information of the archecture */ @@ -19,11 +69,12 @@ void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace *t); /* get the size of the field type according to the archtecture's size and endian type(info of the archecture) */ -int getFieldtypeSize(LttTracefile * tf, LttEventType * evT, int offsetRoot, - int offsetParent, LttField *fld, void *evD, LttTrace* t); +static inline gint getFieldtypeSize(LttTracefile * tf, + LttEventType * evT, gint offsetRoot, + gint offsetParent, LttField *fld, void *evD, LttTrace* t); /* read a fixed size or a block information from the file (fd) */ -int readFile(int fd, void * buf, size_t size, char * mesg); +int readFile(int fd, void * buf, size_t size, gchar * mesg); int readBlock(LttTracefile * tf, int whichBlock); /* calculate cycles per nsec for current block */ @@ -37,7 +88,7 @@ int skipEvent(LttTracefile * t); /* Functions to parse system.xml file (using glib xml parser) */ -static void parser_start_element (GMarkupParseContext *context, +static void parser_start_element (GMarkupParseContext __UNUSED__ *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, @@ -47,8 +98,10 @@ static void parser_start_element (GMarkupParseContext *context, int i=0; LttSystemDescription* des = (LttSystemDescription* )user_data; if(strcmp("system", element_name)){ - g_warning("This is not system.xml file\n"); - exit(1); + *error = g_error_new(G_MARKUP_ERROR, + G_LOG_LEVEL_WARNING, + "This is not system.xml file"); + return; } while(attribute_names[i]){ @@ -90,25 +143,20 @@ static void parser_start_element (GMarkupParseContext *context, }else if(strcmp("ltt_block_size", attribute_names[i])==0){ des->ltt_block_size = atoi(attribute_values[i]); }else{ - g_warning("Not a valid attribute\n"); - exit(1); + *error = g_error_new(G_MARKUP_ERROR, + G_LOG_LEVEL_WARNING, + "Not a valid attribute"); + return; } i++; } } -static void parser_end_element (GMarkupParseContext *context, - const gchar *element_name, - gpointer user_data, - GError **error) -{ -} - -static void parser_characters (GMarkupParseContext *context, +static void parser_characters (GMarkupParseContext __UNUSED__ *context, const gchar *text, - gsize text_len, + gsize __UNUSED__ text_len, gpointer user_data, - GError **error) + GError __UNUSED__ **error) { LttSystemDescription* des = (LttSystemDescription* )user_data; des->description = g_strdup(text); @@ -125,32 +173,38 @@ static void parser_characters (GMarkupParseContext *context, * : a pointer to a tracefile ****************************************************************************/ -LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName) +LttTracefile* ltt_tracefile_open(LttTrace * t, gchar * fileName) { LttTracefile * tf; struct stat lTDFStat; /* Trace data file status */ - BlockStart a_block_start; tf = g_new(LttTracefile, 1); //open the file tf->name = g_strdup(fileName); tf->trace = t; - tf->fd = open(fileName, O_RDONLY, 0); + tf->fd = g_open(fileName, O_RDONLY, 0); if(tf->fd < 0){ - g_error("Unable to open input data file %s\n", fileName); + g_warning("Unable to open input data file %s\n", fileName); + g_free(tf->name); + g_free(tf); + return NULL; } // Get the file's status if(fstat(tf->fd, &lTDFStat) < 0){ - g_error("Unable to get the status of the input data file %s\n", fileName); + g_warning("Unable to get the status of the input data file %s\n", fileName); + g_free(tf->name); + g_close(tf->fd); + g_free(tf); + return NULL; } // Is the file large enough to contain a trace - if(lTDFStat.st_size < sizeof(BlockStart) + EVENT_HEADER_SIZE){ + if(lTDFStat.st_size < (off_t)(sizeof(BlockStart) + EVENT_HEADER_SIZE)){ g_print("The input data file %s does not contain a trace\n", fileName); g_free(tf->name); - close(tf->fd); + g_close(tf->fd); g_free(tf); return NULL; } @@ -162,7 +216,7 @@ LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName) tf->which_block = 0; //allocate memory to contain the info of a block - tf->buffer = (void *) g_new(char, t->system_description->ltt_block_size); + tf->buffer = (void *) g_new(gchar, t->system_description->ltt_block_size); //read the first block if(readBlock(tf,1)) exit(1); @@ -175,7 +229,7 @@ LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName) *Open control and per cpu tracefiles ****************************************************************************/ -void ltt_tracefile_open_cpu(LttTrace *t, char * tracefile_name) +void ltt_tracefile_open_cpu(LttTrace *t, gchar * tracefile_name) { LttTracefile * tf; tf = ltt_tracefile_open(t,tracefile_name); @@ -184,30 +238,31 @@ void ltt_tracefile_open_cpu(LttTrace *t, char * tracefile_name) g_ptr_array_add(t->per_cpu_tracefiles, tf); } -void ltt_tracefile_open_control(LttTrace *t, char * control_name) +gint ltt_tracefile_open_control(LttTrace *t, gchar * control_name) { LttTracefile * tf; - LttEvent * ev; + LttEvent ev; LttFacility * f; - guint16 evId; void * pos; FacilityLoad fLoad; - int i; + unsigned int i; tf = ltt_tracefile_open(t,control_name); - if(!tf) return; + if(!tf) { + g_warning("ltt_tracefile_open_control : bad file descriptor"); + return -1; + } t->control_tracefile_number++; g_ptr_array_add(t->control_tracefiles,tf); //parse facilities tracefile to get base_id if(strcmp(&control_name[strlen(control_name)-10],"facilities") ==0){ while(1){ - ev = ltt_tracefile_read(tf); - if(!ev)return; // end of file + if(!ltt_tracefile_read(tf,&ev)) return 0; // end of file - if(ev->event_id == TRACE_FACILITY_LOAD){ - pos = ev->data; - fLoad.name = (char*)pos; + if(ev.event_id == TRACE_FACILITY_LOAD){ + pos = ev.data; + fLoad.name = (gchar*)pos; fLoad.checksum = *(LttChecksum*)(pos + strlen(fLoad.name)); fLoad.base_code = *(guint32 *)(pos + strlen(fLoad.name) + sizeof(LttChecksum)); @@ -218,16 +273,22 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name) break; } } - if(i==t->facility_number) - g_error("Facility: %s, checksum: %d is not founded\n", - fLoad.name,fLoad.checksum); - }else if(ev->event_id == TRACE_BLOCK_START){ + if(i==t->facility_number) { + g_warning("Facility: %s, checksum: %u is not found", + fLoad.name,(unsigned int)fLoad.checksum); + return -1; + } + }else if(ev.event_id == TRACE_BLOCK_START){ continue; - }else if(ev->event_id == TRACE_BLOCK_END){ + }else if(ev.event_id == TRACE_BLOCK_END){ break; - }else g_error("Not valid facilities trace file\n"); + }else { + g_warning("Not valid facilities trace file"); + return -1; + } } } + return 0; } /***************************************************************************** @@ -249,64 +310,102 @@ void ltt_tracefile_close(LttTracefile *t) /***************************************************************************** *Get system information ****************************************************************************/ -void getSystemInfo(LttSystemDescription* des, char * pathname) +gint getSystemInfo(LttSystemDescription* des, gchar * pathname) { - FILE * fp; - char buf[DIR_NAME_SIZE]; - char description[4*DIR_NAME_SIZE]; + int fd; + GIOChannel *iochan; + gchar *buf = NULL; + gsize length; GMarkupParseContext * context; - GError * error; + GError * error = NULL; GMarkupParser markup_parser = { parser_start_element, - parser_end_element, + NULL, parser_characters, NULL, /* passthrough */ NULL /* error */ }; - fp = fopen(pathname,"r"); - if(!fp){ - g_error("Can not open file : %s\n", pathname); + fd = g_open(pathname, O_RDONLY, 0); + if(fd == -1){ + g_warning("Can not open file : %s\n", pathname); + return -1; } + iochan = g_io_channel_unix_new(fd); + context = g_markup_parse_context_new(&markup_parser, 0, des,NULL); - while(fgets(buf,DIR_NAME_SIZE, fp) != NULL){ - if(!g_markup_parse_context_parse(context, buf, DIR_NAME_SIZE, &error)){ - g_warning("Can not parse xml file: \n%s\n", error->message); - exit(1); + //while(fgets(buf,DIR_NAME_SIZE, fp) != NULL){ + while(g_io_channel_read_line(iochan, &buf, &length, NULL, &error) + != G_IO_STATUS_EOF) { + + if(error != NULL) { + g_warning("Can not read xml file: \n%s\n", error->message); + g_error_free(error); + } + if(!g_markup_parse_context_parse(context, buf, length, &error)){ + if(error != NULL) { + g_warning("Can not parse xml file: \n%s\n", error->message); + g_error_free(error); + } + g_markup_parse_context_free(context); + + g_io_channel_shutdown(iochan, FALSE, &error); /* No flush */ + if(error != NULL) { + g_warning("Can not close file: \n%s\n", error->message); + g_error_free(error); + } + + close(fd); + return -1; } } - fclose(fp); + g_markup_parse_context_free(context); + + g_io_channel_shutdown(iochan, FALSE, &error); /* No flush */ + if(error != NULL) { + g_warning("Can not close file: \n%s\n", error->message); + g_error_free(error); + } + + g_close(fd); + + g_free(buf); + return 0; } /***************************************************************************** *The following functions get facility/tracefile information ****************************************************************************/ -void getFacilityInfo(LttTrace *t, char* eventdefs) +gint getFacilityInfo(LttTrace *t, gchar* eventdefs) { - DIR * dir; - struct dirent *entry; - char * ptr; - int i,j; + GDir * dir; + const gchar * name; + unsigned int i,j; LttFacility * f; LttEventType * et; - char name[DIR_NAME_SIZE]; + gchar fullname[DIR_NAME_SIZE]; + GError * error = NULL; - dir = opendir(eventdefs); - if(!dir) g_error("Can not open directory: %s\n", eventdefs); + dir = g_dir_open(eventdefs, 0, &error); - while((entry = readdir(dir)) != NULL){ - ptr = &entry->d_name[strlen(entry->d_name)-4]; - if(strcmp(ptr,".xml") != 0) continue; - strcpy(name,eventdefs); - strcat(name,entry->d_name); - ltt_facility_open(t,name); - } - closedir(dir); + if(error != NULL) { + g_warning("Can not open directory: %s, %s\n", eventdefs, error->message); + g_error_free(error); + return -1; + } + + while((name = g_dir_read_name(dir)) != NULL){ + if(!g_pattern_match_simple("*.xml", name)) continue; + strcpy(fullname,eventdefs); + strcat(fullname,name); + ltt_facility_open(t,fullname); + } + g_dir_close(dir); for(j=0;jfacility_number;j++){ f = (LttFacility*)g_ptr_array_index(t->facilities, j); @@ -315,48 +414,64 @@ void getFacilityInfo(LttTrace *t, char* eventdefs) setFieldsOffset(NULL, et, NULL, t); } } + return 0; } -void getControlFileInfo(LttTrace *t, char* control) +gint getControlFileInfo(LttTrace *t, gchar* control) { - DIR * dir; - struct dirent *entry; - char name[DIR_NAME_SIZE]; + GDir * dir; + const gchar *name; + gchar fullname[DIR_NAME_SIZE]; + GError * error = NULL; - dir = opendir(control); - if(!dir) g_error("Can not open directory: %s\n", control); + dir = g_dir_open(control, 0, &error); - while((entry = readdir(dir)) != NULL){ - if(strcmp(entry->d_name,"facilities") != 0 && - strcmp(entry->d_name,"interrupts") != 0 && - strcmp(entry->d_name,"processes") != 0) continue; + if(error != NULL) { + g_warning("Can not open directory: %s, %s\n", control, error->message); + g_error_free(error); + return -1; + } + + while((name = g_dir_read_name(dir)) != NULL){ + if(strcmp(name,"facilities") != 0 && + strcmp(name,"interrupts") != 0 && + strcmp(name,"processes") != 0) continue; - strcpy(name,control); - strcat(name,entry->d_name); - ltt_tracefile_open_control(t,name); + strcpy(fullname,control); + strcat(fullname,name); + if(ltt_tracefile_open_control(t,fullname)) { + g_dir_close(dir); + return -1; + } } - closedir(dir); + g_dir_close(dir); + return 0; } -void getCpuFileInfo(LttTrace *t, char* cpu) +gint getCpuFileInfo(LttTrace *t, char* cpu) { - DIR * dir; - struct dirent *entry; - char name[DIR_NAME_SIZE]; - - dir = opendir(cpu); - if(!dir) g_error("Can not open directory: %s\n", cpu); - - while((entry = readdir(dir)) != NULL){ - if(strcmp(entry->d_name,".") != 0 && - strcmp(entry->d_name,"..") != 0 && - strcmp(entry->d_name,".svn") != 0){ - strcpy(name,cpu); - strcat(name,entry->d_name); - ltt_tracefile_open_cpu(t,name); + GDir * dir; + const gchar * name; + gchar fullname[DIR_NAME_SIZE]; + GError * error = NULL; + + dir = g_dir_open(cpu, 0, &error); + + if(error != NULL) { + g_warning("Can not open directory: %s, %s\n", cpu, error->message); + g_error_free(error); + return -1; + } + + while((name = g_dir_read_name(dir)) != NULL){ + if(strcmp(name,".svn") != 0){ /* . and .. already excluded */ + strcpy(fullname,cpu); + strcat(fullname,name); + ltt_tracefile_open_cpu(t,fullname); }else continue; } - closedir(dir); + g_dir_close(dir); + return 0; } /***************************************************************************** @@ -366,55 +481,46 @@ void getCpuFileInfo(LttTrace *t, char* cpu) * *When a trace is closed, all the associated facilities, types and fields *are released as well. + */ + + +/**************************************************************************** + * get_absolute_pathname * - * MD : If pathname is already absolute, we do not add current working - * directory to it. + * return the unique pathname in the system + * + * MD : Fixed this function so it uses realpath, dealing well with + * forgotten cases (.. were not used correctly before). * ****************************************************************************/ - -void get_absolute_pathname(const char *pathname, char * abs_pathname) +void get_absolute_pathname(const gchar *pathname, gchar * abs_pathname) { - char * ptr, *ptr1; - size_t size = DIR_NAME_SIZE; abs_pathname[0] = '\0'; - if(pathname[0] == '/') - { - strcat(abs_pathname, pathname); - return; - } - - if(!getcwd(abs_pathname, size)){ - g_warning("Can not get current working directory\n"); - strcat(abs_pathname, pathname); + if ( realpath (pathname, abs_pathname) != NULL) + return; + else + { + /* error, return the original path unmodified */ + strcpy(abs_pathname, pathname); return; } - - strcat(abs_pathname,"/"); - - ptr = (char*)pathname; - ptr1 = ptr + 1; - while(*ptr == '.' && *ptr1 == '.'){ - ptr += 3; - ptr1 = ptr + 1; - } - strcat(abs_pathname,ptr); + return; } -LttTrace *ltt_trace_open(const char *pathname) +LttTrace *ltt_trace_open(const gchar *pathname) { LttTrace * t; LttSystemDescription * sys_description; - char eventdefs[DIR_NAME_SIZE]; - char info[DIR_NAME_SIZE]; - char control[DIR_NAME_SIZE]; - char cpu[DIR_NAME_SIZE]; - char tmp[DIR_NAME_SIZE]; - char abs_path[DIR_NAME_SIZE]; + gchar eventdefs[DIR_NAME_SIZE]; + gchar info[DIR_NAME_SIZE]; + gchar control[DIR_NAME_SIZE]; + gchar cpu[DIR_NAME_SIZE]; + gchar tmp[DIR_NAME_SIZE]; + gchar abs_path[DIR_NAME_SIZE]; gboolean has_slash = FALSE; get_absolute_pathname(pathname, abs_path); - //establish the pathname to different directories if(abs_path[strlen(abs_path)-1] == '/')has_slash = TRUE; strcpy(eventdefs,abs_path); @@ -434,8 +540,8 @@ LttTrace *ltt_trace_open(const char *pathname) strcat(cpu,"cpu/"); //new trace - t = g_new(LttTrace, 1); sys_description = g_new(LttSystemDescription, 1); + t = g_new(LttTrace, 1); t->pathname = g_strdup(abs_path); t->facility_number = 0; t->control_tracefile_number = 0; @@ -444,21 +550,64 @@ LttTrace *ltt_trace_open(const char *pathname) t->control_tracefiles = g_ptr_array_new(); t->per_cpu_tracefiles = g_ptr_array_new(); t->facilities = g_ptr_array_new(); - getDataEndianType(&(t->my_arch_size), &(t->my_arch_endian)); - + //getDataEndianType(&(t->my_arch_size), &(t->my_arch_endian)); + //get system description strcpy(tmp,info); strcat(tmp,"system.xml"); - getSystemInfo(sys_description, tmp); + if(getSystemInfo(sys_description, tmp)) { + g_ptr_array_free(t->facilities, TRUE); + g_ptr_array_free(t->per_cpu_tracefiles, TRUE); + g_ptr_array_free(t->control_tracefiles, TRUE); + g_free(sys_description); + g_free(t->pathname); + g_free(t); + return NULL; + } + + /* Set the reverse byte order between trace and reader */ + if(sys_description->endian == LTT_LITTLE_ENDIAN + && G_BYTE_ORDER != G_LITTLE_ENDIAN) { + t->reverse_byte_order = 1; + } else if(sys_description->endian == LTT_BIG_ENDIAN + && G_BYTE_ORDER != G_BIG_ENDIAN) { + t->reverse_byte_order = 1; + } else t->reverse_byte_order = 0; //get facilities info - getFacilityInfo(t,eventdefs); + if(getFacilityInfo(t,eventdefs)) { + g_ptr_array_free(t->facilities, TRUE); + g_ptr_array_free(t->per_cpu_tracefiles, TRUE); + g_ptr_array_free(t->control_tracefiles, TRUE); + g_free(sys_description); + g_free(t->pathname); + g_free(t); + return NULL; + } //get control tracefile info getControlFileInfo(t,control); + /* + if(getControlFileInfo(t,control)) { + g_ptr_array_free(t->facilities, TRUE); + g_ptr_array_free(t->per_cpu_tracefiles, TRUE); + g_ptr_array_free(t->control_tracefiles, TRUE); + g_free(sys_description); + g_free(t->pathname); + g_free(t); + return NULL; + }*/ // With fatal error //get cpu tracefile info - getCpuFileInfo(t,cpu); + if(getCpuFileInfo(t,cpu)) { + g_ptr_array_free(t->facilities, TRUE); + g_ptr_array_free(t->per_cpu_tracefiles, TRUE); + g_ptr_array_free(t->control_tracefiles, TRUE); + g_free(sys_description); + g_free(t->pathname); + g_free(t); + return NULL; + } return t; } @@ -481,7 +630,7 @@ LttTrace *ltt_trace_copy(LttTrace *self) void ltt_trace_close(LttTrace *t) { - int i; + unsigned int i; LttTracefile * tf; LttFacility * f; @@ -564,7 +713,7 @@ LttFacility *ltt_trace_facility_get(LttTrace *t, unsigned i) unsigned ltt_trace_facility_find(LttTrace *t, char *name, unsigned *position) { - int i, count=0; + unsigned int i, count=0; LttFacility * f; for(i=0;ifacility_number;i++){ f = (LttFacility*)g_ptr_array_index(t->facilities, i); @@ -584,36 +733,56 @@ unsigned ltt_trace_facility_find(LttTrace *t, char *name, unsigned *position) unsigned ltt_trace_eventtype_number(LttTrace *t) { - int i; + unsigned int i; unsigned count = 0; + unsigned int num = t->facility_number; LttFacility * f; - for(i=0;ifacility_number;i++){ + + for(i=0;ifacilities, i); count += f->event_number; } return count; } +/* FIXME : performances could be improved with a better design for this + * function : sequential search through a container has never been the + * best on the critical path. */ LttFacility * ltt_trace_facility_by_id(LttTrace * trace, unsigned id) { - LttFacility * facility; - int i; - for(i=0;ifacility_number;i++){ - facility = (LttFacility*) g_ptr_array_index(trace->facilities,i); - if(id >= facility->base_id && - id < facility->base_id + facility->event_number) + LttFacility * facility = NULL; + unsigned int i; + unsigned int num = trace->facility_number; + GPtrArray *facilities = trace->facilities; + + for(i=0;unlikely(ibase_id; + + if(likely(id >= base_id && + id < base_id + iter_facility->event_number)) { + facility = iter_facility; break; + } else { + i++; + } } - if(i==trace->facility_number) return NULL; - else return facility; + + return facility; } LttEventType *ltt_trace_eventtype_get(LttTrace *t, unsigned evId) { + LttEventType *event_type; + LttFacility * f; f = ltt_trace_facility_by_id(t,evId); - if(!f) return NULL; - return f->events[evId - f->base_id]; + + if(unlikely(!f)) event_type = NULL; + else event_type = f->events[evId - f->base_id]; + + return event_type; } /***************************************************************************** @@ -638,10 +807,10 @@ unsigned ltt_trace_per_cpu_tracefile_number(LttTrace *t) *and a negative value otherwise. ****************************************************************************/ -int ltt_trace_control_tracefile_find(LttTrace *t, char *name) +int ltt_trace_control_tracefile_find(LttTrace *t, const gchar *name) { LttTracefile * tracefile; - int i; + unsigned int i; for(i=0;icontrol_tracefile_number;i++){ tracefile = (LttTracefile*)g_ptr_array_index(t->control_tracefiles, i); if(strcmp(tracefile->name, name)==0)break; @@ -650,17 +819,19 @@ int ltt_trace_control_tracefile_find(LttTrace *t, char *name) return i; } -int ltt_trace_per_cpu_tracefile_find(LttTrace *t, unsigned i) +/* not really useful. We just have to know that cpu tracefiles + * comes before control tracefiles. + */ +int ltt_trace_per_cpu_tracefile_find(LttTrace *t, const gchar *name) { LttTracefile * tracefile; - int j, name; - for(j=0;jper_cpu_tracefile_number;j++){ - tracefile = (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, j); - name = atoi(tracefile->name); - if(name == (int)i)break; + unsigned int i; + for(i=0;iper_cpu_tracefile_number;i++){ + tracefile = (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, i); + if(strcmp(tracefile->name, name)==0)break; } - if(j == t->per_cpu_tracefile_number) return -1; - return j; + if(i == t->per_cpu_tracefile_number) return -1; + return i; } /***************************************************************************** @@ -684,15 +855,15 @@ LttTracefile *ltt_trace_per_cpu_tracefile_get(LttTrace *t, unsigned i) void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end) { LttTime startSmall, startTmp, endBig, endTmp; - int i, j=0; + unsigned int i, j=0; LttTracefile * tf; for(i=0;icontrol_tracefile_number;i++){ tf = g_ptr_array_index(t->control_tracefiles, i); readBlock(tf,1); - startTmp = tf->a_block_start->time; + startTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_start->time); readBlock(tf,tf->block_number); - endTmp = tf->a_block_end->time; + endTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_end->time); if(i==0){ startSmall = startTmp; endBig = endTmp; @@ -706,9 +877,9 @@ void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end) for(i=0;iper_cpu_tracefile_number;i++){ tf = g_ptr_array_index(t->per_cpu_tracefiles, i); readBlock(tf,1); - startTmp = tf->a_block_start->time; + startTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_start->time); readBlock(tf,tf->block_number); - endTmp = tf->a_block_end->time; + endTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_end->time); if(j == 0 && i==0){ startSmall = startTmp; endBig = endTmp; @@ -718,8 +889,8 @@ void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end) if(ltt_time_compare(endBig,endTmp) < 0) endBig = endTmp; } - *start = startSmall; - *end = endBig; + if(start != NULL) *start = startSmall; + if(end != NULL) *end = endBig; } @@ -760,22 +931,26 @@ void ltt_tracefile_find_time_block(LttTracefile *t, LttTime time, if(err) g_error("Can not read tracefile: %s\n", t->name); if(start_block == end_block)return; - tailTime = ltt_time_compare(t->a_block_end->time, time); + tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), time); if(tailTime >= 0) return; err=readBlock(t,end_block); if(err) g_error("Can not read tracefile: %s\n", t->name); if(start_block+1 == end_block)return; - headTime = ltt_time_compare(t->a_block_start->time, time); + headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_start->time), time); if(headTime <= 0 ) return; tmp_block = (end_block + start_block)/2; err=readBlock(t,tmp_block); if(err) g_error("Can not read tracefile: %s\n", t->name); - headTime = ltt_time_compare(t->a_block_start->time, time); - tailTime = ltt_time_compare(t->a_block_end->time, time); + headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_start->time), time); + tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), time); if(headTime <= 0 && tailTime >= 0) return; if(headTime > 0){ @@ -800,14 +975,17 @@ void ltt_tracefile_backward_find_time_block(LttTracefile *t, LttTime time) int t_time, h_time, err; err=readBlock(t,t->which_block-1); if(err) g_error("Can not read tracefile: %s\n", t->name); - h_time = ltt_time_compare(t->a_block_start->time, time); - t_time = ltt_time_compare(t->a_block_end->time, time); + h_time = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_start->time), time); + t_time = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), time); if(h_time == 0){ int tmp; if(t->which_block == 1) return; err=readBlock(t,t->which_block-1); if(err) g_error("Can not read tracefile: %s\n", t->name); - tmp = ltt_time_compare(t->a_block_end->time, time); + tmp = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), time); if(tmp == 0) return ltt_tracefile_seek_time(t, time); err=readBlock(t,t->which_block+1); if(err) g_error("Can not read tracefile: %s\n", t->name); @@ -825,16 +1003,20 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) { int err; LttTime lttTime; - int headTime = ltt_time_compare(t->a_block_start->time, time); - int tailTime = ltt_time_compare(t->a_block_end->time, time); - LttEvent * ev; + int headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_start->time), time); + int tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), time); + LttEvent ev; if(headTime < 0 && tailTime > 0){ - if(ltt_time_compare(t->a_block_end->time, t->current_event_time) !=0) { + if(ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order, + &t->a_block_end->time), + t->current_event_time) !=0) { lttTime = getEventTime(t); err = ltt_time_compare(lttTime, time); if(err > 0){ - if(t->which_event==2 || (&t->prev_event_time,&time)<0){ + if(t->which_event==2 || ltt_time_compare(t->prev_event_time,time)<0){ return; }else{ updateTracefile(t); @@ -842,8 +1024,7 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) } }else if(err < 0){ while(1){ - ev = ltt_tracefile_read(t); - if(ev == NULL){ + if(ltt_tracefile_read(t,&ev) == NULL) { g_print("End of file\n"); return; } @@ -889,26 +1070,53 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) /***************************************************************************** * Seek to the first event with position equal or larger to ep + * + * Modified by Mathieu Desnoyers to used faster offset position instead of + * re-reading the whole buffer. ****************************************************************************/ -void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep) +void ltt_tracefile_seek_position(LttTracefile *t, const LttEventPosition *ep) { //if we are at the right place, just return - if(t->which_block == ep->block_num && t->which_event == ep->event_num) + if(likely(t->which_block == ep->block_num && t->which_event == ep->event_num)) return; - if(t->which_block == ep->block_num) updateTracefile(t); + if(likely(t->which_block == ep->block_num)) updateTracefile(t); else readBlock(t,ep->block_num); + //event offset is available + if(likely(ep->old_position)){ + int err; - //event offset is availiable - if(ep->old_position){ - t->cur_heart_beat_number = ep->heart_beat_number; + t->which_event = ep->event_num; t->cur_event_pos = t->buffer + ep->event_offset; + t->prev_event_time = ep->event_time; + t->current_event_time = ep->event_time; + t->cur_heart_beat_number = ep->heart_beat_number; + t->cur_cycle_count = ep->event_cycle_count; + + /* This is a workaround for fast position seek */ + t->last_event_pos = ep->last_event_pos; + t->prev_block_end_time = ep->prev_block_end_time; + t->prev_event_time = ep->prev_event_time; + t->pre_cycle_count = ep->pre_cycle_count; + t->count = ep->count; + t->overflow_nsec = ep->overflow_nsec; + t->last_heartbeat = ep->last_heartbeat; + /* end of workaround */ + + //update the fields of the current event and go to the next event + err = skipEvent(t); + if(unlikely(err == ERANGE)) g_error("event id is out of range\n"); + return; } - //only block number and event index are availiable - while(t->which_event < ep->event_num) ltt_tracefile_read(t); + //only block number and event index are available + //MD: warning : this is slow! + g_warning("using slow O(n) tracefile seek position"); + + LttEvent event; + while(likely(t->which_event < ep->event_num)) ltt_tracefile_read(t, &event); return; } @@ -922,41 +1130,52 @@ void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep) * LttEvent * : an event to be processed ****************************************************************************/ -LttEvent *ltt_tracefile_read(LttTracefile *t) +LttEvent *ltt_tracefile_read(LttTracefile *t, LttEvent *event) { - LttEvent * lttEvent = &t->an_event; int err; - if(t->cur_event_pos == t->buffer + t->block_size){ - if(t->which_block == t->block_number){ + if(unlikely(t->cur_event_pos == t->buffer + t->block_size)){ + if(unlikely(t->which_block == t->block_number)){ return NULL; } err = readBlock(t, t->which_block + 1); - if(err)g_error("Can not read tracefile"); + if(unlikely(err))g_error("Can not read tracefile"); } - lttEvent->event_id = (int)(*(guint16 *)(t->cur_event_pos)); - if(lttEvent->event_id == TRACE_TIME_HEARTBEAT) + event->event_id = ltt_get_uint16(t->trace->reverse_byte_order, t->cur_event_pos); + if(unlikely(event->event_id == TRACE_TIME_HEARTBEAT)) t->cur_heart_beat_number++; t->prev_event_time = t->current_event_time; // t->current_event_time = getEventTime(t); - lttEvent->time_delta = *(guint32 *)(t->cur_event_pos + EVENT_ID_SIZE); - lttEvent->event_time = t->current_event_time; + event->time_delta = ltt_get_uint32(t->trace->reverse_byte_order, t->cur_event_pos + EVENT_ID_SIZE); + event->event_time = t->current_event_time; + event->event_cycle_count = t->cur_cycle_count; + + event->tracefile = t; + event->data = t->cur_event_pos + EVENT_HEADER_SIZE; + event->which_block = t->which_block; + event->which_event = t->which_event; + + /* This is a workaround for fast position seek */ + event->last_event_pos = t->last_event_pos; + event->prev_block_end_time = t->prev_block_end_time; + event->prev_event_time = t->prev_event_time; + event->pre_cycle_count = t->pre_cycle_count; + event->count = t->count; + event->overflow_nsec = t->overflow_nsec; + event->last_heartbeat = t->last_heartbeat; + + /* end of workaround */ + - lttEvent->tracefile = t; - lttEvent->data = t->cur_event_pos + EVENT_HEADER_SIZE; - lttEvent->which_block = t->which_block; - lttEvent->which_event = t->which_event; //update the fields of the current event and go to the next event err = skipEvent(t); - if(err == ERANGE) g_error("event id is out of range\n"); - - lttEvent->event_cycle_count = t->cur_cycle_count; + if(unlikely(err == ERANGE)) g_error("event id is out of range\n"); - return lttEvent; + return event; } /**************************************************************************** @@ -974,15 +1193,20 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) int readFile(int fd, void * buf, size_t size, char * mesg) { - ssize_t nbBytes; - nbBytes = read(fd, buf, size); - if(nbBytes != size){ - printf("%s\n",mesg); + ssize_t nbBytes = read(fd, buf, size); + + if((size_t)nbBytes != size) { + if(nbBytes < 0) { + perror("Error in readFile : "); + } else { + g_warning("%s",mesg); + } return EIO; } return 0; } + /**************************************************************************** *Function name * readBlock : read a block from the file @@ -1000,9 +1224,14 @@ int readBlock(LttTracefile * tf, int whichBlock) off_t nbBytes; guint32 lostSize; - if(whichBlock - tf->which_block == 1 && tf->which_block != 0){ - tf->prev_block_end_time = tf->a_block_end->time; - tf->prev_event_time = tf->a_block_end->time; + /* same block already opened requested */ + if((guint)whichBlock == tf->which_block) return 0; + + if(likely(whichBlock - tf->which_block == 1 && tf->which_block != 0)){ + tf->prev_block_end_time = ltt_get_time(tf->trace->reverse_byte_order, + &tf->a_block_end->time); + tf->prev_event_time = ltt_get_time(tf->trace->reverse_byte_order, + &tf->a_block_end->time); }else{ tf->prev_block_end_time.tv_sec = 0; tf->prev_block_end_time.tv_nsec = 0; @@ -1011,24 +1240,38 @@ int readBlock(LttTracefile * tf, int whichBlock) } nbBytes=lseek(tf->fd,(off_t)((whichBlock-1)*tf->block_size), SEEK_SET); - if(nbBytes == -1) return EINVAL; + if(unlikely(nbBytes == -1)) return EINVAL; - if(readFile(tf->fd,tf->buffer,tf->block_size,"Unable to read a block")) + if(unlikely(readFile(tf->fd,tf->buffer,tf->block_size,"Unable to read a block"))) return EIO; tf->a_block_start=(BlockStart *) (tf->buffer + EVENT_HEADER_SIZE); lostSize = *(guint32 *)(tf->buffer + tf->block_size - sizeof(guint32)); - tf->a_block_end=(BlockEnd *)(tf->buffer + tf->block_size - - lostSize + EVENT_HEADER_SIZE); - tf->last_event_pos = tf->buffer + tf->block_size - lostSize; + tf->a_block_end=(BlockEnd *)(tf->buffer + tf->block_size + - sizeof(guint32) - lostSize - sizeof(BlockEnd)); + tf->last_event_pos = tf->buffer + tf->block_size - + sizeof(guint32) - lostSize + - sizeof(BlockEnd) - EVENT_HEADER_SIZE; tf->which_block = whichBlock; tf->which_event = 1; tf->cur_event_pos = tf->buffer;//the beginning of the block, block start ev tf->cur_heart_beat_number = 0; + tf->last_heartbeat = NULL; + + /* read the whole block to precalculate total of cycles in it */ + tf->count = 0; + tf->pre_cycle_count = 0; + tf->cur_cycle_count = ltt_get_uint32(tf->trace->reverse_byte_order, tf->cur_event_pos + EVENT_ID_SIZE); getCyclePerNsec(tf); + tf->overflow_nsec = + (-((double) + (ltt_get_uint64(tf->trace->reverse_byte_order, + &tf->a_block_start->cycle_count)&0xFFFFFFFF)) + * tf->nsec_per_cycle); + tf->current_event_time = getEventTime(tf); return 0; @@ -1051,6 +1294,13 @@ void updateTracefile(LttTracefile * tf) tf->prev_event_time.tv_sec = 0; tf->prev_event_time.tv_nsec = 0; + tf->count = 0; + + tf->overflow_nsec = + (-((double)ltt_get_uint64(tf->trace->reverse_byte_order, + &tf->a_block_start->cycle_count)) + * tf->nsec_per_cycle); + } /***************************************************************************** @@ -1065,23 +1315,23 @@ void updateTracefile(LttTracefile * tf) int skipEvent(LttTracefile * t) { - int evId, err; + int evId; void * evData; LttEventType * evT; LttField * rootFld; - evId = (int)(*(guint16 *)(t->cur_event_pos)); + evId = ltt_get_uint16(t->trace->reverse_byte_order, t->cur_event_pos); evData = t->cur_event_pos + EVENT_HEADER_SIZE; evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId); - if(evT) rootFld = evT->root_field; + if(likely(evT)) rootFld = evT->root_field; else return ERANGE; - if(rootFld){ + if(likely(rootFld)){ //event has string/sequence or the last event is not the same event - if((evT->latest_block!=t->which_block || evT->latest_event!=t->which_event) - && rootFld->field_fixed == 0){ + if(likely((evT->latest_block!=t->which_block || evT->latest_event!=t->which_event) + && rootFld->field_fixed == 0)){ setFieldsOffset(t, evT, evData, t->trace); } t->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_size; @@ -1091,9 +1341,11 @@ int skipEvent(LttTracefile * t) evT->latest_event = t->which_event; //the next event is in the next block - if(evId == TRACE_BLOCK_END){ + if(unlikely(evId == TRACE_BLOCK_END)){ t->cur_event_pos = t->buffer + t->block_size; }else{ + t->cur_cycle_count = ltt_get_uint32(t->trace->reverse_byte_order, + t->cur_event_pos + EVENT_ID_SIZE); t->which_event++; t->current_event_time = getEventTime(t); } @@ -1101,9 +1353,12 @@ int skipEvent(LttTracefile * t) return 0; } + /***************************************************************************** *Function name * getCyclePerNsec : calculate cycles per nsec for current block + * MD: should have tracefile_read the whole block, so we know the + * total of cycles in it before being called. *Input Params * t : tracefile ****************************************************************************/ @@ -1111,80 +1366,96 @@ int skipEvent(LttTracefile * t) void getCyclePerNsec(LttTracefile * t) { LttTime lBufTotalTime; /* Total time for this buffer */ - LttCycleCount lBufTotalNSec; /* Total time for this buffer in nsecs */ + 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(t->a_block_end->time, t->a_block_start->time); + lBufTotalTime = ltt_time_sub( + ltt_get_time(t->trace->reverse_byte_order, &t->a_block_end->time), + ltt_get_time(t->trace->reverse_byte_order, &t->a_block_start->time)); /* Calculate the total cycles for this bufffer */ - lBufTotalCycle = t->a_block_end->cycle_count; - lBufTotalCycle -= t->a_block_start->cycle_count; + lBufTotalCycle = ltt_get_uint64(t->trace->reverse_byte_order, + &t->a_block_end->cycle_count); + lBufTotalCycle -= ltt_get_uint64(t->trace->reverse_byte_order, + &t->a_block_start->cycle_count); - /* Convert the total time to nsecs */ - lBufTotalNSec = lBufTotalTime.tv_sec; - lBufTotalNSec *= NANOSECONDS_PER_SECOND; - lBufTotalNSec += lBufTotalTime.tv_nsec; + /* Convert the total time to double */ + lBufTotalNSec = ltt_time_to_double(lBufTotalTime); - t->cycle_per_nsec = (double)lBufTotalCycle / (double)lBufTotalNSec; + t->nsec_per_cycle = (double)lBufTotalNSec / (double)lBufTotalCycle; + + /* Pre-multiply one overflow (2^32 cycles) by nsec_per_cycle */ + t->one_overflow_nsec = t->nsec_per_cycle * (double)0x100000000ULL; + } /**************************************************************************** *Function name * getEventTime : obtain the time of an event + * NOTE : this function _really_ is on critical path. *Input params * tf : tracefile *Return value * LttTime : the time of the event ****************************************************************************/ -LttTime getEventTime(LttTracefile * tf) +static inline LttTime getEventTime(LttTracefile * tf) { LttTime time; LttCycleCount cycle_count; // cycle count for the current event - LttCycleCount lEventTotalCycle; // Total cycles from start for event - double lEventNSec; // Total usecs from start for event + //LttCycleCount lEventTotalCycle; // Total cycles from start for event + gint64 lEventNSec; // Total nsecs from start for event LttTime lTimeOffset; // Time offset in struct LttTime guint16 evId; - gint64 nanoSec, tmpCycleCount = (((guint64)1)<<32); - - evId = *(guint16 *)tf->cur_event_pos; - if(evId == TRACE_BLOCK_START){ - tf->count = 0; - tf->pre_cycle_count = 0; - tf->cur_cycle_count = tf->a_block_start->cycle_count; - return tf->a_block_start->time; - }else if(evId == TRACE_BLOCK_END){ - tf->count = 0; - tf->pre_cycle_count = 0; - tf->cur_cycle_count = tf->a_block_end->cycle_count; - return tf->a_block_end->time; - } - - // Calculate total time in cycles from start of buffer for this event - cycle_count = (LttCycleCount)*(guint32 *)(tf->cur_event_pos + EVENT_ID_SIZE); - - if(cycle_count < tf->pre_cycle_count)tf->count++; - tf->pre_cycle_count = cycle_count; - cycle_count += tmpCycleCount * tf->count; - - if(tf->cur_heart_beat_number > tf->count) - cycle_count += tmpCycleCount * (tf->cur_heart_beat_number - tf->count); - tf->cur_cycle_count = cycle_count; + evId = ltt_get_uint16(tf->trace->reverse_byte_order, + tf->cur_event_pos); + + cycle_count = ltt_get_uint32(tf->trace->reverse_byte_order, + tf->cur_event_pos + EVENT_ID_SIZE); - lEventTotalCycle = cycle_count; - lEventTotalCycle -= tf->a_block_start->cycle_count; + gboolean comp_count = cycle_count < tf->pre_cycle_count; - // Convert it to nsecs - lEventNSec = lEventTotalCycle / tf->cycle_per_nsec; - nanoSec = lEventNSec; + tf->pre_cycle_count = cycle_count; + + if(unlikely(comp_count)) { + /* Overflow */ + tf->overflow_nsec += tf->one_overflow_nsec; + tf->count++; //increment overflow count + } - // Determine offset in struct LttTime - lTimeOffset.tv_nsec = nanoSec % NANOSECONDS_PER_SECOND; - lTimeOffset.tv_sec = nanoSec / NANOSECONDS_PER_SECOND; + if(unlikely(evId == TRACE_BLOCK_START)) { + lEventNSec = 0; + } else if(unlikely(evId == TRACE_BLOCK_END)) { + lEventNSec = ((double) + (ltt_get_uint64(tf->trace->reverse_byte_order, + &tf->a_block_end->cycle_count) + - ltt_get_uint64(tf->trace->reverse_byte_order, + &tf->a_block_start->cycle_count)) + * tf->nsec_per_cycle); + } +#if 0 + /* If you want to make heart beat a special case and use their own 64 bits + * TSC, activate this. + */ + else if(unlikely(evId == TRACE_TIME_HEARTBEAT)) { + + tf->last_heartbeat = (TimeHeartbeat*)(tf->cur_event_pos+EVENT_HEADER_SIZE); + lEventNSec = ((double)(tf->last_heartbeat->cycle_count + - tf->a_block_start->cycle_count) + * tf->nsec_per_cycle); + } +#endif //0 + else { + lEventNSec = (gint64)((double)cycle_count * tf->nsec_per_cycle) + +tf->overflow_nsec; + } - time = ltt_time_add(tf->a_block_start->time, lTimeOffset); + lTimeOffset = ltt_time_from_uint64(lEventNSec); + + time = ltt_time_add(ltt_get_time(tf->trace->reverse_byte_order, + &tf->a_block_start->time), lTimeOffset); return time; } @@ -1203,7 +1474,7 @@ void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace* t) LttField * rootFld = evT->root_field; // rootFld->base_address = evD; - if(rootFld) + if(likely(rootFld)) rootFld->field_size = getFieldtypeSize(tf, evT, 0,0,rootFld, evD,t); } @@ -1221,119 +1492,159 @@ void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace* t) * int : size of the field ****************************************************************************/ -int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, - int offsetParent, LttField * fld, void *evD, LttTrace *trace) +static inline gint getFieldtypeSize(LttTracefile * t, + LttEventType * evT, gint offsetRoot, + gint offsetParent, LttField * fld, void *evD, LttTrace *trace) { - int size, size1, element_number, i, offset1, offset2; + gint size, size1, element_number, i, offset1, offset2; LttType * type = fld->field_type; - if(t){ - if(evT->latest_block==t->which_block && evT->latest_event==t->which_event){ - return fld->field_size; - } - } - - if(fld->field_fixed == 1){ - if(fld == evT->root_field) return fld->field_size; - } - - if(type->type_class != LTT_STRUCT && type->type_class != LTT_ARRAY && - type->type_class != LTT_SEQUENCE && type->type_class != LTT_STRING){ - if(fld->field_fixed == -1){ - size = (int) ltt_type_size(trace, type); - fld->field_fixed = 1; - }else size = fld->field_size; - - }else if(type->type_class == LTT_ARRAY){ - element_number = (int) type->element_number; - if(fld->field_fixed == -1){ - size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace); - 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, trace); - } - }else size = fld->field_size; - - }else if(type->type_class == LTT_SEQUENCE){ - size1 = (int) ltt_type_size(trace, type); - if(fld->field_fixed == -1){ - fld->sequ_number_size = size1; - fld->field_fixed = 0; - size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace); - fld->element_size = size; - }else{//0: sequence - element_number = getIntNumber(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, trace); - } + if(unlikely(t && evT->latest_block==t->which_block && + evT->latest_event==t->which_event)){ + size = fld->field_size; + goto end_getFieldtypeSize; + } else { + /* 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; } - size += size1; } - }else if(type->type_class == LTT_STRING){ - size = 0; - if(fld->field_fixed == -1){ - fld->field_fixed = 0; - }else{//0: string - size = strlen((char*)evD) + 1; //include end : '\0' + /* 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(t, evT, offsetRoot, + 0,fld->child[0], NULL, trace); + 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, trace); + } + }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(trace, type); + if(fld->field_fixed == -1){ + fld->sequ_number_size = size1; + fld->field_fixed = 0; + size = getFieldtypeSize(t, evT, offsetRoot, + 0,fld->child[0], NULL, trace); + fld->element_size = size; + }else{//0: sequence + element_number = getIntNumber(t->trace->reverse_byte_order,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, trace); + } + } + 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, trace); + 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, trace); + 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(trace, 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; } - - }else if(type->type_class == LTT_STRUCT){ - element_number = (int) type->element_number; - size = 0; - if(fld->field_fixed == -1){ - offset1 = offsetRoot; - offset2 = 0; - for(i=0;ichild[i], NULL, trace); - if(size1 > 0 && size >= 0){ - size += size1; - if(offset1 >= 0) offset1 += size1; - offset2 += size1; - }else{ - size = -1; - offset1 = -1; - offset2 = -1; - } - } - if(size == -1){ - fld->field_fixed = 0; - size = 0; - }else fld->field_fixed = 1; - }else if(fld->field_fixed == 0){ - offset1 = offsetRoot; - offset2 = 0; - for(i=0;ichild[i],evD+offset2, trace); - offset1 += size; - offset2 += size; - } - size = offset2; - }else size = fld->field_size; } fld->offset_root = offsetRoot; fld->offset_parent = offsetParent; - if(!evD){ - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - } fld->field_size = size; +end_getFieldtypeSize: + return size; } @@ -1345,20 +1656,26 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, * size : the size of the integer * evD : the event data *Return value - * int : an integer + * gint64 : a 64 bits integer ****************************************************************************/ -int getIntNumber(int size, void *evD) +gint64 getIntNumber(gboolean reverse_byte_order, int size, void *evD) { gint64 i; - if(size == 1) i = *(gint8 *)evD; - else if(size == 2) i = *(gint16 *)evD; - else if(size == 4) i = *(gint32 *)evD; - else if(size == 8) i = *(gint64 *)evD; - - return (int) i; -} + switch(size) { + case 1: i = *((gint8*)evD); break; + case 2: i = ltt_get_int16(reverse_byte_order, evD); break; + case 4: i = ltt_get_int32(reverse_byte_order, evD); break; + case 8: i = ltt_get_int64(reverse_byte_order, evD); break; + default: i = ltt_get_int64(reverse_byte_order, evD); + g_critical("getIntNumber : integer size %d unknown", size); + break; + } + + return i; +} +#if 0 /***************************************************************************** *Function name * getDataEndianType : get the data type size and endian type of the local @@ -1387,7 +1704,7 @@ void getDataEndianType(LttArchSize * size, LttArchEndian * endian) *size = LTT_ILP64; else *size = LTT_UNKNOWN; } - +#endif //0 /* get the node name of the system */ char * ltt_trace_system_description_node_name (LttSystemDescription * s) @@ -1419,3 +1736,19 @@ LttTime ltt_trace_system_description_trace_start_time(LttSystemDescription *s) return s->trace_start; } + +LttTracefile *ltt_tracefile_new() +{ + return g_new(LttTracefile, 1); +} + +void ltt_tracefile_destroy(LttTracefile *tf) +{ + g_free(tf); +} + +void ltt_tracefile_copy(LttTracefile *dest, const LttTracefile *src) +{ + *dest = *src; +} +