X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fgovern.c;h=6b4dc696ca06de80d4bce4e3c6067f99133fa647;hb=54833f693e97cc4c3d5b8c28e6816e8d1ce5192e;hp=8380f926572a21f1fc3cf5eb25d186d925569a08;hpb=cff818411879583e66b6985b4179be0e9d4c525c;p=libucw.git

diff --git a/lib/sorter/govern.c b/lib/sorter/govern.c
index 8380f926..6b4dc696 100644
--- a/lib/sorter/govern.c
+++ b/lib/sorter/govern.c
@@ -19,29 +19,27 @@
 
 #define F_BSIZE(b) stk_fsize(sbuck_size(b))
 
-static u64
-sorter_clock(void)
+static void
+sorter_start_timer(struct sort_context *ctx)
 {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (u64)tv.tv_sec * 1000 + tv.tv_usec / 1000;
+  init_timer(&ctx->start_time);
 }
 
 static void
-sorter_start_timer(struct sort_context *ctx)
+sorter_stop_timer(struct sort_context *ctx, uns *account_to)
 {
-  ctx->start_time = sorter_clock();
+  ctx->last_pass_time = get_timer(&ctx->start_time);
+  *account_to += ctx->last_pass_time;
 }
 
 static uns
 sorter_speed(struct sort_context *ctx, u64 size)
 {
-  u64 stop_time = sorter_clock();
   if (!size)
     return 0;
-  if (stop_time <= ctx->start_time)
+  if (!ctx->last_pass_time)
     return -1;
-  return (uns)((double)size / (1<<20) * 1000 / (stop_time-ctx->start_time));
+  return (uns)((double)size / (1<<20) * 1000 / ctx->last_pass_time);
 }
 
 static int
@@ -64,7 +62,10 @@ sbuck_join_to(struct sort_bucket *b)
     return NULL;
 
   struct sort_bucket *out = (struct sort_bucket *) b->n.prev;	// Such bucket is guaranteed to exist
-  return (out->flags & SBF_FINAL) ? out : NULL;
+  if (!(out->flags & SBF_FINAL))
+    return NULL;
+  ASSERT(out->runs == 1);
+  return out;
 }
 
 static void
@@ -106,9 +107,14 @@ sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
       ins[0] = sbuck_new(ctx);
       if (!sorter_presort(ctx, b, ins[0], join ? : ins[0]))
 	{
+	  sorter_stop_timer(ctx, &ctx->total_pre_time);
 	  SORT_XTRACE(((b->flags & SBF_SOURCE) ? 1 : 2), "Sorted in memory");
 	  if (join)
-	    sbuck_drop(ins[0]);
+	    {
+	      ASSERT(join->runs == 2);
+	      join->runs--;
+	      sbuck_drop(ins[0]);
+	    }
 	  else
 	    clist_insert_after(&ins[0]->n, list_pos);
 	  sbuck_drop(b);
@@ -120,6 +126,7 @@ sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
       while (sorter_presort(ctx, b, ins[i], ins[i]))
 	i = 1-i;
       sbuck_drop(b);
+      sorter_stop_timer(ctx, &ctx->total_pre_time);
       SORT_TRACE("Presorting pass (%d+%d runs, %s+%s, %dMB/s)",
 		 ins[0]->runs, ins[1]->runs,
 		 F_BSIZE(ins[0]), F_BSIZE(ins[1]),
@@ -146,6 +153,7 @@ sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
 	ASSERT(join->runs == 2);
 	join->runs--;
 	join_size = sbuck_size(join) - join_size;
+	sorter_stop_timer(ctx, &ctx->total_ext_time);
 	SORT_TRACE("Mergesort pass %d (final run, %s, %dMB/s)", pass, stk_fsize(join_size), sorter_speed(ctx, join_size));
 	sbuck_drop(ins[0]);
 	sbuck_drop(ins[1]);
@@ -155,6 +163,7 @@ sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
     outs[1] = sbuck_new(ctx);
     outs[2] = NULL;
     ctx->twoway_merge(ctx, ins, outs);
+    sorter_stop_timer(ctx, &ctx->total_ext_time);
     SORT_TRACE("Mergesort pass %d (%d+%d runs, %s+%s, %dMB/s)", pass,
 	       outs[0]->runs, outs[1]->runs,
 	       F_BSIZE(outs[0]), F_BSIZE(outs[1]),
@@ -171,13 +180,14 @@ sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
 static uns
 sorter_radix_bits(struct sort_context *ctx, struct sort_bucket *b)
 {
-  if (!b->hash_bits || !ctx->radix_split ||
+  if (!b->hash_bits || b->hash_bits < sorter_min_radix_bits ||
+      !ctx->radix_split ||
       (b->flags & SBF_CUSTOM_PRESORT) ||
       (sorter_debug & SORT_DEBUG_NO_RADIX))
     return 0;
 
   u64 in = sbuck_size(b);
-  u64 mem = ctx->internal_estimate(ctx, b);
+  u64 mem = ctx->internal_estimate(ctx, b) * 0.8;	// FIXME: Magical factor for hash non-uniformity
   if (in <= mem)
     return 0;
 
@@ -193,6 +203,7 @@ sorter_radix(struct sort_context *ctx, struct sort_bucket *b, uns bits)
   uns nbuck = 1 << bits;
   SORT_XTRACE(2, "Running radix split on %s with hash %d bits of %d (expecting %s buckets)",
 	      F_BSIZE(b), bits, b->hash_bits, stk_fsize(sbuck_size(b) / nbuck));
+  sorter_free_buf(ctx);
   sorter_start_timer(ctx);
 
   struct sort_bucket **outs = alloca(nbuck * sizeof(struct sort_bucket *));
@@ -216,6 +227,7 @@ sorter_radix(struct sort_context *ctx, struct sort_bucket *b, uns bits)
 	sbuck_swap_out(outs[i]);
     }
 
+  sorter_stop_timer(ctx, &ctx->total_ext_time);
   SORT_TRACE("Radix split (%d buckets, %s min, %s max, %s avg, %dMB/s)", nbuck,
 	     stk_fsize(min), stk_fsize(max), stk_fsize(sum / nbuck), sorter_speed(ctx, sum));
   sbuck_drop(b);
@@ -228,8 +240,6 @@ sorter_run(struct sort_context *ctx)
   clist_init(&ctx->bucket_list);
   sorter_prepare_buf(ctx);
 
-  /* FIXME: Remember to test sorting of empty files */
-
   // Create bucket containing the source
   struct sort_bucket *bin = sbuck_new(ctx);
   bin->flags = SBF_SOURCE | SBF_OPEN_READ;
@@ -238,10 +248,10 @@ sorter_run(struct sort_context *ctx)
   else
     bin->fb = ctx->in_fb;
   bin->ident = "in";
-  bin->size = ctx->in_size;		/* FIXME: Sizes should be either sh_off_t or u64, not both; beware of ~0U */
+  bin->size = ctx->in_size;
   bin->hash_bits = ctx->hash_bits;
   clist_add_tail(&ctx->bucket_list, &bin->n);
-  SORT_XTRACE(2, "Input size: %s", F_BSIZE(bin));
+  SORT_XTRACE(2, "Input size: %s, %d hash bits", F_BSIZE(bin), bin->hash_bits);
 
   // Create bucket for the output
   struct sort_bucket *bout = sbuck_new(ctx);
@@ -270,5 +280,7 @@ sorter_run(struct sort_context *ctx)
   sorter_free_buf(ctx);
   sbuck_write(bout);		// Force empty bucket to a file
   SORT_XTRACE(2, "Final size: %s", F_BSIZE(bout));
+  SORT_XTRACE(2, "Final timings: %.3fs external sorting, %.3fs presorting, %.3fs internal sorting",
+	      ctx->total_ext_time/1000., ctx->total_pre_time/1000., ctx->total_int_time/1000.);
   ctx->out_fb = sbuck_read(bout);
 }