X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fsorter%2Fcommon.h;h=db414dd08c6c033e99124ce00b373b68997a3881;hb=99d274d0c99bcf00bc96af0d1e3ceff05c645a28;hp=504afda19090884f685cb699658c3199bb3cf790;hpb=ae3892dc4f3c3a759315969e2ab5156f034707b2;p=libucw.git

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index 504afda1..db414dd0 100644
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -16,9 +16,10 @@
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
 extern u64 sorter_bufsize;
+extern struct fb_params sorter_fb_params;
 
-#define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)
-#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) log(L_DEBUG, x); } while(0)
+#define SORT_TRACE(x...) do { if (sorter_trace) msg(L_DEBUG, x); } while(0)
+#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) msg(L_DEBUG, x); } while(0)
 
 enum sort_debug {
   SORT_DEBUG_NO_PRESORT = 1,
@@ -37,8 +38,8 @@ struct sort_context {
 
   struct mempool *pool;
   clist bucket_list;
-  void *big_buf, *big_buf_half;
-  size_t big_buf_size, big_buf_half_size;
+  void *big_buf;
+  size_t big_buf_size;
 
   int (*custom_presort)(struct fastbuf *dest, void *buf, size_t bufsize);
 
@@ -61,7 +62,9 @@ struct sort_context {
   int more_keys;
 
   // Timing
-  u64 start_time;
+  timestamp_t start_time;
+  uns last_pass_time;
+  uns total_int_time, total_pre_time, total_ext_time;
 };
 
 void sorter_run(struct sort_context *ctx);