extern u64 sorter_bufsize;
#define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)
-#define SORT_XTRACE(x...) do { if (sorter_trace > 1) log(L_DEBUG, x); } while(0)
+#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) log(L_DEBUG, x); } while(0)
enum sort_debug {
SORT_DEBUG_NO_PRESORT = 1,
SORT_DEBUG_NO_JOIN = 2,
SORT_DEBUG_KEEP_BUCKETS = 4,
+ SORT_DEBUG_NO_RADIX = 8,
};
struct sort_bucket;
struct fastbuf *in_fb;
struct fastbuf *out_fb;
uns hash_bits;
+ u64 in_size;
struct mempool *pool;
clist bucket_list;
// Two-way split/merge: merge up to 2 source buckets to up to 2 destination buckets.
// Bucket arrays are NULL-terminated.
void (*twoway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket **outs);
+ // Radix split according to hash function
+ void (*radix_split)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket **outs, uns bitpos, uns numbits);
// State variables of internal_sort
void *key_buf;
int more_keys;
+
+ // Timing
+ u64 start_time;
};
void sorter_run(struct sort_context *ctx);
struct fastbuf *sbuck_read(struct sort_bucket *b);
struct fastbuf *sbuck_write(struct sort_bucket *b);
void sbuck_swap_out(struct sort_bucket *b);
+void format_size(byte *buf, u64 x);
#endif