git-svn-id: http://ltt.polymtl.ca/svn@117 04897980-b3bd-0310-b5e0-8ef037075253

[lttv.git] / ltt / branches / yangxx / convert / convert.c

diff --git a/ltt/branches/yangxx/convert/convert.c b/ltt/branches/yangxx/convert/convert.c
index 717e09e931e12b8cf97609b384fb4454e4bcbe11..1614d040c7fdb0223db3c4db7458fca47eefa68d 100644 (file)
--- a/ltt/branches/yangxx/convert/convert.c
+++ b/ltt/branches/yangxx/convert/convert.c
@@ -263,6 +263,9 @@ int main(int argc, char ** argv){
     beat_count = 0;
 
     for(j=0;j<cpu;j++) write_pos[j] = buf_out[j];
+    write_pos_intr = buf_intr;
+    write_pos_fac = buf_fac;
+    write_pos_proc = buf_proc;
 
     readFile(fd,(void*)buffer, block_size, "Unable to read block header");
 
@@ -270,7 +273,7 @@ int main(int argc, char ** argv){
     size_lost = *(uint32_t*)(end_pos - sizeof(uint32_t));
 
     end_pos = buffer + block_size - size_lost ; //buffer_end event
-    tBufEnd = (trace_buffer_end*)end_pos;
+    tBufEnd = (trace_buffer_end*)(end_pos+sizeof(uint8_t)+sizeof(uint32_t));
     end.seconds = tBufEnd->Time.tv_sec;
     end.nanoseconds = tBufEnd->Time.tv_usec;
     end.cycle_count = tBufEnd->TSC;
@@ -461,9 +464,9 @@ int main(int argc, char ** argv){
        
        if(evId == TRACE_HEARTBEAT){
          if(ltt_log_cpu){
-           write_to_buffer(write_pos[cpu_id], cur_pos, sizeof(heartbeat));      
+           write_to_buffer(write_pos[cpu_id],(void*)&beat , sizeof(heartbeat));         
          }else{
-           write_to_buffer(write_pos[0], cur_pos, sizeof(heartbeat));            
+           write_to_buffer(write_pos[0], (void*)&beat, sizeof(heartbeat));               
          }
        }