X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fsbuck.c;h=7f19f31ef937d1ede7fd98140105c678e4a008e3;hb=dcbe7f152cd2baecd878d8df740d3007357e5d26;hp=515115e282533e9ed00454b23e771ae13c76a4e9;hpb=f3625d622964cf99300ceb7e499b99ebbce9fe69;p=libucw.git

diff --git a/lib/sorter/sbuck.c b/lib/sorter/sbuck.c
index 515115e2..7f19f31e 100644
--- a/lib/sorter/sbuck.c
+++ b/lib/sorter/sbuck.c
@@ -69,15 +69,12 @@ sbuck_swap_in(struct sort_bucket *b)
 {
   if (b->flags & SBF_SWAPPED_OUT)
     {
-      if (sorter_stream_bufsize)	/* FIXME: Needs better configuration, probably semi-automatic one */
-	b->fb = bopen(b->filename, O_RDWR, sorter_stream_bufsize);
-      else
-	b->fb = fbdir_open(b->filename, O_RDWR, NULL);
+      b->fb = bopen_file(b->filename, O_RDWR, b->ctx->fb_params);
       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(2, "Swapped in %s", b->filename);
+      SORT_XTRACE(3, "Swapped in %s", b->filename);
     }
 }
 
@@ -107,10 +104,7 @@ sbuck_write(struct sort_bucket *b)
   else
     {
       ASSERT(!(b->flags & (SBF_OPEN_READ | SBF_DESTROYED)));
-      if (sorter_stream_bufsize)
-	b->fb = bopen_tmp(sorter_stream_bufsize);
-      else
-	b->fb = fbdir_open_tmp(NULL);
+      b->fb = bopen_tmp_file(b->ctx->fb_params);
       if (sorter_debug & SORT_DEBUG_KEEP_BUCKETS)
 	bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 0);
       b->flags |= SBF_OPEN_WRITE;
@@ -130,17 +124,17 @@ sbuck_swap_out(struct sort_bucket *b)
       bclose(b->fb);
       b->fb = NULL;
       b->flags |= SBF_SWAPPED_OUT;
-      SORT_XTRACE(2, "Swapped out %s", b->filename);
+      SORT_XTRACE(3, "Swapped out %s", b->filename);
     }
 }
 
 void
 sorter_prepare_buf(struct sort_context *ctx)
 {
-  u64 bs = MAX(sorter_bufsize/2, 1);
+  u64 bs = sorter_bufsize;
   bs = ALIGN_TO(bs, (u64)CPU_PAGE_SIZE);
-  ctx->big_buf_size = 2*bs;
-  ctx->big_buf_half_size = bs;
+  bs = MAX(bs, 2*(u64)CPU_PAGE_SIZE);
+  ctx->big_buf_size = bs;
 }
 
 void
@@ -149,8 +143,7 @@ sorter_alloc_buf(struct sort_context *ctx)
   if (ctx->big_buf)
     return;
   ctx->big_buf = big_alloc(ctx->big_buf_size);
-  ctx->big_buf_half = ((byte*) ctx->big_buf) + ctx->big_buf_half_size;
-  SORT_XTRACE(2, "Allocated sorting buffer (2*%s)", stk_fsize(ctx->big_buf_half_size));
+  SORT_XTRACE(3, "Allocated sorting buffer (%s)", stk_fsize(ctx->big_buf_size));
 }
 
 void
@@ -160,5 +153,5 @@ sorter_free_buf(struct sort_context *ctx)
     return;
   big_free(ctx->big_buf, ctx->big_buf_size);
   ctx->big_buf = NULL;
-  SORT_XTRACE(2, "Freed sorting buffer");
+  SORT_XTRACE(3, "Freed sorting buffer");
 }