#include <stdio.h>
#include <fcntl.h>
+#include <string.h>
+#include <dirent.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <dirent.h>
-#include <linux/errno.h>
+#include <errno.h>
+#include <unistd.h>
// For realpath
#include <limits.h>
#include "ltt-private.h"
#include <ltt/trace.h>
#include <ltt/facility.h>
+#include <ltt/event.h>
+#include <ltt/type.h>
#define DIR_NAME_SIZE 256
+#define __UNUSED__ __attribute__((__unused__))
/* set the offset of the fields belonging to the event,
need the information of the archecture */
/* 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,
}
}
-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);
{
LttTracefile * tf;
struct stat lTDFStat; /* Trace data file status */
- BlockStart a_block_start;
tf = g_new(LttTracefile, 1);
}
// 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);
gint ltt_tracefile_open_control(LttTrace *t, char * 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) {
//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 0; // end of file
+ if(!ltt_tracefile_read(tf,&ev)) return 0; // end of file
- if(ev->event_id == TRACE_FACILITY_LOAD){
- pos = ev->data;
+ if(ev.event_id == TRACE_FACILITY_LOAD){
+ pos = ev.data;
fLoad.name = (char*)pos;
fLoad.checksum = *(LttChecksum*)(pos + strlen(fLoad.name));
fLoad.base_code = *(guint32 *)(pos + strlen(fLoad.name) + sizeof(LttChecksum));
}
}
if(i==t->facility_number) {
- g_warning("Facility: %s, checksum: %d is not found\n",
- fLoad.name,fLoad.checksum);
+ 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){
+ }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_warning("Not valid facilities trace file\n");
+ g_warning("Not valid facilities trace file");
return -1;
}
}
{
FILE * fp;
char buf[DIR_NAME_SIZE];
- char description[4*DIR_NAME_SIZE];
GMarkupParseContext * context;
GError * error = NULL;
GMarkupParser markup_parser =
{
parser_start_element,
- parser_end_element,
+ NULL,
parser_characters,
NULL, /* passthrough */
NULL /* error */
DIR * dir;
struct dirent *entry;
char * ptr;
- int i,j;
+ unsigned int i,j;
LttFacility * f;
LttEventType * et;
char name[DIR_NAME_SIZE];
*
*When a trace is closed, all the associated facilities, types and fields
*are released as well.
+ */
+
+
+/****************************************************************************
+ * get_absolute_pathname
*
+ * 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)
{
- char * ptr, *ptr1;
- size_t size = DIR_NAME_SIZE;
abs_pathname[0] = '\0';
if ( realpath (pathname, abs_pathname) != NULL)
return;
else
{
- // FIXME : Path is wrong, is it ok to return the pathname unmodified ?
+ /* error, return the original path unmodified */
strcpy(abs_pathname, pathname);
return;
}
-
return;
-
}
LttTrace *ltt_trace_open(const char *pathname)
void ltt_trace_close(LttTrace *t)
{
- int i;
+ unsigned int i;
LttTracefile * tf;
LttFacility * f;
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;i<t->facility_number;i++){
f = (LttFacility*)g_ptr_array_index(t->facilities, i);
unsigned ltt_trace_eventtype_number(LttTrace *t)
{
- int i;
+ unsigned int i;
unsigned count = 0;
LttFacility * f;
for(i=0;i<t->facility_number;i++){
LttFacility * ltt_trace_facility_by_id(LttTrace * trace, unsigned id)
{
- LttFacility * facility;
- int i;
+ LttFacility * facility = NULL;
+ unsigned int i;
+
for(i=0;i<trace->facility_number;i++){
- facility = (LttFacility*) g_ptr_array_index(trace->facilities,i);
- if(id >= facility->base_id &&
- id < facility->base_id + facility->event_number)
+ LttFacility *iter_facility =
+ (LttFacility*) g_ptr_array_index(trace->facilities,i);
+ if(id >= iter_facility->base_id &&
+ id < iter_facility->base_id + iter_facility->event_number) {
+ facility = iter_facility;
break;
+ }
}
- if(i==trace->facility_number) return NULL;
- else return facility;
+
+ return facility;
}
LttEventType *ltt_trace_eventtype_get(LttTrace *t, unsigned evId)
*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;i<t->control_tracefile_number;i++){
tracefile = (LttTracefile*)g_ptr_array_index(t->control_tracefiles, i);
if(strcmp(tracefile->name, name)==0)break;
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;j<t->per_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;i<t->per_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;
}
/*****************************************************************************
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;i<t->control_tracefile_number;i++){
if(ltt_time_compare(endBig,endTmp) < 0) endBig = endTmp;
}
- *start = startSmall;
- *end = endBig;
+ if(start != NULL) *start = startSmall;
+ if(end != NULL) *end = endBig;
}
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;
+ LttEvent ev;
if(headTime < 0 && tailTime > 0){
if(ltt_time_compare(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);
}
}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;
}
/*****************************************************************************
* 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, const LttEventPosition *ep)
if(t->which_block == ep->block_num) updateTracefile(t);
else readBlock(t,ep->block_num);
-
- //event offset is availiable
+ //event offset is available
if(ep->old_position){
- t->cur_heart_beat_number = ep->heart_beat_number;
+ int err;
+
+ 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;
+ /* end of workaround */
+
+ //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");
+
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(t->which_event < ep->event_num) ltt_tracefile_read(t, &event);
return;
}
* 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(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 = (int)(*(guint16 *)(t->cur_event_pos));
+ if(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;
- lttEvent->event_cycle_count = t->cur_cycle_count;
+ event->time_delta = *(guint32 *)(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;
+ /* 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");
- return lttEvent;
+ return event;
}
/****************************************************************************
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;
int skipEvent(LttTracefile * t)
{
- int evId, err;
+ int evId;
void * evData;
LttEventType * evT;
LttField * rootFld;
return 0;
}
+
/*****************************************************************************
*Function name
* getCyclePerNsec : calculate cycles per nsec for current block
if(fld == evT->root_field) return fld->field_size;
}
+ 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;i<element_number;i++){
+ size += getFieldtypeSize(t, evT, offsetRoot+size,size,
+ fld->child[0], evD+size, trace);
+ }
+ }else size = fld->field_size;
+ 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(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;i<element_number;i++){
+ size += getFieldtypeSize(t, evT, offsetRoot+size+size1,size+size1,
+ fld->child[0], evD+size+size1, trace);
+ }
+ }
+ size += size1;
+ }
+ break;
+
+ case LTT_STRING:
+ size = 0;
+ if(fld->field_fixed == -1){
+ fld->field_fixed = 0;
+ }else{//0: string
+ size = strlen((char*)evD) + 1; //include end : '\0'
+ }
+ break;
+
+ case LTT_STRUCT:
+ element_number = (int) type->element_number;
+ size = 0;
+ if(fld->field_fixed == -1){
+ offset1 = offsetRoot;
+ offset2 = 0;
+ for(i=0;i<element_number;i++){
+ size1=getFieldtypeSize(t, evT,offset1,offset2,
+ fld->child[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;i<element_number;i++){
+ size=getFieldtypeSize(t,evT,offset1,offset2,
+ fld->child[i],evD+offset2, trace);
+ offset1 += size;
+ offset2 += size;
+ }
+ size = offset2;
+ }else size = fld->field_size;
+ break;
+
+ default:
+ if(fld->field_fixed == -1){
+ size = (int) ltt_type_size(trace, type);
+ fld->field_fixed = 1;
+ }else size = fld->field_size;
+ break;
+ }
+
+
+
+#if 0
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 = offset2;
}else size = fld->field_size;
}
+#endif //0
fld->offset_root = offsetRoot;
fld->offset_parent = offsetParent;
* 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(int size, void *evD)
{
gint64 i;
+
+ switch(size) {
+ case 1: i = *(gint8 *)evD; break;
+ case 2: i = *(gint16 *)evD; break;
+ case 4: i = *(gint32 *)evD; break;
+ case 8: i = *(gint64 *)evD; break;
+ default: i = *(gint64 *)evD;
+ g_critical("getIntNumber : integer size %d unknown", size);
+ break;
+ }
+
+#if 0
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;
+#endif //0
+
+ return (gint64)i;
}
/*****************************************************************************
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;
+}
+
projects / lttv.git / blobdiff