From: pmf Date: Fri, 30 May 2008 15:15:22 +0000 (+0000) Subject: liblttvtraceread: clean up by removing old commented code X-Git-Tag: v0.12.20~566 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ca975c36a89871f6c132de83d54b2c16a5a49a14;p=lttv.git liblttvtraceread: clean up by removing old commented code git-svn-id: http://ltt.polymtl.ca/svn@2923 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index 3cbb9bf2..fd64eed6 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -67,39 +67,6 @@ enum ltt_core_events { }; -#if 0 -/* enumeration definition */ - -typedef enum _BuildinEvent{ - TRACE_FACILITY_LOAD = 0, - TRACE_BLOCK_START = 17, - TRACE_BLOCK_END = 18, - TRACE_TIME_HEARTBEAT= 19 -} BuildinEvent; - - -/* structure definition */ - -typedef struct _FacilityLoad{ - gchar * name; - LttChecksum checksum; - guint32 base_code; -} LTT_PACKED_STRUCT FacilityLoad; - -typedef struct _BlockStart { - LttTime time; //Time stamp of this block - LttCycleCount cycle_count; //cycle count of the event - guint32 block_id; //block id -} LTT_PACKED_STRUCT BlockStart; - -typedef struct _BlockEnd { - LttTime time; //Time stamp of this block - LttCycleCount cycle_count; //cycle count of the event - guint32 block_id; //block id -} LTT_PACKED_STRUCT BlockEnd; -#endif //0 - - typedef guint8 uint8_t; typedef guint16 uint16_t; typedef guint32 uint32_t; @@ -172,83 +139,8 @@ struct ltt_block_start_header { } LTT_PACKED_STRUCT; -#if 0 -struct _LttType{ -// LTTV does not care about type names. Everything is a field. -// GQuark type_name; //type name if it is a named type - gchar * fmt; - guint size; - LttTypeEnum type_class; //which type - GHashTable *enum_map; //maps enum labels to numbers. - gint32 highest_value; //For enum - gint32 lowest_value; //For enum - GArray *fields; // Array of LttFields, for array, sequence, union, struct. - GData *fields_by_name; - guint network; // Is the type in network byte order ? - //part added by gaby for fmt: - char *header; - char *separator; - char *footer; -}; -#endif //0 - -#if 0 -struct _LttEventType{ - GQuark name; - gchar * description; - guint index; //id of the event type within the facility - struct marker_info *info; - GArray * fields; //event's fields (LttField) - GData *fields_by_name; - int has_compact_data; //event header contains compact data (first field) -}; -#endif //0 - enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED }; -#if 0 -struct _LttField{ - GQuark name; - gchar *description; - LttType field_type; //field type - - off_t offset_root; //offset from the root - enum field_status fixed_root; //offset fixed according to the root - - guint field_size; // size of the field - // Only if field type size is set to 0 - // (it's variable), then the field_size should be - // dynamically calculated while reading the trace - // and put here. Otherwise, the field_size always - // equals the type size. - off_t array_offset; // offset of the beginning of the array (for array - // and sequences) - GArray * dynamic_offsets; // array of offsets calculated dynamically at - // each event for sequences and arrays that - // contain variable length fields. -}; -#endif //0 -#if 0 -struct _LttFacility{ - LttTrace *trace; - GQuark name; - guint32 checksum; //checksum of the facility - guint32 id; //id of the facility - - guint32 int_size; - guint32 long_size; - guint32 pointer_size; - guint32 size_t_size; - guint32 alignment; - - GArray *events; - GData *events_by_name; - // not necessary in LTTV GData *named_types; - - unsigned char exists; /* 0 does not exist, 1 exists */ -}; -#endif //0 - typedef struct _LttBuffer { void * head; unsigned int index; diff --git a/ltt/branches/poly/ltt/ltt-types.h b/ltt/branches/poly/ltt/ltt-types.h index 015d3c38..248cfab9 100644 --- a/ltt/branches/poly/ltt/ltt-types.h +++ b/ltt/branches/poly/ltt/ltt-types.h @@ -23,7 +23,6 @@ * */ #include -//#include #include #include diff --git a/ltt/branches/poly/ltt/trace.h b/ltt/branches/poly/ltt/trace.h index f6f20ab6..3e8e0de3 100644 --- a/ltt/branches/poly/ltt/trace.h +++ b/ltt/branches/poly/ltt/trace.h @@ -84,25 +84,6 @@ guint ltt_trace_get_num_cpu(LttTrace *t); LttSystemDescription *ltt_trace_system_description(LttTrace *t); -/* Functions to discover the facilities in the trace. Once the number - of facilities is known, they may be accessed by position. Multiple - versions of a facility (same name, different checksum) have consecutive - positions. */ - -//unsigned ltt_trace_facility_number(LttTrace *t); - -//LttFacility * ltt_trace_facility_by_id(LttTrace * trace, guint8 id); - -/* Returns an array of indexes (guint) that matches the facility name */ -//GArray *ltt_trace_facility_get_by_name(LttTrace *t, GQuark name); - -/* Functions to discover all the event types in the trace */ - -//unsigned ltt_trace_eventtype_number(LttTrace *t); - -//LttEventType *ltt_trace_eventtype_get(LttTrace *t, unsigned i); - - /* Get the start time and end time of the trace */ void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end); @@ -207,12 +188,6 @@ void compute_tracefile_group(GQuark key_id, GArray *group, struct compute_tracefile_group_args *args); -//LttFacility *ltt_trace_get_facility_by_num(LttTrace *t, guint num); - - -//gint check_fields_compatibility(LttEventType *event_type1, -// LttEventType *event_type2, -// LttField *field1, LttField *field2); gint64 ltt_get_int(gboolean reverse_byte_order, gint size, void *data); diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index cfe76e10..802135e7 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -45,7 +45,6 @@ #include "ltt-private.h" #include #include -//#include #include #include @@ -126,96 +125,6 @@ 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, - 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)){ - *error = g_error_new(G_MARKUP_ERROR, - G_LOG_LEVEL_WARNING, - "This is not system.xml file"); - return; - } - - 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{ - *error = g_error_new(G_MARKUP_ERROR, - G_LOG_LEVEL_WARNING, - "Not a valid attribute"); - return; - } - i++; - } -} - -static void parser_characters (GMarkupParseContext __UNUSED__ *context, - const gchar *text, - gsize __UNUSED__ text_len, - gpointer user_data, - GError __UNUSED__ **error) -{ - LttSystemDescription* des = (LttSystemDescription* )user_data; - des->description = g_strdup(text); -} -#endif //0 - -#if 0 -LttFacility *ltt_trace_get_facility_by_num(LttTrace *t, - guint num) -{ - g_assert(num < t->facilities_by_num->len); - - return &g_array_index(t->facilities_by_num, LttFacility, num); - -} -#endif //0 - guint ltt_trace_get_num_cpu(LttTrace *t) { return t->num_cpu; @@ -946,130 +855,6 @@ int open_tracefiles(LttTrace *trace, gchar *root_path, gchar *relative_path) return 0; } -/* ltt_get_facility_description - * - * 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) -{ - char desc_file_name[PATH_MAX]; - const gchar *text; - guint textlen; - gint err; - gint arch_spec; - gint fac_name_len; - - text = g_quark_to_string(t->pathname); - textlen = strlen(text); - - if(textlen >= PATH_MAX) goto name_error; - strcpy(desc_file_name, text); - - text = "/eventdefs/"; - textlen+=strlen(text); - if(textlen >= PATH_MAX) goto name_error; - strcat(desc_file_name, text); - - text = g_quark_to_string(f->name); - 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; - strcat(desc_file_name, text); - - err = snprintf(desc_file_name+textlen, PATH_MAX-textlen-1, - "%u", f->checksum); - 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; - - return 0; - -facility_error: -name_error: - return 1; -} - -static void ltt_fac_ids_destroy(gpointer data) -{ - GArray *fac_ids = (GArray *)data; - - 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 */ @@ -1297,80 +1082,6 @@ 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); - return &g_array_index(t->facilities_by_num, LttFacility, id); -} - -/* ltt_trace_facility_get_by_name - * - * Returns the GArray of facility indexes. All the fac_ids that matches the - * requested facility name. - * - * If name is not found, returns NULL. - */ -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 - ****************************************************************************/ - -#if 0 -unsigned ltt_trace_eventtype_number(LttTrace *t) -{ - unsigned int i; - unsigned count = 0; - unsigned int num = t->facility_number; - LttFacility * f; - - for(i=0;ifacilities, i); - count += f->event_number; - } - return count; -} -#endif //0 - -#if 0 -//use an iteration on all the trace facilities, and inside iteration on all the -//event types in each facilities instead. -LttEventType *ltt_trace_eventtype_get(LttTrace *t, unsigned evId) -{ - LttEventType *event_type; - - LttFacility * f; - f = ltt_trace_facility_by_id(t,evId); - - if(unlikely(!f)) event_type = NULL; - else event_type = f->events[evId - f->base_id]; - - return event_type; -} -#endif //0 - -#if 0 -/***************************************************************************** - * ltt_trace_find_tracefile - * - * Find a tracefile by name and index in the group. - * - * Returns a pointer to the tracefiles, else NULL. - ****************************************************************************/ - -LttTracefile *ltt_trace_find_tracefile(LttTrace *t, const gchar *name) -{ -} -#endif //0 - /***************************************************************************** * Get the start time and end time of the trace ****************************************************************************/ @@ -2168,53 +1879,6 @@ void ltt_update_event_size(LttTracefile *tf) 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: - 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 }