fix for smp cfv, fix convert bug for 2.2 format, add task release event handling
[lttv.git] / ltt / branches / poly / ltt / convert / convert.c
index fd7e8d092578cfd4ae6689c66e4c4e2a72adad78..7b4403ea5b0df11c5b2571116a646cb654605a9c 100644 (file)
@@ -1,8 +1,11 @@
 #include <stdio.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <linux/errno.h>  
+#include <errno.h>  
+#include <stdlib.h>
+#include <string.h>
 
 #include <glib.h>
 #include "LTTTypes.h"
@@ -13,7 +16,7 @@
 #define PROCESS_EXIT_ID     21
 
 #define INFO_ENTRY          9
-#define OVERFLOW_FIGURE     4294967296
+#define OVERFLOW_FIGURE     0x100000000ULL
 
 typedef struct _new_process
 {
@@ -30,10 +33,14 @@ do\
 
 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 {
+       printf("%s\n",mesg);
+     }
      exit(1);
    }
    return 0;
@@ -68,6 +75,14 @@ typedef struct _buffer_start{
   uint32_t block_id;  
 } __attribute__ ((packed)) buffer_start;
 
+typedef struct _buffer_end{
+  uint32_t seconds;
+  uint32_t nanoseconds;
+  uint64_t cycle_count;
+  uint32_t block_id;  
+} __attribute__ ((packed)) buffer_end;
+
+
 typedef struct _heartbeat{
   uint32_t seconds;
   uint32_t nanoseconds;
@@ -77,7 +92,7 @@ typedef struct _heartbeat{
 
 int main(int argc, char ** argv){
 
-  int fd, *fdCpu;
+  int fd, fdCpu;
   FILE * fp;
   int  fdFac, fdIntr, fdProc;
   char arch_size[BUFFER_SIZE];
@@ -92,12 +107,13 @@ int main(int argc, char ** argv){
   char hardware_platform[BUFFER_SIZE];
   char operating_system[BUFFER_SIZE];
   int  cpu;
-  int  ltt_block_size;
-  int  ltt_major_version;
-  int  ltt_minor_version;
+  int  ltt_block_size=0;
+  int  ltt_major_version=0;
+  int  ltt_minor_version=0;
   int  ltt_log_cpu;
+  guint ltt_trace_start_size = 0;
   char buf[BUFFER_SIZE];
-  int i,j;
+  int i, k;
 
   uint8_t cpu_id;
 
@@ -115,10 +131,10 @@ int main(int argc, char ** argv){
   struct stat      lTDFStat;   
   off_t file_size;                  
   int block_number, block_size;                 
-  char * buffer, **buf_out, cpuStr[4*BUFFER_SIZE];
+  char * buffer, *buf_out, cpuStr[4*BUFFER_SIZE];
   char * buf_fac, * buf_intr, * buf_proc;
-  void ** write_pos, *write_pos_fac, * write_pos_intr, *write_pos_proc;
-  trace_start *tStart;
+  void * write_pos, *write_pos_fac, * write_pos_intr, *write_pos_proc;
+  trace_start_any *tStart;
   trace_buffer_start *tBufStart;
   trace_buffer_end *tBufEnd;
   trace_file_system * tFileSys;
@@ -127,35 +143,47 @@ int main(int argc, char ** argv){
   uint32_t time_delta, startTimeDelta;
   void * cur_pos, *end_pos;
   buffer_start start, start_proc, start_intr;
-  buffer_start end, end_proc, end_intr;
+  buffer_end end, end_proc, end_intr;
   heartbeat beat;
-  int beat_count = 0;
-  gboolean * has_event;
+  uint64_t adaptation_tsc;    // (Mathieu)
   uint32_t size_lost;
-  int reserve_size = sizeof(buffer_start) + sizeof(uint16_t) + 2*sizeof(uint32_t);//lost_size and buffer_end event
+  int reserve_size = sizeof(buffer_start) + 
+                     sizeof(buffer_end) + //buffer_end event
+                     sizeof(uint32_t);  //lost size
+  int nb_para;
 
   new_process process;
 
-  if(argc != 4 && argc != 5){
-    printf("need a trace file and cpu number or root directory for the new tracefile\n");
+  if(argc < 4){
+    printf("Usage : ./convert processfile_name number_of_cpu tracefile1 tracefile2 ... trace_creation_directory\n");
+               printf("For more details, see README.\n");
     exit(1);
   }
 
-  if(argc == 4){
+  cpu = atoi(argv[2]);
+  printf("cpu number = %d\n", cpu);
+  nb_para = 3 + cpu;
+
+  if(argc != nb_para && argc != nb_para+1){
+    printf("need trace files and cpu number or root directory for the new tracefile\n");
+    exit(1);
+  }
+
+  if(argc == nb_para){
     strcpy(foo, "foo");
     strcpy(foo_eventdefs, "foo/eventdefs");
     strcpy(foo_control, "foo/control");
     strcpy(foo_cpu, "foo/cpu");
     strcpy(foo_info, "foo/info");
   }else{
-    strcpy(foo, argv[4]);
-    strcpy(foo_eventdefs, argv[4]);
+    strcpy(foo, argv[nb_para]);
+    strcpy(foo_eventdefs, argv[nb_para]);
     strcat(foo_eventdefs,"/eventdefs");
-    strcpy(foo_control, argv[4]);
+    strcpy(foo_control, argv[nb_para]);
     strcat(foo_control,"/control");
-    strcpy(foo_cpu, argv[4]);
+    strcpy(foo_cpu, argv[nb_para]);
     strcat(foo_cpu,"/cpu");
-    strcpy(foo_info, argv[4]);
+    strcpy(foo_info, argv[nb_para]);
     strcat(foo_info,"/info");
   }
   strcpy(foo_control_facilities, foo_control);
@@ -167,9 +195,6 @@ int main(int argc, char ** argv){
   strcpy(foo_info_system, foo_info);
   strcat(foo_info_system, "/system.xml");
 
-  cpu = atoi(argv[3]);
-  printf("cpu number = %d\n", cpu);
-
 
   getDataEndianType(arch_size, endian);
   printf("Arch_size: %s,  Endian: %s\n", arch_size, endian);
@@ -229,11 +254,6 @@ int main(int argc, char ** argv){
     g_error("Unable to open file system.xml\n");
   }
 
-  fd = open(argv[1], O_RDONLY, 0);
-  if(fd < 0){
-    g_error("Unable to open input data file %s\n", argv[1]);
-  }
-
   fdFac = open(foo_control_facilities,O_CREAT | O_RDWR | O_TRUNC,S_IRUSR |S_IWUSR | S_IRGRP | S_IROTH);
   if(fdFac < 0){
     g_error("Unable to open file facilities\n");
@@ -243,95 +263,25 @@ int main(int argc, char ** argv){
     g_error("Unable to open file interrupts\n");
   }
   fdProc = open(foo_control_processes,O_CREAT | O_RDWR | O_TRUNC,S_IRUSR |S_IWUSR | S_IRGRP | S_IROTH);
-  if(fdIntr<0){
+  if(fdProc<0){
     g_error("Unable to open file process\n");
   }
 
 
-
-  if(fstat(fd, &lTDFStat) < 0){
-    g_error("Unable to get the status of the input data file\n");
-  }
-  file_size = lTDFStat.st_size;
-
-  buffer = g_new(char, 4000);
-  readFile(fd,(void*)buffer, 3500, "Unable to read block header");
-
-  cur_pos= buffer;
-  evId = *(uint8_t *)cur_pos;
-  cur_pos += sizeof(uint8_t);
-  newId = evId;
-  time_delta = *(uint32_t*)cur_pos;
-  cur_pos += sizeof(uint32_t); 
-  tBufStart = (trace_buffer_start*)cur_pos;
-  cur_pos += sizeof(trace_buffer_start);
-  cur_pos += sizeof(uint16_t); //Skip event size
-
-  evId = *(uint8_t *)cur_pos;
-  cur_pos += sizeof(uint8_t);
-  cur_pos += sizeof(uint32_t); 
-  tStart = (trace_start*)cur_pos;
-
-  startId = newId;
-  startTimeDelta = time_delta;
-  start.seconds = tBufStart->Time.tv_sec;
-  start.nanoseconds = tBufStart->Time.tv_usec;
-  start.cycle_count = tBufStart->TSC;
-  start.block_id = tBufStart->ID;
-  end.block_id = start.block_id;
-
-  ltt_major_version = tStart->MajorVersion;
-  ltt_minor_version = tStart->MinorVersion;
-  ltt_block_size    = tStart->BufferSize;
-  ltt_log_cpu       = tStart->LogCPUID;
-
-  block_size = ltt_block_size;
-  block_number = file_size/block_size;
-
-  g_free(buffer);
-  buffer         = g_new(char, block_size);
-  buf_fac        = g_new(char, block_size);
-  write_pos_fac  = buf_fac;
-  buf_intr       = g_new(char, block_size);
-  write_pos_intr = buf_intr;
-  buf_proc       = g_new(char, block_size);
-  write_pos_proc = buf_proc;
-  
-  buf_out    = g_new(char*,cpu);
-  write_pos  = g_new(void*, cpu);
-  fdCpu      = g_new(int, cpu); 
-  has_event  = g_new(gboolean, cpu);
-  for(i=0;i<cpu;i++){
-    has_event[i] = FALSE;
-    if(i==0)has_event[i] = TRUE;
-    buf_out[i] = g_new(char, block_size);
-    write_pos[i] = NULL;;
-    sprintf(cpuStr,"%s/%d\0",foo_cpu,i);
-    fdCpu[i] = open(cpuStr, O_CREAT | O_RDWR | O_TRUNC,S_IRUSR |S_IWUSR | S_IRGRP | S_IROTH); //for cpu i
-    if(fdCpu[i] < 0)  g_error("Unable to open  cpu file %d\n", i);    
-  }
-  lseek(fd,0,SEEK_SET);
-
-
-  for(i=0;i<block_number;i++){
-    int event_count = 0;
-    beat_count = 0;
-
-    for(j=1;j<cpu;j++)has_event[j] = FALSE;
-    for(j=0;j<cpu;j++){
-      memset((void*)buf_out[j], 0, block_size);
-      write_pos[j] = buf_out[j];
+  for(k=0;k<cpu;k++){
+    fd = open(argv[nb_para-cpu+k], O_RDONLY, 0);
+    if(fd < 0){
+      g_error("Unable to open input data file %s\n", argv[nb_para-cpu+k]);
     }
-    memset((void*)buf_intr, 0, block_size);    
-    memset((void*)buf_fac, 0, block_size);    
-    memset((void*)buf_proc, 0, block_size);    
-    write_pos_intr = buf_intr;
-    write_pos_fac = buf_fac;
-    write_pos_proc = buf_proc;
-
-    memset((void*)buffer,0,block_size); 
-    readFile(fd,(void*)buffer, block_size, "Unable to read block header");
+    
+    if(fstat(fd, &lTDFStat) < 0){
+      g_error("Unable to get the status of the input data file\n");
+    }
+    file_size = lTDFStat.st_size;
 
+    buffer = g_new(char, 4000);
+    readFile(fd,(void*)buffer, 3500, "Unable to read block header");
+    
     cur_pos= buffer;
     evId = *(uint8_t *)cur_pos;
     cur_pos += sizeof(uint8_t);
@@ -342,308 +292,434 @@ int main(int argc, char ** argv){
     cur_pos += sizeof(trace_buffer_start);
     cur_pos += sizeof(uint16_t); //Skip event size
 
+    evId = *(uint8_t *)cur_pos;
+    g_assert(evId == TRACE_START);
+    cur_pos += sizeof(uint8_t); //skip EvId
+    cur_pos += sizeof(uint32_t); //skip time delta
+    tStart = (trace_start_any*)cur_pos;
+    if(tStart->MagicNumber != TRACER_MAGIC_NUMBER)
+      g_error("Trace magic number does not match : %lx, should be %lx",
+               tStart->MagicNumber, TRACER_MAGIC_NUMBER);
+    if(tStart->MajorVersion != TRACER_SUP_VERSION_MAJOR)
+      g_error("Trace Major number does match : %hu, should be %u",
+               tStart->MajorVersion, TRACER_SUP_VERSION_MAJOR);
+
     startId = newId;
     startTimeDelta = time_delta;
     start.seconds = tBufStart->Time.tv_sec;
-    start.nanoseconds = tBufStart->Time.tv_usec;
+    /* Fix (Mathieu) */
+    start.nanoseconds = tBufStart->Time.tv_usec * 1000;
     start.cycle_count = tBufStart->TSC;
     start.block_id = tBufStart->ID;
     end.block_id = start.block_id;
 
-    end_pos = buffer + block_size; //end of the buffer
-    size_lost = *(uint32_t*)(end_pos - sizeof(uint32_t));
 
-    end_pos = buffer + block_size - size_lost ; //buffer_end event
-    if(ltt_log_cpu){
-      tBufEnd = (trace_buffer_end*)(end_pos + 2 * sizeof(uint8_t)+sizeof(uint32_t));
-    }else{
-      tBufEnd = (trace_buffer_end*)(end_pos+sizeof(uint8_t)+sizeof(uint32_t));
+    g_printf("Trace version %hu.%hu detected\n",
+             tStart->MajorVersion,
+             tStart->MinorVersion);
+    if(tStart->MinorVersion == 2) {
+      trace_start_2_2* tStart_2_2 = (trace_start_2_2*)tStart;
+      ltt_major_version = tStart_2_2->MajorVersion;
+      ltt_minor_version = tStart_2_2->MinorVersion;
+      ltt_block_size    = tStart_2_2->BufferSize;
+      ltt_log_cpu       = tStart_2_2->LogCPUID;
+      ltt_trace_start_size = sizeof(trace_start_2_2);
+      /* Verify if it's a broken 2.2 format */
+      if(*(uint8_t*)(cur_pos + sizeof(trace_start_2_2)) == 0) {
+        /* Cannot have two trace start events. We cannot detect the problem
+         * if the flight recording flag is set to 1, as it conflicts
+         * with TRACE_SYSCALL_ENTRY.
+         */
+        g_warning("This is a 2.3 trace format that has a 2.2 tag. Please upgrade your kernel");
+        g_printf("Processing the trace as a 2.3 format\n");
+
+        tStart->MinorVersion = 3;
+      }
     }
-    end.seconds = tBufEnd->Time.tv_sec;
-    end.nanoseconds = tBufEnd->Time.tv_usec;
-    end.cycle_count = tBufEnd->TSC;
     
-    //skip buffer start and trace start events
-    if(i==0) //the first block
-      cur_pos = buffer + sizeof(trace_buffer_start) + sizeof(trace_start) + 2*(sizeof(uint8_t)+sizeof(uint16_t)+sizeof(uint32_t));
-    else //other blocks
-      cur_pos = buffer + sizeof(trace_buffer_start) + sizeof(uint8_t)+sizeof(uint16_t)+sizeof(uint32_t);
-
-    //for cpu 0, always make records
-    write_to_buffer(write_pos[0],(void*)&startId, sizeof(uint16_t));    
-    write_to_buffer(write_pos[0],(void*)&startTimeDelta, sizeof(uint32_t));
-    write_to_buffer(write_pos[0],(void*)&start, sizeof(buffer_start));
-    
-    //write start block event into processes and interrupts files
-    write_to_buffer(write_pos_intr,(void*)&startId, sizeof(uint16_t));    
-    write_to_buffer(write_pos_intr,(void*)&startTimeDelta, sizeof(uint32_t));
-    start_intr = start;
-    start_intr.nanoseconds -= 40;
-    write_to_buffer(write_pos_intr,(void*)&start_intr, sizeof(buffer_start));
-
-    write_to_buffer(write_pos_proc,(void*)&startId, sizeof(uint16_t));    
-    write_to_buffer(write_pos_proc,(void*)&startTimeDelta, sizeof(uint32_t));
-    start_proc = start;
-    start_proc.nanoseconds -= 20;
-    write_to_buffer(write_pos_proc,(void*)&start_proc, sizeof(buffer_start));
-
-    //parse *.proc file to get process and irq info
-    if(i == 0){
-      int        lIntID;                 /* Interrupt ID */
-      int        lPID, lPPID;            /* Process PID and Parent PID */
-      char       lName[256];             /* Process name */
-      FILE *          fProc;
-      uint16_t        defaultId;
-      trace_irq_entry irq;
-
-      fProc = fopen(argv[2],"r");
-      if(!fProc){
-       g_error("Unable to open file %s\n", argv[2]);
-      }
-
-      while(fscanf(fProc, "PID: %d; PPID: %d; NAME: %s\n", &lPID, &lPPID, lName) > 0){
-       defaultId = PROCESS_FORK_ID;
-       process.event_data1 = lPID;
-       process.event_data2 = lPPID;
-       write_to_buffer(write_pos_proc,(void*)&defaultId, sizeof(uint16_t));    
-       write_to_buffer(write_pos_proc,(void*)&startTimeDelta, sizeof(uint32_t));
-       write_to_buffer(write_pos_proc,(void*)&process, sizeof(new_process));   
-      }
-
-      while(fscanf(fProc, "IRQ: %d; NAME: ", &lIntID) > 0){
-       /* Read 'til the end of the line */
-       fgets(lName, 200, fProc);
-
-       defaultId =  TRACE_IRQ_ENTRY;
-       irq.irq_id = lIntID;
-       irq.kernel = 1;
-       write_to_buffer(write_pos_intr,(void*)&defaultId, sizeof(uint16_t));    
-       write_to_buffer(write_pos_intr,(void*)&startTimeDelta, sizeof(uint32_t));
-       write_to_buffer(write_pos_intr,(void*)&irq, sizeof(trace_irq_entry));   
-      }
-      fclose(fProc);
+    if(tStart->MinorVersion == 3) {
+      trace_start_2_3* tStart_2_3 = (trace_start_2_3*)tStart;
+      ltt_major_version = tStart_2_3->MajorVersion;
+      ltt_minor_version = tStart_2_3->MinorVersion;
+      ltt_block_size    = tStart_2_3->BufferSize;
+      ltt_log_cpu       = tStart_2_3->LogCPUID;
+      ltt_trace_start_size = sizeof(trace_start_2_3);
+    /* We do not use the flight recorder information for now, because we
+     * never use the .proc file anyway */
     }
+    
+    if(ltt_trace_start_size == 0) 
+      g_error("Minor version unknown : %hu. Supported minors : 2, 3",
+               tStart->MinorVersion);
+
+    block_size = ltt_block_size;//FIXME
+    block_number = file_size/ltt_block_size;
+
+    g_free(buffer);
+    buffer         = g_new(char, ltt_block_size);
+    buf_fac        = g_new(char, block_size);
+    write_pos_fac  = buf_fac;
+    buf_intr       = g_new(char, block_size);
+    write_pos_intr = buf_intr;
+    buf_proc       = g_new(char, block_size);
+    write_pos_proc = buf_proc;
 
-    while(1){
-      int event_size;
-      uint64_t timeDelta;
-      uint8_t  subId;
-
-      if(ltt_log_cpu){
-       cpu_id = *(uint8_t*)cur_pos;
-       cur_pos += sizeof(uint8_t);
-       if(cpu_id != 0 && has_event[cpu_id] == FALSE){
-         has_event[cpu_id] = TRUE;
-         write_to_buffer(write_pos[cpu_id],(void*)&startId,sizeof(uint16_t));
-         write_to_buffer(write_pos[cpu_id],(void*)&startTimeDelta, sizeof(uint32_t));
-         write_to_buffer(write_pos[cpu_id],(void*)&start, sizeof(buffer_start));       
-       }
-      }
+    buf_out = g_new(char, block_size);
+    write_pos = buf_out;
+    sprintf(cpuStr,"%s/%d",foo_cpu,k);
+    fdCpu = open(cpuStr, O_CREAT | O_RDWR | O_TRUNC,S_IRUSR |S_IWUSR | S_IRGRP | S_IROTH); //for cpu k
+    if(fdCpu < 0)  g_error("Unable to open  cpu file %d\n", k);    
+    lseek(fd,0,SEEK_SET);
+    
+    for(i=0;i<block_number;i++){
+      int event_count = 0;
+
+      memset((void*)buf_out, 0, block_size);
+      write_pos = buf_out;
+      memset((void*)buf_intr, 0, block_size);    
+      memset((void*)buf_fac, 0, block_size);    
+      memset((void*)buf_proc, 0, block_size);    
+      write_pos_intr = buf_intr;
+      write_pos_fac = buf_fac;
+      write_pos_proc = buf_proc;
+      
+      memset((void*)buffer,0,ltt_block_size); 
+      readFile(fd,(void*)buffer, ltt_block_size, "Unable to read block header");
+      
+      cur_pos= buffer;
       evId = *(uint8_t *)cur_pos;
-      newId = evId;
-      if(evId == TRACE_HEARTBEAT) {
-       newId = TRACE_HEARTBEAT_ID;
-      }
       cur_pos += sizeof(uint8_t);
+      newId = evId;
       time_delta = *(uint32_t*)cur_pos;
       cur_pos += sizeof(uint32_t); 
-
+      tBufStart = (trace_buffer_start*)cur_pos;
+      cur_pos += sizeof(trace_buffer_start);
+      cur_pos += sizeof(uint16_t); //Skip event size
+
+      startId = newId;
+      startTimeDelta = time_delta;
+      start.seconds = tBufStart->Time.tv_sec;
+      /* usec -> nsec (Mathieu) */
+      start.nanoseconds = tBufStart->Time.tv_usec * 1000;
+      start.block_id = tBufStart->ID;
+      end.block_id = start.block_id;
+      
+      end_pos = buffer + ltt_block_size; //end of the buffer
+      size_lost = *(uint32_t*)(end_pos - sizeof(uint32_t));
+      
+      end_pos = buffer + ltt_block_size - size_lost ; //buffer_end event
       if(ltt_log_cpu){
-       write_to_buffer(write_pos[cpu_id],(void*)&newId,sizeof(uint16_t));
-       write_to_buffer(write_pos[cpu_id],(void*)&time_delta, sizeof(uint32_t));        
-      }else{   
-       write_to_buffer(write_pos[0],(void*)&newId,sizeof(uint16_t));
-       write_to_buffer(write_pos[0],(void*)&time_delta, sizeof(uint32_t));     
+       tBufEnd = (trace_buffer_end*)(end_pos + 2 * sizeof(uint8_t)+sizeof(uint32_t));
+      }else{
+       tBufEnd = (trace_buffer_end*)(end_pos+sizeof(uint8_t)+sizeof(uint32_t));
       }
+      end.seconds = tBufEnd->Time.tv_sec;
+      /* usec -> nsec (Mathieu) */
+      end.nanoseconds = tBufEnd->Time.tv_usec * 1000;
+      // only 32 bits :( 
+      //end.cycle_count = tBufEnd->TSC;
+    
+      //skip buffer start and trace start events
+      if(i==0) {
+        //the first block
+        adaptation_tsc = (uint64_t)tBufStart->TSC;
+             cur_pos = buffer + sizeof(trace_buffer_start) 
+                         + ltt_trace_start_size 
+                         + 2*(sizeof(uint8_t)
+                         + sizeof(uint16_t)+sizeof(uint32_t));
+      } else {
+        //other blocks
+             cur_pos = buffer + sizeof(trace_buffer_start) 
+                         + sizeof(uint8_t)
+                         + sizeof(uint16_t)+sizeof(uint32_t);
+
+        /* Fix (Mathieu) */
+        if(time_delta < (0xFFFFFFFFULL&adaptation_tsc)) {
+          /* Overflow */
+          adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) 
+                                       + 0x100000000ULL 
+                                       + (uint64_t)time_delta;
+        } else {
+          /* No overflow */
+          adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) + time_delta;
+        }
+
+      }
+      start.cycle_count = adaptation_tsc;
+
+      //write start block event
+      write_to_buffer(write_pos,(void*)&startId, sizeof(uint16_t));    
+      write_to_buffer(write_pos,(void*)&startTimeDelta, sizeof(uint32_t));
+      write_to_buffer(write_pos,(void*)&start, sizeof(buffer_start));
       
-      if(evId == TRACE_BUFFER_END){
-       if(ltt_log_cpu){
-         int size, i;
-         if(has_event[i])
-           write_to_buffer(write_pos[cpu_id],(void*)&end,sizeof(buffer_start));
-         for(i=0;i<cpu;i++){
-           if(has_event[i]){
-             size = block_size + ((void*)buf_out[i] - write_pos[i])+ sizeof(uint16_t) + sizeof(uint32_t);
-             write_pos[i] = buf_out[i] + block_size - sizeof(uint32_t);
-             write_to_buffer(write_pos[i],(void*)&size, sizeof(uint32_t));
-             write(fdCpu[i],(void*)buf_out[i], block_size);        
-           }
-         }
-       }else {
-         int size = block_size + ((void*)buf_out[0] - write_pos[0])+ sizeof(uint16_t) + sizeof(uint32_t);
-         write_to_buffer(write_pos[0],(void*)&end,sizeof(buffer_start));   
-         write_pos[0] = buf_out[0] + block_size - sizeof(uint32_t);
-         write_to_buffer(write_pos[0],(void*)&size, sizeof(uint32_t));
-         write(fdCpu[0],(void*)buf_out[0], block_size);
+      //write start block event into processes and interrupts files
+      write_to_buffer(write_pos_intr,(void*)&startId, sizeof(uint16_t));    
+      write_to_buffer(write_pos_intr,(void*)&startTimeDelta, sizeof(uint32_t));
+      start_intr = start;
+      start_intr.nanoseconds -= 20;
+      write_to_buffer(write_pos_intr,(void*)&start_intr, sizeof(buffer_start));
+
+      write_to_buffer(write_pos_proc,(void*)&startId, sizeof(uint16_t));    
+      write_to_buffer(write_pos_proc,(void*)&startTimeDelta, sizeof(uint32_t));
+      start_proc = start;
+      start_proc.nanoseconds -= 40;
+      write_to_buffer(write_pos_proc,(void*)&start_proc, sizeof(buffer_start));
+      
+      //parse *.proc file to get process and irq info
+      if(i == 0){
+       int        lIntID;                 /* Interrupt ID */
+       int        lPID, lPPID;            /* Process PID and Parent PID */
+       char       lName[256];             /* Process name */
+       FILE *          fProc;
+       uint16_t        defaultId;
+       trace_irq_entry irq;
+       
+       fProc = fopen(argv[1],"r");
+       if(!fProc){
+         g_error("Unable to open file %s\n", argv[1]);
        }
-
-       //write out processes and intrrupts files
-       {
-         int size_intr = block_size - (write_pos_intr - (void*)buf_intr);
-         int size_proc = block_size - (write_pos_proc - (void*)buf_proc);
-         write_to_buffer(write_pos_intr,(void*)&newId,sizeof(uint16_t));
-         write_to_buffer(write_pos_intr,(void*)&time_delta, sizeof(uint32_t));     
-         end_intr = end;
-         end_intr.nanoseconds -= 40;
-         write_to_buffer(write_pos_intr,(void*)&end_intr,sizeof(buffer_start));   
-
-         write_to_buffer(write_pos_proc,(void*)&newId,sizeof(uint16_t));
-         write_to_buffer(write_pos_proc,(void*)&time_delta, sizeof(uint32_t));     
-         end_proc = end;
-         end_proc.nanoseconds -= 20;
-         write_to_buffer(write_pos_proc,(void*)&end_proc,sizeof(buffer_start));   
-
-         write_pos_intr = buf_intr + block_size - sizeof(uint32_t);
-         write_pos_proc = buf_proc + block_size - sizeof(uint32_t);
-         write_to_buffer(write_pos_intr,(void*)&size_intr, sizeof(uint32_t));
-         write_to_buffer(write_pos_proc,(void*)&size_proc, sizeof(uint32_t));
-         write(fdIntr,(void*)buf_intr,block_size);       
-         write(fdProc,(void*)buf_proc,block_size);       
+       
+       while(fscanf(fProc, "PID: %d; PPID: %d; NAME: %s\n", &lPID, &lPPID, lName) > 0){
+         defaultId = PROCESS_FORK_ID;
+         process.event_data1 = lPID;
+         process.event_data2 = lPPID;
+         write_to_buffer(write_pos_proc,(void*)&defaultId, sizeof(uint16_t));    
+         write_to_buffer(write_pos_proc,(void*)&startTimeDelta, sizeof(uint32_t));
+         write_to_buffer(write_pos_proc,(void*)&process, sizeof(new_process)); 
        }
-       break;   
+       
+       while(fscanf(fProc, "IRQ: %d; NAME: ", &lIntID) > 0){
+         /* Read 'til the end of the line */
+         fgets(lName, 200, fProc);
+
+         defaultId =  TRACE_IRQ_ENTRY;
+         irq.irq_id = lIntID;
+         irq.kernel = 1;
+         write_to_buffer(write_pos_intr,(void*)&defaultId, sizeof(uint16_t));    
+         write_to_buffer(write_pos_intr,(void*)&startTimeDelta, sizeof(uint32_t));
+         write_to_buffer(write_pos_intr,(void*)&irq, sizeof(trace_irq_entry)); 
+       }
+       fclose(fProc);
       }
 
-      event_count++;
-      switch(evId){
-       case TRACE_SYSCALL_ENTRY:
-         event_size = sizeof(trace_syscall_entry);
-         break;
-       case TRACE_SYSCALL_EXIT:
-         event_size = 0;
-         break;
-       case TRACE_TRAP_ENTRY:
-         event_size = sizeof(trace_trap_entry);
-         break;
-       case TRACE_TRAP_EXIT:
-         event_size = 0;
-         break;
-       case TRACE_IRQ_ENTRY:
-         event_size = sizeof(trace_irq_entry);
-         timeDelta = time_delta;
-         write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t)); 
-         write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
-         write_to_buffer(write_pos_intr,cur_pos, event_size);
-         break;
-       case TRACE_IRQ_EXIT:
-         event_size = 0;
-         timeDelta = time_delta;
-         write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
-         write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
-         break;
-       case TRACE_SCHEDCHANGE:
-         event_size = sizeof(trace_schedchange);
-         break;
-       case TRACE_KERNEL_TIMER:
-         event_size = 0;
-         break;
-       case TRACE_SOFT_IRQ:
-         event_size = sizeof(trace_soft_irq);
-         //      timeDelta = time_delta;
-         //      write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
-         //      write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
-         //      write_to_buffer(write_pos_intr,cur_pos, event_size);
-         break;
-       case TRACE_PROCESS:
-         event_size = sizeof(trace_process);
-         timeDelta = time_delta;
-         subId = *(uint8_t*)cur_pos;
-         if(subId == TRACE_PROCESS_FORK || subId ==TRACE_PROCESS_EXIT){
-           if( subId == TRACE_PROCESS_FORK)tmpId = PROCESS_FORK_ID;
-           else tmpId = PROCESS_EXIT_ID;
-           write_to_buffer(write_pos_proc,(void*)&tmpId, sizeof(uint16_t));
-           write_to_buffer(write_pos_proc,(void*)&timeDelta, sizeof(uint32_t));
-
-           process = *(new_process*)(cur_pos + sizeof(uint8_t));
-           write_to_buffer(write_pos_proc,(void*)&process, sizeof(new_process));
-         } 
-         break;
-       case TRACE_FILE_SYSTEM:
-         event_size = sizeof(trace_file_system)- sizeof(char*);
-         break;
-       case TRACE_TIMER:
-         event_size = sizeof(trace_timer);
-         break;
-       case TRACE_MEMORY:
-         event_size = sizeof(trace_memory);
-         break;
-       case TRACE_SOCKET:
-         event_size = sizeof(trace_socket);
-         break;
-       case TRACE_IPC:
-         event_size = sizeof(trace_ipc);
-         break;
-       case TRACE_NETWORK:
-         event_size = sizeof(trace_network);
-         break;
-       case TRACE_HEARTBEAT:
-         beat_count++;
-         beat.seconds = 0;
-         beat.nanoseconds = 0;
-         beat.cycle_count = start.cycle_count + beat_count * OVERFLOW_FIGURE;
-         event_size = 0;
-
-         end.cycle_count += OVERFLOW_FIGURE;
-
-         write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
-         write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
-         write_to_buffer(write_pos_intr,(void*)&beat, sizeof(heartbeat));                
-         write_to_buffer(write_pos_proc,(void*)&newId, sizeof(uint16_t));
-         write_to_buffer(write_pos_proc,(void*)&timeDelta, sizeof(uint32_t));
-         write_to_buffer(write_pos_proc,(void*)&beat, sizeof(heartbeat));                
-         break;
-        default:
-         event_size = -1;
-         break;
-      }
-      if(evId != TRACE_FILE_SYSTEM && event_size >=0){
+      while(1){
+       int event_size;
+       uint64_t timeDelta;
+       uint8_t  subId;
+       
        if(ltt_log_cpu){
-         write_to_buffer(write_pos[cpu_id], cur_pos, event_size); 
-       }else{
-         write_to_buffer(write_pos[0], cur_pos, event_size); 
+         cpu_id = *(uint8_t*)cur_pos;
+         cur_pos += sizeof(uint8_t);
        }
-       
-       if(evId == TRACE_HEARTBEAT){
-         if(ltt_log_cpu){
-           write_to_buffer(write_pos[cpu_id],(void*)&beat , sizeof(heartbeat));         
-         }else{
-           write_to_buffer(write_pos[0], (void*)&beat, sizeof(heartbeat));               
-         }
+       evId = *(uint8_t *)cur_pos;
+       newId = evId;
+       if(evId == TRACE_HEARTBEAT) {
+         newId = TRACE_HEARTBEAT_ID;
        }
+       cur_pos += sizeof(uint8_t);
+       time_delta = *(uint32_t*)cur_pos;
+       cur_pos += sizeof(uint32_t); 
+
+
+       //write event_id and time_delta
+       write_to_buffer(write_pos,(void*)&newId,sizeof(uint16_t));
+       write_to_buffer(write_pos,(void*)&time_delta, sizeof(uint32_t));     
+
+  /* Fix (Mathieu) */
+  if(time_delta < (0xFFFFFFFFULL&adaptation_tsc)) {
+    /* Overflow */
+    adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) + 0x100000000ULL 
+                                 + (uint64_t)time_delta;
+  } else {
+    /* No overflow */
+    adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) + time_delta;
+  }
 
-       cur_pos += event_size + sizeof(uint16_t); //skip data_size
-      }else if(evId == TRACE_FILE_SYSTEM){
-       size_t nbBytes;
-       char  c = '\0';
-       tFileSys = (trace_file_system*)cur_pos;
-       subId = tFileSys->event_sub_id; 
-       if(subId == TRACE_FILE_SYSTEM_OPEN || subId == TRACE_FILE_SYSTEM_EXEC){
-         nbBytes = tFileSys->event_data2 +1;
-       }else nbBytes = 0;
 
-       if(ltt_log_cpu){
-         write_to_buffer(write_pos[cpu_id], cur_pos, event_size);      
-         cur_pos += event_size + sizeof(char*);
-         if(nbBytes){
-           write_to_buffer(write_pos[cpu_id], cur_pos, nbBytes);       
-         }else{
-           write_to_buffer(write_pos[cpu_id], (void*)&c, 1);
+       if(evId == TRACE_BUFFER_END){
+#if 0
+    /* Fix (Mathieu) */
+    if(time_delta < (0xFFFFFFFFULL&adaptation_tsc)) {
+      /* Overflow */
+     adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) + 0x100000000ULL 
+                                   + (uint64_t)time_delta;
+    } else {
+      /* No overflow */
+      adaptation_tsc = (adaptation_tsc&0xFFFFFFFF00000000ULL) + time_delta;
+    }
+#endif //0
+    end.cycle_count = adaptation_tsc;
+         int size = (void*)buf_out + block_size - write_pos 
+                   - sizeof(buffer_end) - sizeof(uint32_t);
+
+    /* size _lost_ ? */
+    //int size = (void*)buf_out + block_size - write_pos 
+    //            + sizeof(uint16_t) + sizeof(uint32_t);
+    g_assert((void*)write_pos < (void*)buf_out + block_size);
+         write_to_buffer(write_pos,(void*)&end,sizeof(buffer_end));
+         write_pos = buf_out + block_size - sizeof(uint32_t);
+         write_to_buffer(write_pos,(void*)&size, sizeof(uint32_t));
+         write(fdCpu,(void*)buf_out, block_size);
+         
+         //write out processes and intrrupts files
+         {
+           int size_intr = block_size + (void*)buf_intr - write_pos_intr
+                         - sizeof(buffer_end) - sizeof(uint32_t);
+           int size_proc = block_size + (void*)buf_proc - write_pos_proc
+                         - sizeof(buffer_end) - sizeof(uint32_t);
+      //int size_intr = block_size - (write_pos_intr - (void*)buf_intr);
+      //int size_proc = block_size - (write_pos_proc - (void*)buf_proc);
+           write_to_buffer(write_pos_intr,(void*)&newId,sizeof(uint16_t));
+           write_to_buffer(write_pos_intr,(void*)&time_delta, sizeof(uint32_t));     
+           end_intr = end;
+           end_intr.nanoseconds -= 20;
+           write_to_buffer(write_pos_intr,(void*)&end_intr,sizeof(buffer_start));   
+           
+           write_to_buffer(write_pos_proc,(void*)&newId,sizeof(uint16_t));
+           write_to_buffer(write_pos_proc,(void*)&time_delta, sizeof(uint32_t));     
+           end_proc = end;
+           end_proc.nanoseconds -= 40;
+           write_to_buffer(write_pos_proc,(void*)&end_proc,sizeof(buffer_start));   
+
+           write_pos_intr = buf_intr + block_size - sizeof(uint32_t);
+           write_pos_proc = buf_proc + block_size - sizeof(uint32_t);
+           write_to_buffer(write_pos_intr,(void*)&size_intr, sizeof(uint32_t));
+           write_to_buffer(write_pos_proc,(void*)&size_proc, sizeof(uint32_t));
+           //for now don't output processes and interrupt information
+           //    write(fdIntr,(void*)buf_intr,block_size);       
+           //    write(fdProc,(void*)buf_proc,block_size);       
          }
-       }else{
-         write_to_buffer(write_pos[0], cur_pos, event_size);
+         break;   
+       }
+
+       event_count++;
+       switch(evId){
+         case TRACE_SYSCALL_ENTRY:
+           event_size = sizeof(trace_syscall_entry);
+           break;
+         case TRACE_SYSCALL_EXIT:
+           event_size = 0;
+           break;
+         case TRACE_TRAP_ENTRY:
+           event_size = sizeof(trace_trap_entry);
+           break;
+         case TRACE_TRAP_EXIT:
+           event_size = 0;
+           break;
+         case TRACE_IRQ_ENTRY:
+           event_size = sizeof(trace_irq_entry);
+           timeDelta = time_delta;
+           write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t)); 
+           write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
+           write_to_buffer(write_pos_intr,cur_pos, event_size);
+           break;
+         case TRACE_IRQ_EXIT:
+           event_size = 0;
+           timeDelta = time_delta;
+           write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
+           write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
+           break;
+         case TRACE_SCHEDCHANGE:
+           event_size = sizeof(trace_schedchange);
+           break;
+         case TRACE_KERNEL_TIMER:
+           event_size = 0;
+           break;
+         case TRACE_SOFT_IRQ:
+           event_size = sizeof(trace_soft_irq);
+           //    timeDelta = time_delta;
+           //    write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
+           //    write_to_buffer(write_pos_intr,(void*)&timeDelta, sizeof(uint32_t));
+           //    write_to_buffer(write_pos_intr,cur_pos, event_size);
+           break;
+         case TRACE_PROCESS:
+           event_size = sizeof(trace_process);
+           timeDelta = time_delta;
+           subId = *(uint8_t*)cur_pos;
+           if(subId == TRACE_PROCESS_FORK || subId ==TRACE_PROCESS_EXIT){
+             if( subId == TRACE_PROCESS_FORK)tmpId = PROCESS_FORK_ID;
+             else tmpId = PROCESS_EXIT_ID;
+             write_to_buffer(write_pos_proc,(void*)&tmpId, sizeof(uint16_t));
+             write_to_buffer(write_pos_proc,(void*)&timeDelta, sizeof(uint32_t));
+             
+             process = *(new_process*)(cur_pos + sizeof(uint8_t));
+             write_to_buffer(write_pos_proc,(void*)&process, sizeof(new_process));
+           } 
+           break;
+         case TRACE_FILE_SYSTEM:
+           event_size = sizeof(trace_file_system)- sizeof(char*);
+           break;
+         case TRACE_TIMER:
+           event_size = sizeof(trace_timer);
+           break;
+         case TRACE_MEMORY:
+           event_size = sizeof(trace_memory);
+           break;
+         case TRACE_SOCKET:
+           event_size = sizeof(trace_socket);
+           break;
+         case TRACE_IPC:
+           event_size = sizeof(trace_ipc);
+           break;
+         case TRACE_NETWORK:
+           event_size = sizeof(trace_network);
+           break;
+         case TRACE_HEARTBEAT:
+           beat.seconds = 0;
+           beat.nanoseconds = 0;
+           beat.cycle_count = adaptation_tsc;
+           event_size = 0;
+           
+           write_to_buffer(write_pos_intr,(void*)&newId, sizeof(uint16_t));
+           write_to_buffer(write_pos_intr,(void*)&time_delta, sizeof(uint32_t));
+           write_to_buffer(write_pos_intr,(void*)&beat, sizeof(heartbeat));              
+           write_to_buffer(write_pos_proc,(void*)&newId, sizeof(uint16_t));
+           write_to_buffer(write_pos_proc,(void*)&time_delta, sizeof(uint32_t));
+           write_to_buffer(write_pos_proc,(void*)&beat, sizeof(heartbeat));              
+           break;
+          default:
+           event_size = -1;
+           break;
+       }
+       if(evId != TRACE_FILE_SYSTEM && event_size >=0){
+         write_to_buffer(write_pos, cur_pos, event_size); 
+       
+         if(evId == TRACE_HEARTBEAT){
+           write_to_buffer(write_pos, (void*)&beat, sizeof(heartbeat));                  
+         }
+         
+         cur_pos += event_size + sizeof(uint16_t); //skip data_size
+       }else if(evId == TRACE_FILE_SYSTEM){
+         size_t nbBytes;
+         char  c = '\0';
+         tFileSys = (trace_file_system*)cur_pos;
+         subId = tFileSys->event_sub_id;       
+         if(subId == TRACE_FILE_SYSTEM_OPEN || subId == TRACE_FILE_SYSTEM_EXEC){
+           nbBytes = tFileSys->event_data2 +1;
+         }else nbBytes = 0;
+         
+         write_to_buffer(write_pos, cur_pos, event_size);
          cur_pos += event_size + sizeof(char*);
          if(nbBytes){
-           write_to_buffer(write_pos[0], cur_pos, nbBytes);    
+           write_to_buffer(write_pos, cur_pos, nbBytes);       
          }else{
-           write_to_buffer(write_pos[0], (void*)&c, 1);
+           write_to_buffer(write_pos, (void*)&c, 1);
          }
+         cur_pos += nbBytes + sizeof(uint16_t); //skip data_size
+       }else if(event_size == -1){
+         printf("Unknown event: evId=%d, i=%d, event_count=%d\n", newId, i, event_count);
+         exit(1);
        }
-       cur_pos += nbBytes + sizeof(uint16_t); //skip data_size
-      }else if(event_size == -1){
-       printf("Unknown event: evId=%d, i=%d, event_count=%d\n", newId, i, event_count);
-       exit(1);
-      }
-    } //end while(1)
+      } //end while(1)      
+    }
+    close(fd);
+    close(fdCpu);
+    g_free(buffer);
+    buffer = NULL;
+    g_free(buf_fac);
+    g_free(buf_intr);
+    g_free(buf_proc);
+    g_free(buf_out);
   }
 
   
@@ -651,34 +727,34 @@ int main(int argc, char ** argv){
 
 
   //write to system.xml
-  fprintf(fp,"<system\n");
-  fprintf(fp,"node_name=\"%s\"\n", node_name);
-  fprintf(fp,"domainname=\"%s\"\n", domainname);
-  fprintf(fp,"cpu=%d\n", cpu);
-  fprintf(fp,"arch_size=\"%s\"\n", arch_size);
-  fprintf(fp,"endian=\"%s\"\n",endian);
-  fprintf(fp,"kernel_name=\"%s\"\n",kernel_name);
-  fprintf(fp,"kernel_release=\"%s\"\n",kernel_release);
-  fprintf(fp,"kernel_version=\"%s\"\n",kernel_version);
-  fprintf(fp,"machine=\"%s\"\n",machine);
-  fprintf(fp,"processor=\"%s\"\n",processor);
-  fprintf(fp,"hardware_platform=\"%s\"\n",hardware_platform);
-  fprintf(fp,"operating_system=\"%s\"\n",operating_system);
-  fprintf(fp,"ltt_major_version=%d\n",ltt_major_version);
-  fprintf(fp,"ltt_minor_version=%d\n",ltt_minor_version);
-  fprintf(fp,"ltt_block_size=%d\n",ltt_block_size);
+  fprintf(fp,"<system \n");
+  fprintf(fp,"node_name=\"%s\" \n", node_name);
+  fprintf(fp,"domainname=\"%s\" \n", domainname);
+  fprintf(fp,"cpu=\"%d\" \n", cpu);
+  fprintf(fp,"arch_size=\"%s\" \n", arch_size);
+  fprintf(fp,"endian=\"%s\" \n",endian);
+  fprintf(fp,"kernel_name=\"%s\" \n",kernel_name);
+  fprintf(fp,"kernel_release=\"%s\" \n",kernel_release);
+  fprintf(fp,"kernel_version=\"%s\" \n",kernel_version);
+  fprintf(fp,"machine=\"%s\" \n",machine);
+  fprintf(fp,"processor=\"%s\" \n",processor);
+  fprintf(fp,"hardware_platform=\"%s\" \n",hardware_platform);
+  fprintf(fp,"operating_system=\"%s\" \n",operating_system);
+  fprintf(fp,"ltt_major_version=\"%d\" \n",ltt_major_version);
+  fprintf(fp,"ltt_minor_version=\"%d\" \n",ltt_minor_version);
+  fprintf(fp,"ltt_block_size=\"%d\" \n",ltt_block_size);
   fprintf(fp,">\n");
   fprintf(fp,"This is just a test\n");
   fprintf(fp,"</system>\n");
   fflush(fp);
 
-  fclose(fp);
-
   close(fdFac);
   close(fdIntr);
   close(fdProc); 
-  close(fd);
-  for(i=0;i<cpu;i++) close(fdCpu[i]);
+  fclose(fp);
 
+  g_printf("Conversion completed. Don't forget to copy core.xml to eventdefs directory\n");
+  
+  return 0;
 }
 
This page took 0.033077 seconds and 4 git commands to generate.