#include "lib/mempool.h"
#include "lib/sorter/common.h"
-#include <fcntl.h>
-
-void *
-sorter_alloc(struct sort_context *ctx, uns size)
-{
- return mp_alloc_zero(ctx->pool, size);
-}
-
-struct sort_bucket *
-sbuck_new(struct sort_context *ctx)
-{
- struct sort_bucket *b = sorter_alloc(ctx, sizeof(struct sort_bucket));
- b->ctx = ctx;
- return b;
-}
-
-void
-sbuck_drop(struct sort_bucket *b)
-{
- if (b)
- {
- ASSERT(!(b->flags & SBF_DESTROYED));
- if (b->n.prev)
- clist_remove(&b->n);
- bclose(b->fb);
- bzero(b, sizeof(*b));
- b->flags = SBF_DESTROYED;
- }
-}
-
-sh_off_t
-sbuck_size(struct sort_bucket *b)
-{
- if ((b->flags & SBF_OPEN_WRITE) && !(b->flags & SBF_SWAPPED_OUT))
- return btell(b->fb);
- else
- return b->size;
-}
-
-int
-sbuck_have(struct sort_bucket *b)
-{
- return b && sbuck_size(b);
-}
+#include <string.h>
static int
-sbuck_has_file(struct sort_bucket *b)
-{
- return (b->fb || (b->flags & SBF_SWAPPED_OUT));
-}
-
-static void
-sbuck_swap_in(struct sort_bucket *b)
-{
- if (b->flags & SBF_SWAPPED_OUT)
- {
- b->fb = bopen(b->filename, O_RDWR, sorter_stream_bufsize);
- if (b->flags & SBF_OPEN_WRITE)
- bseek(b->fb, 0, SEEK_END);
- bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 1);
- b->flags &= ~SBF_SWAPPED_OUT;
- SORT_XTRACE("Swapped in %s", b->filename);
- }
-}
-
-struct fastbuf *
-sbuck_read(struct sort_bucket *b)
-{
- sbuck_swap_in(b);
- if (b->flags & SBF_OPEN_READ)
- return b->fb;
- else if (b->flags & SBF_OPEN_WRITE)
- {
- b->size = btell(b->fb);
- b->flags = (b->flags & ~SBF_OPEN_WRITE) | SBF_OPEN_READ;
- brewind(b->fb);
- return b->fb;
- }
- else
- ASSERT(0);
-}
-
-struct fastbuf *
-sbuck_write(struct sort_bucket *b)
-{
- sbuck_swap_in(b);
- if (b->flags & SBF_OPEN_WRITE)
- ASSERT(b->fb);
- else
- {
- ASSERT(!(b->flags & (SBF_OPEN_READ | SBF_DESTROYED)));
- b->fb = bopen_tmp(sorter_stream_bufsize);
- b->flags |= SBF_OPEN_WRITE;
- b->filename = mp_strdup(b->ctx->pool, b->fb->name);
- }
- return b->fb;
-}
-
-void
-sbuck_swap_out(struct sort_bucket *b)
-{
- if ((b->flags & (SBF_OPEN_READ | SBF_OPEN_WRITE)) && b->fb)
- {
- if (b->flags & SBF_OPEN_WRITE)
- b->size = btell(b->fb);
- bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 0);
- bclose(b->fb);
- b->fb = NULL;
- b->flags |= SBF_SWAPPED_OUT;
- SORT_XTRACE("Swapped out %s", b->filename);
- }
-}
-
-void
-sorter_alloc_buf(struct sort_context *ctx)
-{
- if (ctx->big_buf)
- return;
- u64 bs = MAX(sorter_bufsize/2, 1);
- bs = ALIGN_TO(bs, (u64)CPU_PAGE_SIZE);
- ctx->big_buf = big_alloc(2*bs);
- ctx->big_buf_size = 2*bs;
- ctx->big_buf_half = ((byte*) ctx->big_buf) + bs;
- ctx->big_buf_half_size = bs;
- SORT_XTRACE("Allocated sorting buffer (%jd bytes)", (uintmax_t) bs);
-}
-
-void
-sorter_free_buf(struct sort_context *ctx)
-{
- if (!ctx->big_buf)
- return;
- big_free(ctx->big_buf, ctx->big_buf_size);
- ctx->big_buf = NULL;
- SORT_XTRACE("Freed sorting buffer");
-}
-
-static int sorter_presort(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only)
+sorter_presort(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only)
{
- /* FIXME: Mode with no presorting (mostly for debugging) */
sorter_alloc_buf(ctx);
if (in->flags & SBF_CUSTOM_PRESORT)
{
{
// The final bucket doesn't have any file associated yet, so replace
// it with the new bucket.
- SORT_XTRACE("Replaced final bucket");
+ SORT_XTRACE(2, "Replaced final bucket");
b->flags |= SBF_FINAL;
sbuck_drop(join);
}
else
{
- SORT_TRACE("Copying %jd bytes to output file", (uintmax_t) sbuck_size(b));
+ SORT_TRACE("Copying to output file: %s", F_BSIZE(b));
struct fastbuf *src = sbuck_read(b);
struct fastbuf *dest = sbuck_write(join);
bbcopy(src, dest, ~0U);
if (!(sorter_debug & SORT_DEBUG_NO_PRESORT) || (b->flags & SBF_CUSTOM_PRESORT))
{
- SORT_TRACE("Presorting");
+ SORT_XTRACE(2, "Presorting");
ins[0] = sbuck_new(ctx);
if (!sorter_presort(ctx, b, ins[0], join ? : ins[0]))
{
- SORT_XTRACE("Sorted in memory");
+ SORT_TRACE("Sorted in memory");
if (join)
sbuck_drop(ins[0]);
else
}
else
{
- SORT_TRACE("Skipped presorting");
+ SORT_XTRACE(2, "Presorting disabled");
ins[0] = b;
}
- SORT_TRACE("Main sorting");
+ SORT_XTRACE(2, "Main sorting");
+ uns pass = 0;
do {
+ ++pass;
if (ins[0]->runs == 1 && ins[1]->runs == 1 && join)
{
// This is guaranteed to produce a single run, so join if possible
ctx->twoway_merge(ctx, ins, outs);
ASSERT(outs[0]->runs == 2);
outs[0]->runs--;
- SORT_TRACE("Pass done (joined final run)");
+ SORT_TRACE("Mergesort pass %d (final run, %s)", pass, F_BSIZE(outs[0]));
sbuck_drop(ins[0]);
sbuck_drop(ins[1]);
return;
outs[1] = sbuck_new(ctx);
outs[2] = NULL;
ctx->twoway_merge(ctx, ins, outs);
- SORT_TRACE("Pass done (%d+%d runs, %jd+%jd bytes)", outs[0]->runs, outs[1]->runs, (uintmax_t) sbuck_size(outs[0]), (uintmax_t) sbuck_size(outs[1]));
+ SORT_TRACE("Mergesort pass %d (%d+%d runs, %s+%s)", pass, outs[0]->runs, outs[1]->runs, F_BSIZE(outs[0]), F_BSIZE(outs[1]));
sbuck_drop(ins[0]);
sbuck_drop(ins[1]);
memcpy(ins, outs, 3*sizeof(struct sort_bucket *));
sorter_free_buf(ctx);
sbuck_write(bout); // Force empty bucket to a file
- SORT_XTRACE("Final size: %jd", (uintmax_t) sbuck_size(bout));
+ SORT_XTRACE(2, "Final size: %s", F_BSIZE(bout));
ctx->out_fb = sbuck_read(bout);
}