projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn-id: http://ltt.polymtl.ca/svn@142 04897980-b3bd-0310-b5e0-8ef037075253
[lttv.git]
/
ltt
/
branches
/
poly
/
ltt
/
tracefile.c
diff --git
a/ltt/branches/poly/ltt/tracefile.c
b/ltt/branches/poly/ltt/tracefile.c
index 9f66cc8032639736813cb204a9435c6ccf958775..d4a4706729086d77ef70bd87effdbaf18a00f14e 100644
(file)
--- a/
ltt/branches/poly/ltt/tracefile.c
+++ b/
ltt/branches/poly/ltt/tracefile.c
@@
-103,6
+103,9
@@
LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName)
// Is the file large enough to contain a trace
if(lTDFStat.st_size < sizeof(BlockStart) + EVENT_HEADER_SIZE){
g_print("The input data file %s does not contain a trace\n", fileName);
// Is the file large enough to contain a trace
if(lTDFStat.st_size < 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_free(tf);
return NULL;
}
return NULL;
}
@@
-130,6
+133,7
@@
void ltt_tracefile_open_cpu(LttTrace *t, char * tracefile_name)
{
LttTracefile * tf;
tf = ltt_tracefile_open(t,tracefile_name);
{
LttTracefile * tf;
tf = ltt_tracefile_open(t,tracefile_name);
+ if(!tf) return;
t->per_cpu_tracefile_number++;
g_ptr_array_add(t->per_cpu_tracefiles, tf);
}
t->per_cpu_tracefile_number++;
g_ptr_array_add(t->per_cpu_tracefiles, tf);
}
@@
-150,7
+154,7
@@
void ltt_tracefile_open_control(LttTrace *t, char * control_name)
g_ptr_array_add(t->control_tracefiles,tf);
//parse facilities tracefile to get base_id
g_ptr_array_add(t->control_tracefiles,tf);
//parse facilities tracefile to get base_id
- if(strcmp(
control_name
,"facilities") ==0){
+ if(strcmp(
&control_name[strlen(control_name)-10]
,"facilities") ==0){
while(1){
ev = ltt_tracefile_read(tf);
if(!ev)return; // end of file
while(1){
ev = ltt_tracefile_read(tf);
if(!ev)return; // end of file
@@
-176,6
+180,7
@@
void ltt_tracefile_open_control(LttTrace *t, char * control_name)
}else if(ev->event_id == TRACE_BLOCK_END){
break;
}else g_error("Not valid facilities trace file\n");
}else if(ev->event_id == TRACE_BLOCK_END){
break;
}else g_error("Not valid facilities trace file\n");
+ g_free(ev);
}
}
}
}
}
}
@@
-191,6
+196,7
@@
void ltt_tracefile_close(LttTracefile *t)
{
g_free(t->name);
g_free(t->buffer);
{
g_free(t->name);
g_free(t->buffer);
+ close(t->fd);
g_free(t);
}
g_free(t);
}
@@
-477,15
+483,15
@@
LttTrace *ltt_trace_open(char *pathname)
strcat(tmp,"system.xml");
getSystemInfo(sys_description, tmp);
strcat(tmp,"system.xml");
getSystemInfo(sys_description, tmp);
+ //get facilities info
+ getFacilityInfo(t,eventdefs);
+
//get control tracefile info
getControlFileInfo(t,control);
//get cpu tracefile info
getCpuFileInfo(t,cpu);
//get control tracefile info
getControlFileInfo(t,control);
//get cpu tracefile info
getCpuFileInfo(t,cpu);
- //get facilities info
- getFacilityInfo(t,eventdefs);
-
return t;
}
return t;
}
@@
-709,7
+715,8
@@
void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
LttTime lttTime;
int headTime = timecmp(&(t->a_block_start->time), &time);
int tailTime = timecmp(&(t->a_block_end->time), &time);
LttTime lttTime;
int headTime = timecmp(&(t->a_block_start->time), &time);
int tailTime = timecmp(&(t->a_block_end->time), &time);
-
+ LttEvent * ev;
+
if(headTime < 0 && tailTime > 0){
lttTime = getEventTime(t);
err = timecmp(<tTime, &time);
if(headTime < 0 && tailTime > 0){
lttTime = getEventTime(t);
err = timecmp(<tTime, &time);
@@
-721,13
+728,17
@@
void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
return ltt_tracefile_seek_time(t, time);
}
}else if(err < 0){
return ltt_tracefile_seek_time(t, time);
}
}else if(err < 0){
- err = t->which_block;
- if(ltt_tracefile_read(t) == NULL){
- g_print("End of file\n");
- return;
+ while(1){
+ ev = ltt_tracefile_read(t);
+ if(ev == NULL){
+ g_print("End of file\n");
+ return;
+ }
+ g_free(ev);
+ lttTime = getEventTime(t);
+ err = timecmp(<tTime, &time);
+ if(err >= 0)return;
}
}
- if(t->which_block == err)
- return ltt_tracefile_seek_time(t,time);
}else return;
}else if(headTime > 0){
if(t->which_block == 1){
}else return;
}else if(headTime > 0){
if(t->which_block == 1){
@@
-754,6
+765,10
@@
void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
updateTracefile(t);
}else if(tailTime == 0){
t->cur_event_pos = t->a_block_end - EVENT_HEADER_SIZE;
updateTracefile(t);
}else if(tailTime == 0){
t->cur_event_pos = t->a_block_end - EVENT_HEADER_SIZE;
+ t->current_event_time = time;
+ t->cur_heart_beat_number = 0;
+ t->prev_event_time.tv_sec = 0;
+ t->prev_event_time.tv_nsec = 0;
return;
}
}
return;
}
}
@@
-777,7
+792,7
@@
LttEvent *ltt_tracefile_read(LttTracefile *t)
t->cur_heart_beat_number++;
t->prev_event_time = t->current_event_time;
t->cur_heart_beat_number++;
t->prev_event_time = t->current_event_time;
- t->current_event_time = getEventTime(t);
+
//
t->current_event_time = getEventTime(t);
lttEvent->time_delta = *(uint32_t*)(t->cur_event_pos + EVENT_ID_SIZE);
lttEvent->event_time = t->current_event_time;
lttEvent->time_delta = *(uint32_t*)(t->cur_event_pos + EVENT_ID_SIZE);
lttEvent->event_time = t->current_event_time;
@@
-790,7
+805,10
@@
LttEvent *ltt_tracefile_read(LttTracefile *t)
//update the fields of the current event and go to the next event
err = skipEvent(t);
//update the fields of the current event and go to the next event
err = skipEvent(t);
- if(err == ENOMEM) return NULL;
+ if(err == ENOMEM){
+ g_free(lttEvent);
+ return NULL;
+ }
if(err == ENOENT) return lttEvent;
if(err == ERANGE) g_error("event id is out of range\n");
if(err)g_error("Can not read tracefile\n");
if(err == ENOENT) return lttEvent;
if(err == ERANGE) g_error("event id is out of range\n");
if(err)g_error("Can not read tracefile\n");
@@
-842,14
+860,11
@@
int readBlock(LttTracefile * tf, int whichBlock)
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;
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;
- tf->current_event_time = tf->a_block_end->time;
}else{
tf->prev_block_end_time.tv_sec = 0;
tf->prev_block_end_time.tv_nsec = 0;
tf->prev_event_time.tv_sec = 0;
tf->prev_event_time.tv_nsec = 0;
}else{
tf->prev_block_end_time.tv_sec = 0;
tf->prev_block_end_time.tv_nsec = 0;
tf->prev_event_time.tv_sec = 0;
tf->prev_event_time.tv_nsec = 0;
- tf->current_event_time.tv_sec = 0;
- tf->current_event_time.tv_nsec = 0;
}
nbBytes=lseek(tf->fd,(off_t)((whichBlock-1)*tf->block_size), SEEK_SET);
}
nbBytes=lseek(tf->fd,(off_t)((whichBlock-1)*tf->block_size), SEEK_SET);
@@
-870,7
+885,7
@@
int readBlock(LttTracefile * tf, int whichBlock)
getCyclePerNsec(tf);
getCyclePerNsec(tf);
-
//
tf->current_event_time = getEventTime(tf);
+ tf->current_event_time = getEventTime(tf);
return 0;
}
return 0;
}
@@
-887,9
+902,7
@@
void updateTracefile(LttTracefile * tf)
{
tf->which_event = 1;
tf->cur_event_pos = tf->buffer;
{
tf->which_event = 1;
tf->cur_event_pos = tf->buffer;
- // tf->current_event_time = getEventTime(tf);
- tf->current_event_time.tv_sec = 0;
- tf->current_event_time.tv_nsec = 0;
+ tf->current_event_time = getEventTime(tf);
tf->cur_heart_beat_number = 0;
tf->prev_event_time.tv_sec = 0;
tf->cur_heart_beat_number = 0;
tf->prev_event_time.tv_sec = 0;
@@
-965,6
+978,7
@@
int skipEvent(LttTracefile * t)
if(err) return err;
}else{
t->which_event++;
if(err) return err;
}else{
t->which_event++;
+ t->current_event_time = getEventTime(t);
}
return 0;
}
return 0;
This page took
0.024261 seconds
and
4
git commands to generate.