Clean up #undef's.

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

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index f3ff562a54c0411e0e41c11c195da837d7f70555..ad16382a6c732229d494a52914e22aa2d2595c7b 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -16,6 +16,7 @@
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
 extern uns sorter_min_multiway_bits, sorter_max_multiway_bits;
+extern uns sorter_threads, sorter_thread_threshold;
 extern u64 sorter_bufsize;
 extern struct fb_params sorter_fb_params;
 
@@ -123,14 +124,22 @@ struct asort_context {
   void *buffer;                                // Auxiliary buffer (required when radix-sorting)
   uns num_elts;                                // Number of elements in the array
   uns elt_size;                                // Bytes per element
-  uns hash_bits;                       // Remaining bits of hash function
+  uns hash_bits;                       // Remaining bits of the hash function
   uns radix_bits;                      // How many bits to process in a single radix-sort pass
   void (*quicksort)(void *array_ptr, uns num_elts);
-  void (*quicksplit)(void *array_ptr, uns num_elts, uns *leftp, uns *rightp);
+  void (*quicksplit)(void *array_ptr, uns num_elts, int *leftp, int *rightp);
   void (*radix_count)(void *src_ptr, uns num_elts, uns *cnt, uns shift);
   void (*radix_split)(void *src_ptr, void *dest_ptr, uns num_elts, uns *ptrs, uns shift);
+
+  // Used internally by array.c
+  struct rs_work **rs_works;
+  struct work_queue *rs_work_queue;
+  clist rs_bits;
+  struct eltpool *eltpool;
 };
 
 void asort_run(struct asort_context *ctx);
+void asort_start_threads(uns run);
+void asort_stop_threads(void);
 
 #endif