X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fbatchtest.c;h=8d4be06ea2b0c07afee533ee265af86bc99a605c;hb=728d0c3ea0f5f236770ac2f330dccada59c59366;hp=1db159c5280e280844303ea8e10ee9f44b894966;hpb=e45551ac5b4d6b0da5a5688fa8f9945044dc1049;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/batchtest.c b/ltt/branches/poly/lttv/lttv/batchtest.c
index 1db159c5..8d4be06e 100644
--- a/ltt/branches/poly/lttv/lttv/batchtest.c
+++ b/ltt/branches/poly/lttv/lttv/batchtest.c
@@ -76,6 +76,7 @@ static gboolean
   a_test5,
   a_test6,
   a_test7,
+  a_test8,
   a_test_all;
 
 static GQuark QUARK_BLOCK_START,
@@ -169,19 +170,45 @@ gboolean trace_event(void __UNUSED__ *hook_data, void *call_data)
   LttEvent *e = ltt_tracefile_get_event(tfs->parent.tf);
   ltt_event_position(e, a_event_position);
   ltt_event_position_get(a_event_position, &tf, &nb_block, &offset, &tsc);
-  fprintf(stderr,"Event %s %lu.%09lu [%u %u tsc %llu]\n",
+  fprintf(stderr,"Event %s %lu.%09lu [%u 0x%x tsc %llu]\n",
       g_quark_to_string(ltt_eventtype_name(ltt_event_eventtype(e))),
       tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec,
       nb_block, offset, tsc);
   return FALSE;
 }
 
+static LttTime count_previous_time = { 0, 0 };
 
 gboolean count_event(void *hook_data, void __UNUSED__ *call_data)
 {
+  LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+  LttTracefile *tracefile = tfs->parent.tf;
+  guint nb_block, offset;
+  LttTracefile *tf_pos;
+  guint64 tsc;
+  LttEvent * event = ltt_tracefile_get_event(tracefile);
+  LttTime time;
   guint *pcount = (guint *)hook_data;
 
   (*pcount)++;
+  
+  time = ltt_event_time(event);
+  ltt_event_position(event, a_event_position);
+  ltt_event_position_get(a_event_position, &tf_pos, &nb_block, &offset, &tsc);
+  
+  if(ltt_time_compare(time, count_previous_time) < 0) {
+    g_warning("Time decreasing trace %s tracefile %s cpu %u position %u/0x%x",
+  g_quark_to_string(ltt_trace_name(ltt_tracefile_get_trace(tracefile))),
+  g_quark_to_string(ltt_tracefile_name(tracefile)), 
+  ltt_tracefile_num(tracefile), nb_block, offset);
+    g_warning("last time %lu.%lu vs current %lu.%lu",
+  count_previous_time.tv_sec, count_previous_time.tv_nsec,
+  time.tv_sec, time.tv_nsec);
+  } 
+  count_previous_time = time;
+
+
+
   return FALSE;
 }
 
@@ -314,7 +341,7 @@ static void compute_tracefile(LttTracefile *tracefile, void *hook_data)
         g_quark_to_string(ltt_tracefile_name(tracefile)));
 
     if(ltt_time_compare(time, previous_time) < 0) {
-      g_warning("Time decreasing trace %s tracefile %s cpu %u position %u/%u",
+      g_warning("Time decreasing trace %s tracefile %s cpu %u position %u/0x%x",
     g_quark_to_string(ltt_trace_name(ltt_tracefile_get_trace(tracefile))),
     g_quark_to_string(ltt_tracefile_name(tracefile)), 
     ltt_tracefile_num(tracefile), nb_block, offset);
@@ -426,7 +453,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     lttv_hooks_add(event_hook, count_event, &count, LTTV_PRIO_DEFAULT);
     t = run_one_test(ts, ltt_time_zero, max_time);
     lttv_hooks_remove_data(event_hook, count_event, &count);
-    g_warning(
+    g_message(
         "Processing trace while counting events (%u events in %g seconds)",
 	count, t);
   }
@@ -437,7 +464,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     lttv_state_add_event_hooks(ts);
     t = run_one_test(ts, ltt_time_zero, max_time);
     lttv_state_remove_event_hooks(ts);
-    g_warning("Processing trace while updating state (%g seconds)", t);
+    g_message("Processing trace while updating state (%g seconds)", t);
   }
 
   /* Run through all events computing the state and writing it out 
@@ -477,7 +504,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     lttv_stats_add_event_hooks(tscs);
     t = run_one_test(ts, ltt_time_zero, max_time);
     lttv_stats_remove_event_hooks(tscs);
-    g_warning("Processing trace while counting stats (%g seconds)", t);
+    g_message("Processing trace while counting stats (%g seconds)", t);
 
     if(lttv_profile_memory) {
       g_message("Memory summary after computing stats");
@@ -513,7 +540,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     t = run_one_test(ts, ltt_time_zero, max_time);
     lttv_state_remove_event_hooks(ts);
     lttv_stats_remove_event_hooks(tscs);
-    g_warning(
+    g_message(
         "Processing trace while counting state and stats (%g seconds)", t);
 
     if(lttv_profile_memory) {
@@ -552,7 +579,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     if(a_save_state_copy)
         lttv_hooks_remove_data(event_hook,save_state_copy_event, &save_state);
 
-    g_warning("Processing trace while updating/saving state (%g seconds)", t);
+    g_message("Processing trace while updating/saving state (%g seconds)", t);
 
     if(lttv_profile_memory) {
       g_message("Memory summary after computing/saving state");
@@ -572,7 +599,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
         t = run_one_test(ts, save_state.write_time[j], 
             save_state.write_time[j]);
         lttv_state_remove_event_hooks(ts);
-        g_warning("Seeking to %lu.%lu (%g seconds)", 
+        g_message("Seeking to %lu.%lu (%g seconds)", 
             save_state.write_time[j].tv_sec, save_state.write_time[j].tv_nsec,
             t);
 
@@ -592,6 +619,36 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     }
   }
 
+  /* Seek at specified interval, using states computed in 6, making
+   * sure that there is no more than the number of events between
+   * state save interval to read before getting there.
+   */
+
+  if((a_test8 && a_test6) || a_test_all) {
+    g_message("Running test 8 : check save interval");
+    LttTime time = tc->time_span.start_time;
+    LttTime interval;
+    interval.tv_sec = 0;
+    interval.tv_nsec = 175674987;
+    guint count;
+
+    while(ltt_time_compare(time, tc->time_span.end_time) < 0) {
+      //g_message("Seeking at time %u.%u", time.tv_sec, time.tv_nsec);
+      lttv_process_traceset_seek_time(&ts->parent, ltt_time_zero);
+      lttv_state_traceset_seek_time_closest(ts, time);
+      /* We add no hook to the traceset, not necessary */
+      count = lttv_process_traceset_middle(&ts->parent,
+          time, G_MAXUINT, NULL);
+      g_info("Number of events to jump over : %u", count);
+      
+      if(count > LTTV_STATE_SAVE_INTERVAL)
+        g_warning("Oops! Save interval is %u and it took %u events to seek to a time %lu.%lu supposed to be closer from the last saved state.",
+            LTTV_STATE_SAVE_INTERVAL, count, time.tv_sec, time.tv_nsec);
+      time = ltt_time_add(time, interval);
+    }
+
+  }
+
   if(a_trace_event) lttv_hooks_remove_data(event_hook, trace_event, NULL);
 
   g_free(save_state.write_time);
@@ -697,6 +754,10 @@ static void init()
   lttv_option_add("test7", '7', "Test seeking to positions written out in 3", 
       "", LTTV_OPT_NONE, &a_test7, NULL, NULL);
 
+  a_test8 = FALSE;
+  lttv_option_add("test8", '8', "Test seeking to positions using saved states computed at 6 : check if number of events fits", 
+      "", LTTV_OPT_NONE, &a_test8, NULL, NULL);
+
   a_test_all = FALSE;
   lttv_option_add("testall", 'a', "Run all tests ", "", 
       LTTV_OPT_NONE, &a_test_all, NULL, NULL);
@@ -771,6 +832,7 @@ static void destroy()
   lttv_option_remove("test5");
   lttv_option_remove("test6");
   lttv_option_remove("test7");
+  lttv_option_remove("test8");
   lttv_option_remove("testall");
 
   lttv_hooks_destroy(before_traceset);