XML: Implemented a merger of element's contents.

[libucw.git] / lib / sorter / common.h

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index bd24376613a32553979b9402f9b6378c1e46058b..ddd7ba6fadb407ba46803961dca92e1d61e07683 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -16,9 +16,9 @@
 extern uns sorter_trace, sorter_trace_array, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits, sorter_add_radix_bits;
 extern uns sorter_min_multiway_bits, sorter_max_multiway_bits;
-extern uns sorter_threads, sorter_thread_threshold, sorter_thread_chunk;
-extern uns sorter_radix_threshold;
+extern uns sorter_threads;
 extern u64 sorter_bufsize, sorter_small_input;
+extern u64 sorter_thread_threshold, sorter_thread_chunk, sorter_radix_threshold;
 extern struct fb_params sorter_fb_params, sorter_small_fb_params;
 
 #define SORT_TRACE(x...) do { if (sorter_trace) msg(L_DEBUG, x); } while(0)
@@ -122,6 +122,7 @@ void sbuck_swap_out(struct sort_bucket *b);
 /* Contexts and helper functions for the array sorter */
 
 struct asort_context {
+  // Interface between generic code in array.c and functions generated by array.h
   void *array;                         // Array to sort
   void *buffer;                                // Auxiliary buffer (required when radix-sorting)
   uns num_elts;                                // Number of elements in the array
@@ -137,6 +138,11 @@ struct asort_context {
   struct rs_work **rs_works;
   struct work_queue *rs_work_queue;
   struct eltpool *eltpool;
+
+  // Configured limits translated from bytes to elements
+  uns thread_threshold;
+  uns thread_chunk;
+  uns radix_threshold;
 };
 
 void asort_run(struct asort_context *ctx);