Add Full heartbeat support

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

diff --git a/ltt/branches/poly/ltt/facility.c b/ltt/branches/poly/ltt/facility.c
index 9d342123dcb13f3d3e5e7ad9ca5d6104abd48b19..c313eef1d2b061bfdba091adb816db2f555483f0 100644 (file)
--- a/ltt/branches/poly/ltt/facility.c
+++ b/ltt/branches/poly/ltt/facility.c
@@ -138,7 +138,6 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
       checkNamedTypesImplemented(&fac->named_types);
     
       generateChecksum(fac->name, &checksum, &fac->events);
-  
       if(checksum == f->checksum) {
         generateFacility(f, fac, checksum);
         generated = TRUE;

diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index 5ffca29b3f66b3bf12daa8968b2687f5dc2196bd..d2bacd6f1742b501263484e0994f3af22f036615 100644 (file)
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -60,6 +60,7 @@ enum ltt_core_events {
     LTT_EVENT_FACILITY_LOAD,
     LTT_EVENT_FACILITY_UNLOAD,
     LTT_EVENT_HEARTBEAT,
+    LTT_EVENT_HEARTBEAT_FULL,
     LTT_EVENT_STATE_DUMP_FACILITY_LOAD
 };
 
@@ -131,6 +132,10 @@ struct LttStateDumpFacilityLoad {
 typedef struct _TimeHeartbeat {
 } LTT_PACKED_STRUCT TimeHeartbeat;
 
+typedef struct _TimeHeartbeatFull {
+  guint64 tsc;
+} LTT_PACKED_STRUCT TimeHeartbeatFull;
+
 struct ltt_event_header_hb {
   uint32_t      timestamp;
   unsigned char  facility_id;
@@ -200,6 +205,29 @@ struct ltt_trace_header_0_7 {
   uint64_t        start_time_usec;
 } LTT_PACKED_STRUCT;
 
+/* For version 0.8 */
+
+struct ltt_trace_header_0_8 {
+  uint32_t        magic_number;
+  uint32_t        arch_type;
+  uint32_t        arch_variant;
+  uint32_t        float_word_order;
+  uint8_t         arch_size;
+  uint8_t         major_version;
+  uint8_t         minor_version;
+  uint8_t         flight_recorder;
+  uint8_t         has_heartbeat;
+  uint8_t         has_alignment;  /* Event header alignment */
+  uint8_t         tsc_lsb_truncate;
+  uint8_t         tscbits;
+  uint32_t        freq_scale;
+  uint64_t        start_freq;
+  uint64_t        start_tsc;
+  uint64_t        start_monotonic;
+  uint64_t        start_time_sec;
+  uint64_t        start_time_usec;
+} LTT_PACKED_STRUCT;
+
 
 struct ltt_block_start_header {
   struct { 
@@ -292,7 +320,7 @@ struct _LttField{
                           // (it's variable), then the field_size should be
                           // dynamically calculated while reading the trace
                           // and put here. Otherwise, the field_size always
-                          // equels the type size.
+                          // equals the type size.
   off_t array_offset;     // offset of the beginning of the array (for array
                           // and sequences)
   GArray * dynamic_offsets; // array of offsets calculated dynamically at
@@ -361,6 +389,12 @@ struct _LttTracefile{
                                      // 0 or the architecture size in bytes.
 
   size_t    buffer_header_size;
+  int       compact;                 //compact tracefile ?
+  uint8_t   tsc_lsb_truncate;
+  uint8_t   tscbits;
+  uint8_t   tsc_msb_cutoff;
+  uint64_t  tsc_mask;
+  uint64_t  tsc_mask_next_bit;       //next MSB after the mask
 
   /* Current event */
   LttEvent event;                    //Event currently accessible in the trace
@@ -405,6 +439,7 @@ struct _LttTrace{
   uint64_t  start_monotonic;
   LttTime   start_time;
   LttTime   start_time_from_tsc;
+  GArray    *compact_facilities;
 
   GData     *tracefiles;                    //tracefiles groups
 };

diff --git a/ltt/branches/poly/ltt/trace.h b/ltt/branches/poly/ltt/trace.h
index 0b63c9378aa6193eb966c44a1db97beb8818bf38..ce1c083a0b5b71915016f950d20c954c0733e8cd 100644 (file)
--- a/ltt/branches/poly/ltt/trace.h
+++ b/ltt/branches/poly/ltt/trace.h
@@ -23,7 +23,8 @@
 #include <ltt/ltt.h>
 
 extern GQuark LTT_FACILITY_NAME_HEARTBEAT,
-              LTT_EVENT_NAME_HEARTBEAT;
+              LTT_EVENT_NAME_HEARTBEAT,
+              LTT_EVENT_NAME_HEARTBEAT_FULL;
 
 /* A trace is specified as a pathname to the directory containing all the
    associated data (control tracefiles, per cpu tracefiles, event 

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 72eb3a6efc0a4af46bb0a21859b373666de68dc7..7014869a96551f42f6b802a6e52c726e181ecf34 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -53,7 +53,8 @@
 /* Facility names used in this file */
 
 GQuark LTT_FACILITY_NAME_HEARTBEAT,
-       LTT_EVENT_NAME_HEARTBEAT;
+       LTT_EVENT_NAME_HEARTBEAT,
+       LTT_EVENT_NAME_HEARTBEAT_FULL;
 GQuark LTT_TRACEFILE_NAME_FACILITIES;
 
 #ifndef g_open
@@ -232,6 +233,7 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
     t->ltt_minor_version = any->minor_version;
     t->flight_recorder = any->flight_recorder;
     t->has_heartbeat = any->has_heartbeat;
+    t->compact_facilities = NULL;
   }
  
 
@@ -256,6 +258,47 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
         tf->buffer_header_size =
          sizeof(struct ltt_block_start_header) 
             + sizeof(struct ltt_trace_header_0_7);
+       tf->tsc_lsb_truncate = 0;
+       tf->tscbits = 32;
+       tf->tsc_msb_cutoff = 32 - tf->tsc_lsb_truncate - tf->tscbits;
+       tf->tsc_mask = (1ULL<<32)-1;
+       tf->tsc_mask_next_bit = (1ULL<<32);
+        if(t) {
+          t->start_freq = ltt_get_uint64(LTT_GET_BO(tf),
+                                         &vheader->start_freq);
+          t->freq_scale = ltt_get_uint32(LTT_GET_BO(tf),
+                                         &vheader->freq_scale);
+          t->start_tsc = ltt_get_uint64(LTT_GET_BO(tf),
+                                        &vheader->start_tsc);
+          t->start_monotonic = ltt_get_uint64(LTT_GET_BO(tf),
+                                              &vheader->start_monotonic);
+          t->start_time.tv_sec = ltt_get_uint64(LTT_GET_BO(tf),
+                                       &vheader->start_time_sec);
+          t->start_time.tv_nsec = ltt_get_uint64(LTT_GET_BO(tf),
+                                       &vheader->start_time_usec);
+          t->start_time.tv_nsec *= 1000; /* microsec to nanosec */
+
+          t->start_time_from_tsc = ltt_time_from_uint64(
+              (double)t->start_tsc
+              * (1000000000.0 / tf->trace->freq_scale)
+             / (double)t->start_freq);
+        }
+      }
+      break;
+    case 8:
+      {
+        struct ltt_trace_header_0_8 *vheader =
+          (struct ltt_trace_header_0_8 *)header;
+        tf->buffer_header_size =
+         sizeof(struct ltt_block_start_header) 
+            + sizeof(struct ltt_trace_header_0_8);
+       tf->tsc_lsb_truncate = vheader->tsc_lsb_truncate;
+       tf->tscbits = vheader->tscbits;
+       tf->tsc_msb_cutoff = 32 - tf->tsc_lsb_truncate - tf->tscbits;
+  tf->tsc_mask = ((1ULL << (tf->tscbits))-1);
+  tf->tsc_mask = tf->tsc_mask << tf->tsc_lsb_truncate;
+       tf->tsc_mask_next_bit = (1ULL<<(tf->tscbits));
+       tf->tsc_mask_next_bit = tf->tsc_mask_next_bit << tf->tsc_lsb_truncate;
         if(t) {
           t->start_freq = ltt_get_uint64(LTT_GET_BO(tf),
                                          &vheader->start_freq);
@@ -884,7 +927,11 @@ static int open_tracefiles(LttTrace *trace, gchar *root_path,
                        tmp_tf.tid = tid;
                        tmp_tf.pgid = pgid;
                        tmp_tf.creation = creation;
-
+      if(tmp_tf.name == g_quark_from_string("/compact")
+       || tmp_tf.name == g_quark_from_string("/flight-compact"))
+             tmp_tf.compact = 1;
+      else
+             tmp_tf.compact = 0;
       group = g_datalist_id_get_data(&trace->tracefiles, name);
       if(group == NULL) {
         /* Elements are automatically cleared when the array is allocated.
@@ -1184,10 +1231,13 @@ static int ltt_process_facility_tracefile(LttTracefile *tf)
                                      fac_ids, ltt_fac_ids_destroy);
           }
           g_array_append_val(fac_ids, fac->id);
+         g_debug("fac id : %u", fac->id);
 
           break;
         case LTT_EVENT_HEARTBEAT:
           break;
+        case LTT_EVENT_HEARTBEAT_FULL:
+          break;
         default:
           g_warning("Error in processing facility file %s, "
               "unknown event id %hhu in core facility.",
@@ -1298,6 +1348,11 @@ LttTrace *ltt_trace_open(const gchar *pathname)
     if(ltt_process_facility_tracefile(tf))
       goto facilities_error;
   }
+  t->compact_facilities = ltt_trace_facility_get_by_name(t,
+    g_quark_from_string("compact"));
+  if(!t->compact_facilities)
+    t->compact_facilities = ltt_trace_facility_get_by_name(t,
+      g_quark_from_string("flight-compact"));
   
   return t;
 
@@ -1820,24 +1875,66 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
   /* Read event header */
   
        /* Align the head */
-       pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->has_alignment);
+       if(!tf->compact)
+               pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->has_alignment);
+       else {
+               g_assert(tf->trace->has_heartbeat);
+               pos += ltt_align((size_t)pos, sizeof(uint32_t), tf->has_alignment);
+       }
   
        if(tf->trace->has_heartbeat) {
                event->timestamp = ltt_get_uint32(LTT_GET_BO(tf),
                                                                                                                                                                        pos);
-               /* 32 bits -> 64 bits tsc */
-               /* note : still works for seek and non seek cases. */
-               if(event->timestamp < (0xFFFFFFFFULL&tf->buffer.tsc)) {
-                       tf->buffer.tsc = ((tf->buffer.tsc&0xFFFFFFFF00000000ULL)
-                                                                                                       + 0x100000000ULL)
-                                                                                                                       | (guint64)event->timestamp;
-                       event->tsc = tf->buffer.tsc;
-               } else {
-                       /* no overflow */
-                       tf->buffer.tsc = (tf->buffer.tsc&0xFFFFFFFF00000000ULL) 
-                                                                                                                       | (guint64)event->timestamp;
-                       event->tsc = tf->buffer.tsc;
-               }
+    if(!tf->compact) {
+      /* 32 bits -> 64 bits tsc */
+      /* note : still works for seek and non seek cases. */
+      if(event->timestamp < (0xFFFFFFFFULL&tf->buffer.tsc)) {
+        tf->buffer.tsc = ((tf->buffer.tsc&0xFFFFFFFF00000000ULL)
+                            + 0x100000000ULL)
+                                | (guint64)event->timestamp;
+        event->tsc = tf->buffer.tsc;
+      } else {
+        /* no overflow */
+        tf->buffer.tsc = (tf->buffer.tsc&0xFFFFFFFF00000000ULL) 
+                                | (guint64)event->timestamp;
+        event->tsc = tf->buffer.tsc;
+      }
+    } else {
+      /* Compact header */
+      /* We keep the LSB of the previous timestamp, to make sure
+       * we never go back */
+      event->event_id = event->timestamp >> tf->tscbits;
+      event->event_size = 0xFFFF;
+      printf("Found compact event %d\n", event->event_id);
+      event->timestamp = event->timestamp << tf->tsc_lsb_truncate;
+      event->timestamp = event->timestamp & tf->tsc_mask;
+      printf("timestamp 0x%lX\n", event->timestamp);
+      printf("mask 0x%llX\n", tf->tsc_mask);
+      printf("mask_next 0x%llX\n", tf->tsc_mask_next_bit);
+      printf("previous tsc 0x%llX\n", tf->buffer.tsc);
+      printf("previous tsc&mask 0x%llX\n", tf->tsc_mask&tf->buffer.tsc);
+      printf("previous tsc&(~mask) 0x%llX\n", tf->buffer.tsc&(~tf->tsc_mask));
+      if(event->timestamp < (tf->tsc_mask&tf->buffer.tsc)) {
+        printf("wrap\n");
+        tf->buffer.tsc = ((tf->buffer.tsc&(~tf->tsc_mask))
+                            + tf->tsc_mask_next_bit)
+                                | (guint64)event->timestamp;
+        event->tsc = tf->buffer.tsc;
+      } else {
+        printf("no wrap\n");
+        /* no overflow */
+        tf->buffer.tsc = (tf->buffer.tsc&(~tf->tsc_mask)) 
+                                | (guint64)event->timestamp;
+        event->tsc = tf->buffer.tsc;
+      }
+      printf("current tsc 0x%llX\n", tf->buffer.tsc);
+      g_assert(tf->trace->compact_facilities);
+      /* FIXME : currently does not support unload/load of compact
+       * facility during tracing. Should check for the currently loaded
+       * version of the facility. */
+      g_assert(tf->trace->compact_facilities->len == 1);
+      event->facility_id = g_array_index(tf->trace->compact_facilities, guint, 0);
+    }
                pos += sizeof(guint32);
        } else {
                event->tsc = ltt_get_uint64(LTT_GET_BO(tf), pos);
@@ -1845,22 +1942,27 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
                pos += sizeof(guint64);
        }
        event->event_time = ltt_interpolate_time(tf, event);
-  event->facility_id = *(guint8*)pos;
-  pos += sizeof(guint8);
 
-  event->event_id = *(guint8*)pos;
-  pos += sizeof(guint8);
+  if(!tf->compact) {
+    event->facility_id = *(guint8*)pos;
+    pos += sizeof(guint8);
 
-  event->event_size = ltt_get_uint16(LTT_GET_BO(tf), pos);
-  pos += sizeof(guint16);
-  
+    event->event_id = *(guint8*)pos;
+    pos += sizeof(guint8);
+
+    event->event_size = ltt_get_uint16(LTT_GET_BO(tf), pos);
+    pos += sizeof(guint16);
+  } else {
+    /* Compact event */
+  }
        /* Align the head */
-       pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->has_alignment);
+       if(!tf->compact)
+               pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->has_alignment);
 
   event->data = pos;
 
   /* get the data size and update the event fields with the current
-   * information */
+   * information. Also update the time if a heartbeat_full event is found. */
   ltt_update_event_size(tf);
 
   return 0;
@@ -2006,6 +2108,7 @@ void ltt_update_event_size(LttTracefile *tf)
   off_t size = 0;
   LttFacility *f = ltt_trace_get_facility_by_num(tf->trace, 
                                           tf->event.facility_id);
+  char *tscdata;
  
   if(!f->exists) {
     /* Specific handling of core events : necessary to read the facility control
@@ -2034,6 +2137,15 @@ void ltt_update_event_size(LttTracefile *tf)
       //g_debug("Update Event heartbeat");
       size = sizeof(TimeHeartbeat);
       break;
+    case LTT_EVENT_HEARTBEAT_FULL:
+      //g_debug("Update Event heartbeat full");
+      tscdata = (char*)(tf->event.data);
+      tf->event.tsc = ltt_get_uint64(LTT_GET_BO(tf), tscdata);
+      tf->buffer.tsc = tf->event.tsc;
+      tf->event.event_time = ltt_interpolate_time(tf, &tf->event);
+      size = sizeof(TimeHeartbeatFull);
+      size += ltt_align(size, sizeof(guint64), tf->has_alignment);
+      break;
     default:
       g_warning("Error in getting event size : tracefile %s, "
           "unknown event id %hhu in core facility.",
@@ -3107,6 +3219,7 @@ static void __attribute__((constructor)) init(void)
 {
   LTT_FACILITY_NAME_HEARTBEAT = g_quark_from_string("heartbeat");
   LTT_EVENT_NAME_HEARTBEAT = g_quark_from_string("heartbeat");
+  LTT_EVENT_NAME_HEARTBEAT_FULL = g_quark_from_string("heartbeat_full");
   
   LTT_TRACEFILE_NAME_FACILITIES = g_quark_from_string("/control/facilities");
 }

diff --git a/ltt/branches/poly/lttv/modules/gui/tutorial/.deps/tutorial.Plo b/ltt/branches/poly/lttv/modules/gui/tutorial/.deps/tutorial.Plo
index 9ebcfe539bb2ee9f8cdd92c94b81122a352be77c..23528f4d3d83896f5b64a8f2ed20371e6c15b41f 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/tutorial/.deps/tutorial.Plo
+++ b/ltt/branches/poly/lttv/modules/gui/tutorial/.deps/tutorial.Plo
@@ -2,18 +2,17 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/glib-2.0/glib.h \
-  /usr/include/glib-2.0/glib/galloca.h \
+  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
   /usr/include/glib-2.0/glib/gtypes.h \
   /usr/lib/glib-2.0/include/glibconfig.h \
   /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.4/include/stddef.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.4/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.4/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.4/include/float.h \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/float.h \
   /usr/include/glib-2.0/glib/garray.h \
   /usr/include/glib-2.0/glib/gasyncqueue.h \
   /usr/include/glib-2.0/glib/gthread.h \
@@ -37,7 +36,7 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
   /usr/include/glib-2.0/glib/gstring.h \
   /usr/include/glib-2.0/glib/gunicode.h \
   /usr/include/glib-2.0/glib/gutils.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.4/include/stdarg.h \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/stdarg.h \
   /usr/include/glib-2.0/glib/gkeyfile.h \
   /usr/include/glib-2.0/glib/gmappedfile.h \
   /usr/include/glib-2.0/glib/gmarkup.h \
@@ -102,7 +101,7 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
   /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/glib-2.0/gmodule.h \
+  /usr/include/glib-2.0/gmodule.h \
   /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
   /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
   /usr/include/pango-1.0/pango/pangocairo.h \
@@ -321,7 +320,6 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
   /usr/include/bits/select.h /usr/include/bits/sigset.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   ../../../../ltt/ltt.h ../../../../ltt/time.h ../../../../ltt/compiler.h \
   ../../../../ltt/event.h ../../../../ltt/type.h ../../../../ltt/trace.h \
   ../../../../ltt/facility.h ../../../../lttv/lttv/module.h \
@@ -351,8 +349,6 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/bits/mathcalls.h:
 
-/usr/include/bits/mathinline.h:
-
 /usr/include/glib-2.0/glib.h:
 
 /usr/include/glib-2.0/glib/galloca.h:
@@ -363,11 +359,11 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/glib-2.0/glib/gmacros.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.0.4/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.1.2/include/stddef.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.0.4/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.1.2/include/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.0.4/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.1.2/include/syslimits.h:
 
 /usr/include/limits.h:
 
@@ -379,7 +375,7 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/bits/posix2_lim.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.0.4/include/float.h:
+/usr/lib/gcc/i486-linux-gnu/4.1.2/include/float.h:
 
 /usr/include/glib-2.0/glib/garray.h:
 
@@ -445,7 +441,7 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/glib-2.0/glib/gutils.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.0.4/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.1.2/include/stdarg.h:
 
 /usr/include/glib-2.0/glib/gkeyfile.h:
 
@@ -603,8 +599,6 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/bits/sys_errlist.h:
 
-/usr/include/bits/stdio.h:
-
 /usr/include/glib-2.0/gmodule.h:
 
 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h:
@@ -1087,10 +1081,6 @@ tutorial.lo tutorial.o: tutorial.c /usr/include/math.h \
 
 /usr/include/string.h:
 
-/usr/include/bits/string.h:
-
-/usr/include/bits/string2.h:
-
 ../../../../ltt/ltt.h:
 
 ../../../../ltt/time.h: