Fixed a bug in s-internal, which caused it to write bogus records

[libucw.git] / lib / sorter / array.c

diff --git a/lib/sorter/array.c b/lib/sorter/array.c
index 4d64d7580c97d430e4684c7ef8e61844f67a7d81..e1805245ff4b1a609903fecca20120f7a8014416 100644 (file)
--- a/lib/sorter/array.c
+++ b/lib/sorter/array.c
@@ -332,7 +332,7 @@ rs_radix(struct asort_context *ctx, void *array, void *buffer, uns num_elts, uns
       uns n = cnt[i] - pos;
       if (!n)
        continue;
-      if (n * ctx->elt_size < sorter_thread_threshold)
+      if (n * ctx->elt_size < sorter_thread_threshold || shift < ASORT_MIN_SHIFT)
        {
          struct rs_work *w = ep_alloc(ctx->eltpool);
          w->w.priority = 0;
@@ -437,11 +437,13 @@ asort_run(struct asort_context *ctx)
        {
          ASORT_XTRACE(2, "Decided to use parallel quicksort");
          threaded_quicksort(ctx);
-         return;
        }
+      else
 #endif
-      ASORT_XTRACE(2, "Decided to use sequential quicksort");
-      ctx->quicksort(ctx->array, ctx->num_elts);
+       {
+         ASORT_XTRACE(2, "Decided to use sequential quicksort");
+         ctx->quicksort(ctx->array, ctx->num_elts);
+       }
     }
   else
     {
@@ -453,9 +455,12 @@ asort_run(struct asort_context *ctx)
          threaded_radixsort(ctx, swap);
          return;
        }
+      else
 #endif
-      ASORT_XTRACE(2, "Decided to use sequential radix-sort (swap=%d)", swap);
-      asort_radix(ctx, ctx->array, ctx->buffer, ctx->num_elts, ctx->hash_bits, swap);
+       {
+         ASORT_XTRACE(2, "Decided to use sequential radix-sort (swap=%d)", swap);
+         asort_radix(ctx, ctx->array, ctx->buffer, ctx->num_elts, ctx->hash_bits, swap);
+       }
       if (swap)
        ctx->array = ctx->buffer;
     }