Removed sorter_presort_bufsize, it was no longer used.

[libucw.git] / lib / fb-direct.c

diff --git a/lib/fb-direct.c b/lib/fb-direct.c
index e56d98400332f037dbe08dd042402e1cf0eb2db0..865bbb44a4114aa276d034a66170d8a0eaeefc58 100644 (file)
--- a/lib/fb-direct.c
+++ b/lib/fb-direct.c
@@ -1,7 +1,7 @@
 /*
  *     UCW Library -- Fast Buffered I/O on O_DIRECT Files
  *
 /*
  *     UCW Library -- Fast Buffered I/O on O_DIRECT Files
  *

- *     (c) 2006 Martin Mares <mj@ucw.cz>
+ *     (c) 2006--2007 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.


@@ -20,7 +20,7 @@
  *
  *     FIXME: what if the OS doesn't support O_DIRECT?
  *     FIXME: unaligned seeks and partial writes?
  *
  *     FIXME: what if the OS doesn't support O_DIRECT?
  *     FIXME: unaligned seeks and partial writes?

- *     FIXME: merge with other file-oriented fastbufs
+ *     FIXME: append to unaligned file

  */
 
 #undef LOCAL_DEBUG
  */
 
 #undef LOCAL_DEBUG


@@ -38,16 +38,10 @@
 #include <stdio.h>
 
 uns fbdir_cheat;
 #include <stdio.h>
 
 uns fbdir_cheat;

-static uns fbdir_buffer_size = 65536;
-static uns fbdir_read_ahead = 1;
-static uns fbdir_write_back = 1;

 
 static struct cf_section fbdir_cf = {
   CF_ITEMS {
     CF_UNS("Cheat", &fbdir_cheat),
 
 static struct cf_section fbdir_cf = {
   CF_ITEMS {
     CF_UNS("Cheat", &fbdir_cheat),

-    CF_UNS("BufferSize", &fbdir_buffer_size),
-    CF_UNS("ReadAhead", &fbdir_read_ahead),
-    CF_UNS("WriteBack", &fbdir_write_back),

     CF_END
   }
 };
     CF_END
   }
 };


@@ -63,7 +57,7 @@ enum fbdir_mode {                             // Current operating mode
 struct fb_direct {
   struct fastbuf fb;
   int fd;                                      // File descriptor
 struct fb_direct {
   struct fastbuf fb;
   int fd;                                      // File descriptor

-  int is_temp_file;                            // 0=normal file, 1=temporary file, delete on close, -1=shared FD
+  int is_temp_file;

   struct asio_queue *io_queue;                 // I/O queue to use
   struct asio_queue *user_queue;               // If io_queue was supplied by the user
   struct asio_request *pending_read;
   struct asio_queue *io_queue;                 // I/O queue to use
   struct asio_queue *user_queue;               // If io_queue was supplied by the user
   struct asio_request *pending_read;


@@ -227,15 +221,15 @@ fbdir_seek(struct fastbuf *f, sh_off_t pos, int whence)
 }
 
 static struct asio_queue *
 }
 
 static struct asio_queue *

-fbdir_get_io_queue(void)
+fbdir_get_io_queue(uns buffer_size, uns write_back)

 {
   struct ucwlib_context *ctx = ucwlib_thread_context();
   struct asio_queue *q = ctx->io_queue;
   if (!q)
     {
       q = xmalloc_zero(sizeof(struct asio_queue));
 {
   struct ucwlib_context *ctx = ucwlib_thread_context();
   struct asio_queue *q = ctx->io_queue;
   if (!q)
     {
       q = xmalloc_zero(sizeof(struct asio_queue));

-      q->buffer_size = fbdir_buffer_size;
-      q->max_writebacks = fbdir_write_back;
+      q->buffer_size = buffer_size;
+      q->max_writebacks = write_back;

       asio_init_queue(q);
       ctx->io_queue = q;
     }
       asio_init_queue(q);
       ctx->io_queue = q;
     }


@@ -270,33 +264,28 @@ fbdir_close(struct fastbuf *f)
   if (!F->user_queue)
     fbdir_put_io_queue();
 
   if (!F->user_queue)
     fbdir_put_io_queue();
 

-  switch (F->is_temp_file)
-    {
-    case 1:
-      if (unlink(f->name) < 0)
-       log(L_ERROR, "unlink(%s): %m", f->name);
-    case 0:
-      close(F->fd);
-    }
-
+  bclose_file_helper(f, F->fd, F->is_temp_file);

   xfree(f);
 }
 
 static int
 fbdir_config(struct fastbuf *f, uns item, int value)
 {
   xfree(f);
 }
 
 static int
 fbdir_config(struct fastbuf *f, uns item, int value)
 {

+  int orig;
+

   switch (item)
     {
     case BCONFIG_IS_TEMP_FILE:
   switch (item)
     {
     case BCONFIG_IS_TEMP_FILE:

+      orig = FB_DIRECT(f)->is_temp_file;

       FB_DIRECT(f)->is_temp_file = value;
       FB_DIRECT(f)->is_temp_file = value;

-      return 0;
+      return orig;

     default:
       return -1;
     }
 }
 
 struct fastbuf *
     default:
       return -1;
     }
 }
 
 struct fastbuf *

-fbdir_open_fd_internal(int fd, struct asio_queue *q, byte *name)
+fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uns buffer_size, uns read_ahead UNUSED, uns write_back)

 {
   int namelen = strlen(name) + 1;
   struct fb_direct *F = xmalloc(sizeof(struct fb_direct) + namelen);
 {
   int namelen = strlen(name) + 1;
   struct fb_direct *F = xmalloc(sizeof(struct fb_direct) + namelen);


@@ -310,7 +299,7 @@ fbdir_open_fd_internal(int fd, struct asio_queue *q, byte *name)
   if (q)
     F->io_queue = F->user_queue = q;
   else
   if (q)
     F->io_queue = F->user_queue = q;
   else

-    F->io_queue = fbdir_get_io_queue();
+    F->io_queue = fbdir_get_io_queue(buffer_size, write_back);

   f->refill = fbdir_refill;
   f->spout = fbdir_spout;
   f->seek = fbdir_seek;
   f->refill = fbdir_refill;
   f->spout = fbdir_spout;
   f->seek = fbdir_seek;


@@ -320,43 +309,20 @@ fbdir_open_fd_internal(int fd, struct asio_queue *q, byte *name)
   return f;
 }
 
   return f;
 }
 

-struct fastbuf *
-fbdir_open_try(byte *name, uns mode, struct asio_queue *q)
-{
-  return bopen_file_try(name, mode, &(struct fb_params){ .type = FB_DIRECT, .asio = q });
-}
-
-struct fastbuf *
-fbdir_open(byte *name, uns mode, struct asio_queue *q)
-{
-  return bopen_file(name, mode, &(struct fb_params){ .type = FB_DIRECT, .asio = q });
-}
-
-struct fastbuf *
-fbdir_open_fd(int fd, struct asio_queue *q)
-{
-  return bopen_fd(fd, &(struct fb_params){ .type = FB_DIRECT, .asio = q });
-}
-
-struct fastbuf *
-fbdir_open_tmp(struct asio_queue *q)
-{
-  return bopen_tmp_file(&(struct fb_params){ .type = FB_DIRECT, .asio = q });
-}
-

 #ifdef TEST
 
 #include "lib/getopt.h"
 
 int main(int argc, char **argv)
 {
 #ifdef TEST
 
 #include "lib/getopt.h"
 
 int main(int argc, char **argv)
 {

+  struct fb_params par = { .type = FB_DIRECT };

   struct fastbuf *f, *t;
 
   log_init(NULL);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0)
     die("Hey, whaddya want?");
   struct fastbuf *f, *t;
 
   log_init(NULL);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0)
     die("Hey, whaddya want?");

-  f = (optind < argc) ? fbdir_open(argv[optind++], O_RDONLY, NULL) : fbdir_open_fd(0, NULL);
-  t = (optind < argc) ? fbdir_open(argv[optind++], O_RDWR | O_CREAT | O_TRUNC, NULL) : fbdir_open_fd(1, NULL);
+  f = (optind < argc) ? bopen_file(argv[optind++], O_RDONLY, &par) : bopen_fd(0, &par);
+  t = (optind < argc) ? bopen_file(argv[optind++], O_RDWR | O_CREAT | O_TRUNC, &par) : bopen_fd(1, &par);

 
   bbcopy(f, t, ~0U);
   ASSERT(btell(f) == btell(t));
 
   bbcopy(f, t, ~0U);
   ASSERT(btell(f) == btell(t));