-Wall -Wformat fixes

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

diff --git a/ltt/branches/poly/ltt/convert/convert.c b/ltt/branches/poly/ltt/convert/convert.c
index 722bf5ecc9411608ddfafdee57658bad80c2336c..55efb1536846f0b467d916efb282ad4a6f495366 100644 (file)
--- a/ltt/branches/poly/ltt/convert/convert.c
+++ b/ltt/branches/poly/ltt/convert/convert.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -111,7 +115,7 @@ int main(int argc, char ** argv){
   int  ltt_major_version=0;
   int  ltt_minor_version=0;
   int  ltt_log_cpu;
-  guint ltt_trace_start_size;
+  guint ltt_trace_start_size = 0;
   char buf[BUFFER_SIZE];
   int i, k;
 
@@ -147,9 +151,6 @@ int main(int argc, char ** argv){
   heartbeat beat;
   uint64_t adaptation_tsc;    // (Mathieu)
   uint32_t size_lost;
-  int reserve_size = sizeof(buffer_start) + 
-                     sizeof(buffer_end) + //buffer_end event
-                     sizeof(uint32_t);  //lost size
   int nb_para;
 
   new_process process;
@@ -298,7 +299,7 @@ int main(int argc, char ** argv){
     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",
+      g_error("Trace magic number does not match : %x, should be %x",
                tStart->MagicNumber, TRACER_MAGIC_NUMBER);
     if(tStart->MajorVersion != TRACER_SUP_VERSION_MAJOR)
       g_error("Trace Major number does match : %hu, should be %u",
@@ -314,7 +315,7 @@ int main(int argc, char ** argv){
     end.block_id = start.block_id;
 
 
-    g_printf("Trace version %hu.%hu detected\n",
+    g_message("Trace version %hu.%hu detected\n",
              tStart->MajorVersion,
              tStart->MinorVersion);
     if(tStart->MinorVersion == 2) {
@@ -324,7 +325,20 @@ int main(int argc, char ** argv){
       ltt_block_size    = tStart_2_2->BufferSize;
       ltt_log_cpu       = tStart_2_2->LogCPUID;
       ltt_trace_start_size = sizeof(trace_start_2_2);
-    } else if(tStart->MinorVersion == 3) {
+      /* 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_message("Processing the trace as a 2.3 format\n");
+
+        tStart->MinorVersion = 3;
+      }
+    }
+    
+    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;
@@ -333,11 +347,11 @@ int main(int argc, char ** argv){
       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 */
-    } else {
-      ltt_trace_start_size = 0;
+    }
+    
+    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;
@@ -740,6 +754,8 @@ int main(int argc, char ** argv){
   close(fdProc); 
   fclose(fp);
 
+  g_message("Conversion completed. Don't forget to copy core.xml to eventdefs directory\n");
+  
   return 0;
 }