Made radix-sorting threshold configurable and let radix-tune-bits

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

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index f3ff562a54c0411e0e41c11c195da837d7f70555..f67f9bf9a1522c26fd9ff84db872d83ac61ade27 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -13,9 +13,10 @@
 #include "lib/clists.h"
 
 /* Configuration, some of the variables are used by the old sorter, too. */
 #include "lib/clists.h"
 
 /* Configuration, some of the variables are used by the old sorter, too. */

-extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
+extern uns sorter_trace, 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_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, sorter_radix_threshold;

 extern u64 sorter_bufsize;
 extern struct fb_params sorter_fb_params;
 
 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
   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);
   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);
   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_run(struct asort_context *ctx);

+void asort_start_threads(uns run);
+void asort_stop_threads(void);

 
 #endif
 
 #endif