]> mj.ucw.cz Git - libucw.git/commitdiff
Fixed a nasty bug in the threaded radix-sorter.
authorMartin Mares <mj@ucw.cz>
Tue, 11 Sep 2007 17:00:43 +0000 (19:00 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 11 Sep 2007 17:00:43 +0000 (19:00 +0200)
lib/sorter/array.c

index 4d64d7580c97d430e4684c7ef8e61844f67a7d81..cb8c7aa79f81f3d33511888aea9bced6f80d2382 100644 (file)
@@ -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;
     }