X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fcommon.h;h=f67f9bf9a1522c26fd9ff84db872d83ac61ade27;hb=7cf300f543b5023ad46a909ed6fde0feba5d1acd;hp=b4b24ab865af01890d71552d368f702a47750389;hpb=14e105850c5d3451a44fc50f2814683c0df3ae1b;p=libucw.git

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index b4b24ab8..f67f9bf9 100644
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -13,8 +13,10 @@
 #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_threads, sorter_thread_threshold, sorter_radix_threshold;
 extern u64 sorter_bufsize;
 extern struct fb_params sorter_fb_params;
 
@@ -27,6 +29,8 @@ enum sort_debug {
   SORT_DEBUG_KEEP_BUCKETS = 4,
   SORT_DEBUG_NO_RADIX = 8,
   SORT_DEBUG_NO_MULTIWAY = 16,
+  SORT_DEBUG_ASORT_NO_RADIX = 32,
+  SORT_DEBUG_ASORT_NO_THREADS = 64
 };
 
 struct sort_bucket;
@@ -113,4 +117,29 @@ struct fastbuf *sbuck_read(struct sort_bucket *b);
 struct fastbuf *sbuck_write(struct sort_bucket *b);
 void sbuck_swap_out(struct sort_bucket *b);
 
+/* Contexts and helper functions for the array sorter */
+
+struct asort_context {
+  void *array;				// Array to sort
+  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 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, 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