X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=fdc37919dc0a2aeddea8c3ad86eb91f076c9e0af;hb=e9b343573dc34da24ff87fd4cfc6f926aeeea7c2;hp=97ac57cc35f260c6c27af23e15d217f56725524e;hpb=a8c0f09de06b94e9420d286e1541c39092fff434;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 97ac57cc..fdc37919 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -1,3 +1,21 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 Xiangxiu 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 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. + */ + #include #include #include @@ -36,6 +54,85 @@ void updateTracefile(LttTracefile * tf); int skipEvent(LttTracefile * t); +/* Functions to parse system.xml file (using glib xml parser) */ +static void parser_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error) +{ + int i=0; + LttSystemDescription* des = (LttSystemDescription* )user_data; + if(strcmp("system", element_name)){ + g_warning("This is not system.xml file\n"); + exit(1); + } + + while(attribute_names[i]){ + if(strcmp("node_name", attribute_names[i])==0){ + des->node_name = g_strdup(attribute_values[i]); + }else if(strcmp("domainname", attribute_names[i])==0){ + des->domain_name = g_strdup(attribute_values[i]); + }else if(strcmp("cpu", attribute_names[i])==0){ + des->nb_cpu = atoi(attribute_values[i]); + }else if(strcmp("arch_size", attribute_names[i])==0){ + if(strcmp(attribute_values[i],"LP32") == 0) des->size = LTT_LP32; + else if(strcmp(attribute_values[i],"ILP32") == 0) des->size = LTT_ILP32; + else if(strcmp(attribute_values[i],"LP64") == 0) des->size = LTT_LP64; + else if(strcmp(attribute_values[i],"ILP64") == 0) des->size = LTT_ILP64; + else if(strcmp(attribute_values[i],"UNKNOWN") == 0) des->size = LTT_UNKNOWN; + }else if(strcmp("endian", attribute_names[i])==0){ + if(strcmp(attribute_values[i],"LITTLE_ENDIAN") == 0) + des->endian = LTT_LITTLE_ENDIAN; + else if(strcmp(attribute_values[i],"BIG_ENDIAN") == 0) + des->endian = LTT_BIG_ENDIAN; + }else if(strcmp("kernel_name", attribute_names[i])==0){ + des->kernel_name = g_strdup(attribute_values[i]); + }else if(strcmp("kernel_release", attribute_names[i])==0){ + des->kernel_release = g_strdup(attribute_values[i]); + }else if(strcmp("kernel_version", attribute_names[i])==0){ + des->kernel_version = g_strdup(attribute_values[i]); + }else if(strcmp("machine", attribute_names[i])==0){ + des->machine = g_strdup(attribute_values[i]); + }else if(strcmp("processor", attribute_names[i])==0){ + des->processor = g_strdup(attribute_values[i]); + }else if(strcmp("hardware_platform", attribute_names[i])==0){ + des->hardware_platform = g_strdup(attribute_values[i]); + }else if(strcmp("operating_system", attribute_names[i])==0){ + des->operating_system = g_strdup(attribute_values[i]); + }else if(strcmp("ltt_major_version", attribute_names[i])==0){ + des->ltt_major_version = atoi(attribute_values[i]); + }else if(strcmp("ltt_minor_version", attribute_names[i])==0){ + des->ltt_minor_version = atoi(attribute_values[i]); + }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); + } + i++; + } +} + +static void parser_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error) +{ +} + +static void parser_characters (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) +{ + LttSystemDescription* des = (LttSystemDescription* )user_data; + des->description = g_strdup(text); +} + + /***************************************************************************** *Function name * ltt_tracefile_open : open a trace file, construct a LttTracefile @@ -173,147 +270,33 @@ void ltt_tracefile_close(LttTracefile *t) void getSystemInfo(LttSystemDescription* des, char * pathname) { FILE * fp; - int i; - int entry_number = 15; char buf[DIR_NAME_SIZE]; char description[4*DIR_NAME_SIZE]; - char * ptr; + + GMarkupParseContext * context; + GError * error; + GMarkupParser markup_parser = + { + parser_start_element, + parser_end_element, + parser_characters, + NULL, /* passthrough */ + NULL /* error */ + }; fp = fopen(pathname,"r"); if(!fp){ g_error("Can not open file : %s\n", pathname); } - while(fgets(buf,DIR_NAME_SIZE, fp)!= NULL){ - ptr = buf; - while(isspace(*ptr)) ptr++; - if(strlen(ptr) == 0) continue; - break; - } + context = g_markup_parse_context_new(&markup_parser, 0, des,NULL); - if(strlen(ptr) == 0) g_error("Not a valid file: %s\n", pathname); - if(strncmp("node_name = g_strdup(ptr+10); - break; - case 1: - if(strncmp("domainname=",ptr,11)!=0) - g_error("Not a valid file: %s\n", pathname); - des->domain_name = g_strdup(ptr+11); - break; - case 2: - if(strncmp("cpu=",ptr,4)!=0) - g_error("Not a valid file: %s\n", pathname); - des->nb_cpu = (unsigned)atoi(ptr+4); - break; - case 3: - if(strncmp("arch_size=",ptr,10)!=0) - g_error("Not a valid file: %s\n", pathname); - if(strcmp(ptr+10,"\"LP32\"") == 0) des->size = LTT_LP32; - else if(strcmp(ptr+10,"\"ILP32\"") == 0) des->size = LTT_ILP32; - else if(strcmp(ptr+10,"\"LP64\"") == 0) des->size = LTT_LP64; - else if(strcmp(ptr+10,"\"ILP64\"") == 0) des->size = LTT_ILP64; - else if(strcmp(ptr+10,"\"UNKNOWN\"") == 0) des->size = LTT_UNKNOWN; - break; - case 4: - if(strncmp("endian=",ptr,7)!=0) - g_error("Not a valid file: %s\n", pathname); - if(strcmp(ptr+7,"\"LITTLE_ENDIAN\"") == 0) - des->endian = LTT_LITTLE_ENDIAN; - else if(strcmp(ptr+7,"\"BIG_ENDIAN\"") == 0) - des->endian = LTT_BIG_ENDIAN; - break; - case 5: - if(strncmp("kernel_name=",ptr,12)!=0) - g_error("Not a valid file: %s\n", pathname); - des->kernel_name = g_strdup(ptr+12); - break; - case 6: - if(strncmp("kernel_release=",ptr,15)!=0) - g_error("Not a valid file: %s\n", pathname); - des->kernel_release = g_strdup(ptr+15); - break; - case 7: - if(strncmp("kernel_version=",ptr,15)!=0) - g_error("Not a valid file: %s\n", pathname); - des->kernel_version = g_strdup(ptr+15); - break; - case 8: - if(strncmp("machine=",ptr,8)!=0) - g_error("Not a valid file: %s\n", pathname); - des->machine = g_strdup(ptr+8); - break; - case 9: - if(strncmp("processor=",ptr,10)!=0) - g_error("Not a valid file: %s\n", pathname); - des->processor = g_strdup(ptr+10); - break; - case 10: - if(strncmp("hardware_platform=",ptr,18)!=0) - g_error("Not a valid file: %s\n", pathname); - des->hardware_platform = g_strdup(ptr+18); - break; - case 11: - if(strncmp("operating_system=",ptr,17)!=0) - g_error("Not a valid file: %s\n", pathname); - des->operating_system = g_strdup(ptr+17); - break; - case 12: - if(strncmp("ltt_major_version=",ptr,18)!=0) - g_error("Not a valid file: %s\n", pathname); - ptr += 18; - // ptr++;//skip begining " - // ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " - des->ltt_major_version = (unsigned)atoi(ptr); - break; - case 13: - if(strncmp("ltt_minor_version=",ptr,18)!=0) - g_error("Not a valid file: %s\n", pathname); - ptr += 18; - // ptr++;//skip begining " - // ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " - des->ltt_minor_version = (unsigned)atoi(ptr); - break; - case 14: - if(strncmp("ltt_block_size=",ptr,15)!=0) - g_error("Not a valid file: %s\n", pathname); - ptr += 15; - // ptr++;//skip begining " - // ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " - des->ltt_block_size = (unsigned)atoi(ptr); - break; - default: - g_error("Not a valid file: %s\n", pathname); - } - } - - //get description - description[0] = '\0'; - if(fgets(buf,DIR_NAME_SIZE, fp)== NULL) - g_error("Not a valid file: %s\n", pathname); - ptr = buf; - while(isspace(*ptr)) ptr++; - if(*ptr != '>') g_error("Not a valid file: %s\n", pathname); - while((ptr=fgets(buf,DIR_NAME_SIZE, fp))!= NULL){ - ptr = buf; - while(isspace(*ptr)) ptr++; - if(strncmp("",ptr,9) == 0 )break; - strcat(description, buf); + 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); + } } - if(!ptr)g_error("Not a valid file: %s\n", pathname); - if(description[0] = '\0')des->description = NULL; - des->description = g_strdup(description); - fclose(fp); } @@ -384,7 +367,8 @@ void getCpuFileInfo(LttTrace *t, char* cpu) while((entry = readdir(dir)) != NULL){ if(strcmp(entry->d_name,".") != 0 && - 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); @@ -400,8 +384,41 @@ void getCpuFileInfo(LttTrace *t, char* cpu) * *When a trace is closed, all the associated facilities, types and fields *are released as well. + * + * MD : If pathname is already absolute, we do not add current working + * directory to it. + * ****************************************************************************/ +void get_absolute_pathname(const char *pathname, char * 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); + return; + } + + strcat(abs_pathname,"/"); + + ptr = (char*)pathname; + ptr1 = ptr + 1; + while(*ptr == '.' && *ptr1 == '.'){ + ptr += 3; + ptr1 = ptr + 1; + } + strcat(abs_pathname,ptr); +} + LttTrace *ltt_trace_open(const char *pathname) { LttTrace * t; @@ -411,30 +428,33 @@ LttTrace *ltt_trace_open(const char *pathname) char control[DIR_NAME_SIZE]; char cpu[DIR_NAME_SIZE]; char tmp[DIR_NAME_SIZE]; + char abs_path[DIR_NAME_SIZE]; gboolean has_slash = FALSE; + get_absolute_pathname(pathname, abs_path); + //establish the pathname to different directories - if(pathname[strlen(pathname)-1] == '/')has_slash = TRUE; - strcpy(eventdefs,pathname); + if(abs_path[strlen(abs_path)-1] == '/')has_slash = TRUE; + strcpy(eventdefs,abs_path); if(!has_slash)strcat(eventdefs,"/"); strcat(eventdefs,"eventdefs/"); - strcpy(info,pathname); + strcpy(info,abs_path); if(!has_slash)strcat(info,"/"); strcat(info,"info/"); - strcpy(control,pathname); + strcpy(control,abs_path); if(!has_slash)strcat(control,"/"); strcat(control,"control/"); - strcpy(cpu,pathname); + strcpy(cpu,abs_path); if(!has_slash)strcat(cpu,"/"); strcat(cpu,"cpu/"); //new trace t = g_new(LttTrace, 1); sys_description = g_new(LttSystemDescription, 1); - t->pathname = g_strdup(pathname); + t->pathname = g_strdup(abs_path); t->facility_number = 0; t->control_tracefile_number = 0; t->per_cpu_tracefile_number = 0; @@ -1145,18 +1165,16 @@ LttTime getEventTime(LttTracefile * tf) LttTime lTimeOffset; // Time offset in struct LttTime guint16 evId; gint64 nanoSec, tmpCycleCount = (((guint64)1)<<32); - static LttCycleCount preCycleCount = 0; - static int count = 0; evId = *(guint16 *)tf->cur_event_pos; if(evId == TRACE_BLOCK_START){ - count = 0; - preCycleCount = 0; + 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){ - count = 0; - preCycleCount = 0; + tf->count = 0; + tf->pre_cycle_count = 0; tf->cur_cycle_count = tf->a_block_end->cycle_count; return tf->a_block_end->time; } @@ -1164,12 +1182,12 @@ LttTime getEventTime(LttTracefile * tf) // 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 < preCycleCount)count++; - preCycleCount = cycle_count; - cycle_count += tmpCycleCount * count; + 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 > count) - cycle_count += tmpCycleCount * (tf->cur_heart_beat_number - 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;