X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fbatchtest.c;h=9b4184bd9cf1b6b628f2d2fe2d0e13213526d536;hb=b91e751bfd4702dd0e73008727b38d9043f609c5;hp=9c6adf9af56509d0a02c1c3808a4b9d38aabe7f1;hpb=9ba3aaaf37afbed48801f7ac2223915b3237a5df;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/batchtest.c b/ltt/branches/poly/lttv/lttv/batchtest.c
index 9c6adf9a..9b4184bd 100644
--- a/ltt/branches/poly/lttv/lttv/batchtest.c
+++ b/ltt/branches/poly/lttv/lttv/batchtest.c
@@ -202,7 +202,7 @@ gboolean count_event(void *hook_data, void __UNUSED__ *call_data)
     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);
+  tfs->cpu, 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);
@@ -316,7 +316,7 @@ static void compute_tracefile(LttTracefile *tracefile, void *hook_data)
   
   g_warning("test %s test", g_quark_to_string(ltt_tracefile_name(tracefile)));
   g_string_printf(filename, "%s.%s.%u.trace", a_dump_tracefiles,
-      mod_name, ltt_tracefile_num(tracefile));
+      mod_name, ltt_tracefile_cpu(tracefile));
   fp = fopen(filename->str, "w");
   if(fp == NULL) g_error("Cannot open %s", filename->str);
   g_string_free(filename, TRUE);
@@ -346,7 +346,7 @@ static void compute_tracefile(LttTracefile *tracefile, void *hook_data)
       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);
+    ltt_tracefile_cpu(tracefile), nb_block, offset);
       g_warning("last time %lu.%lu vs current %lu.%lu",
     previous_time.tv_sec, previous_time.tv_nsec,
     time.tv_sec, time.tv_nsec);
@@ -513,7 +513,7 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
       g_mem_profile();
     }
 
-    lttv_stats_sum_traceset(tscs);
+    lttv_stats_sum_traceset(tscs, ltt_time_infinite);
 
     if(lttv_profile_memory) {
       g_message("Memory summary after summing stats");
@@ -661,17 +661,18 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     g_message("Running test 9 : seek_forward and seek_backward");
     lttv_process_traceset_seek_time(tsc, ltt_time_zero);
 
-    count = lttv_process_traceset_seek_n_forward(tsc, 500, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 500, NULL, NULL, NULL, NULL, NULL, NULL);
     g_assert(count == 500);
     lttv_traceset_context_position_save(tsc, saved_pos);
     t0 = get_time();
-    count = lttv_process_traceset_seek_n_forward(tsc, 150000, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 150000, NULL, NULL, NULL, NULL, NULL, NULL);
     t1 = get_time();
     g_message("Seek forward 150000 events in %g seconds", t1 - t0);
     g_assert(count == 150000);
     t0 = get_time();
     count = lttv_process_traceset_seek_n_backward(tsc, 150000,
-        seek_back_default_offset, lttv_process_traceset_seek_time, NULL);
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
     t1 = get_time();
     g_message("Seek backward 150000 events in %g seconds", t1 - t0);
     g_assert(count == 150000);
@@ -679,19 +680,20 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
       g_warning("Problem with seek_n ! Positions differ. (1)");
     }
     
-    lttv_process_traceset_seek_n_forward(tsc, 500, NULL);
+    lttv_process_traceset_seek_n_forward(tsc, 500, NULL, NULL, NULL, NULL, NULL, NULL);
     lttv_traceset_context_position_save(tsc, saved_pos);
-    lttv_process_traceset_seek_n_forward(tsc, 15000, NULL);
+    lttv_process_traceset_seek_n_forward(tsc, 15000, NULL, NULL, NULL, NULL, NULL, NULL);
     lttv_process_traceset_seek_n_backward(tsc, 15005,
-        seek_back_default_offset, lttv_process_traceset_seek_time, NULL);
-    lttv_process_traceset_seek_n_forward(tsc, 5, NULL);
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
+    lttv_process_traceset_seek_n_forward(tsc, 5, NULL, NULL, NULL, NULL, NULL, NULL);
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos)) {
       g_warning("Problem with seek_n ! Positions differ. (2)");
     }
     
     lttv_process_traceset_seek_time(tsc, ltt_time_infinite);
     
-    count = lttv_process_traceset_seek_n_forward(tsc, 15000, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 15000, NULL, NULL, NULL, NULL, NULL, NULL);
     if(count > 0)
       g_warning("Problem with seek_n ! Forward at end of traceset.");
     
@@ -700,24 +702,39 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     lttv_traceset_context_position_save(tsc, saved_pos);
     t0 = get_time();
     lttv_process_traceset_seek_n_backward(tsc, 300,
-        seek_back_default_offset, lttv_process_traceset_seek_time, NULL);
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
     t1 = get_time();
     g_message("Seek backward 300 events in %g seconds", t1 - t0);
-    count = lttv_process_traceset_seek_n_forward(tsc, 299, NULL);
-    count = lttv_process_traceset_seek_n_forward(tsc, 1, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 299, NULL, NULL, NULL, NULL, NULL, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 1, NULL, NULL, NULL, NULL, NULL, NULL);
 
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos)) {
       g_warning("Problem with seek_n ! Positions differ. (4)");
     }
     
+    lttv_traceset_context_position_save(tsc, saved_pos);
+    t0 = get_time();
+    lttv_process_traceset_seek_n_backward(tsc, 10,
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
+    t1 = get_time();
+    g_message("Seek backward 10 events in %g seconds", t1 - t0);
+    t0 = get_time();
+    count = lttv_process_traceset_seek_n_forward(tsc, 10, NULL, NULL, NULL, NULL, NULL, NULL);
+    t1 = get_time();
+    g_message("Seek forward 10 events in %g seconds", t1 - t0);
+
+   
     /* try a volountary error */
     lttv_process_traceset_seek_time(tsc, ltt_time_infinite);
 
     lttv_traceset_context_position_save(tsc, saved_pos);
     lttv_process_traceset_seek_n_backward(tsc, 301,
-        seek_back_default_offset, lttv_process_traceset_seek_time, NULL);
-    count = lttv_process_traceset_seek_n_forward(tsc, 299, NULL);
-    count = lttv_process_traceset_seek_n_forward(tsc, 1, NULL);
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 299, NULL, NULL, NULL, NULL, NULL, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 1, NULL, NULL, NULL, NULL, NULL, NULL);
 
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos) == 0) {
       g_warning("Problem with seek_n ! Positions _should_ differ. (5)");
@@ -726,11 +743,17 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
     /* Try a seek by closest time : Hint : try this one with and without states
      * computed. */
     lttv_process_traceset_seek_time(tsc, ltt_time_zero);
-    count = lttv_process_traceset_seek_n_forward(tsc, 200000, NULL);
+    count = lttv_process_traceset_seek_n_forward(tsc, 200000, NULL, NULL, NULL, NULL, NULL, NULL);
     lttv_traceset_context_position_save(tsc, saved_pos);
+    t0 = get_time();
     lttv_process_traceset_seek_n_backward(tsc, 100301,
-        seek_back_default_offset, lttv_state_traceset_seek_time_closest, NULL);
-    count = lttv_process_traceset_seek_n_forward(tsc, 100301, NULL);
+        seek_back_default_offset,
+        (seek_time_fct)lttv_state_traceset_seek_time_closest, NULL,
+        NULL, NULL, NULL, NULL, NULL);
+    t1 = get_time();
+    g_message("Seek backward 100301 events (with seek closest) in %g seconds",
+                t1 - t0);
+    count = lttv_process_traceset_seek_n_forward(tsc, 100301, NULL, NULL, NULL, NULL, NULL, NULL);
     
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos)) {
       g_warning("Problem with seek_n with state seek time! Positions differ. (6)");
@@ -746,14 +769,15 @@ static gboolean process_traceset(void __UNUSED__ *hook_data,
       lttv_traceset_context_position_new(tsc);
 
     lttv_process_traceset_seek_time(tsc, ltt_time_zero);
-    lttv_process_traceset_seek_n_forward(tsc, 200000, NULL);
+    lttv_process_traceset_seek_n_forward(tsc, 200000, NULL, NULL, NULL, NULL, NULL, NULL);
     lttv_traceset_context_position_save(tsc, saved_pos);
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos) != 0)
       g_critical("Error in seek position. (1)");
 
     lttv_process_traceset_seek_time(tsc, ltt_time_infinite);
     lttv_process_traceset_seek_n_backward(tsc, 500,
-        seek_back_default_offset, lttv_process_traceset_seek_time, NULL);
+        seek_back_default_offset, lttv_process_traceset_seek_time, NULL,
+        NULL, NULL, NULL, NULL, NULL);
     lttv_traceset_context_position_save(tsc, saved_pos);
 
     if(lttv_traceset_context_ctx_pos_compare(tsc, saved_pos) != 0)