X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-param.c;h=0180f62b4a66e3a938b8ea86ce81eae8c43e7715;hb=ec085c955731db594926666e9bc6bdbbc1f5be9e;hp=6fc5f27ac2043da3f95c193554ac03f87c0b9698;hpb=14bfa6253d2ae653cb92c244ed490295437518ed;p=libucw.git

diff --git a/lib/fb-param.c b/lib/fb-param.c
index 6fc5f27a..0180f62b 100644
--- a/lib/fb-param.c
+++ b/lib/fb-param.c
@@ -9,19 +9,27 @@
 
 #include "lib/lib.h"
 #include "lib/conf.h"
+#include "lib/lfs.h"
 #include "lib/fastbuf.h"
 
-struct fb_params fbpar_defaults = {
+#include <fcntl.h>
+#include <stdio.h>
+
+struct fb_params fbpar_def = {
   .buffer_size = 65536,
+  .read_ahead = 1,
+  .write_back = 1,
 }; 
 
 struct cf_section fbpar_cf = {
 # define F(x) PTR_TO(struct fb_params, x)
   CF_TYPE(struct fb_params),
   CF_ITEMS {
-    // FIXME
-    CF_LOOKUP("Type", (int *)F(type), ((byte *[]){"std", "direct", "mmap", NULL})),
+    CF_LOOKUP("Type", (int *)F(type), ((char *[]){"std", "direct", "mmap", NULL})),
     CF_UNS("BufSize", F(buffer_size)),
+    CF_UNS("KeepBackBuf", F(keep_back_buf)),
+    CF_UNS("ReadAhead", F(read_ahead)),
+    CF_UNS("WriteBack", F(write_back)),
     CF_END
   }
 # undef F
@@ -29,7 +37,7 @@ struct cf_section fbpar_cf = {
 
 static struct cf_section fbpar_global_cf = {
   CF_ITEMS {
-    CF_SECTION("Defaults", &fbpar_defaults, &fbpar_cf),
+    CF_SECTION("Defaults", &fbpar_def, &fbpar_cf),
     CF_END
   }
 };
@@ -40,62 +48,85 @@ fbpar_global_init(void)
   cf_declare_section("FBParam", &fbpar_global_cf, 0);
 }
 
-struct fastbuf *
-bopen_file(byte *name, int mode, struct fb_params *params)
+static struct fastbuf *
+bopen_fd_internal(int fd, struct fb_params *params, uns mode, const byte *name)
 {
-  params = params ? : &fbpar_defaults;
+  byte buf[32];
+  if (!name)
+    {
+      sprintf(buf, "fd%d", fd);
+      name = buf;
+    }
+  struct fastbuf *fb;
   switch (params->type)
     {
       case FB_STD:
-        return bopen(name, mode, params->buffer_size);
+	fb = bfdopen_internal(fd, name,
+	    params->buffer_size ? : fbpar_def.buffer_size);
+	if (params->keep_back_buf)
+	  bconfig(fb, BCONFIG_KEEP_BACK_BUF, 1);
+	return fb;
       case FB_DIRECT:
-        return fbdir_open(name, mode, NULL);
+	fb = fbdir_open_fd_internal(fd, name, params->asio,
+	    params->buffer_size ? : fbpar_def.buffer_size,
+	    params->read_ahead ? : fbpar_def.read_ahead,
+	    params->write_back ? : fbpar_def.write_back);
+	if (!~mode && !fbdir_cheat && ((int)(mode = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, mode | O_DIRECT)) < 0)
+          msg(L_WARN, "Cannot set O_DIRECT on fd %d: %m", fd);
+	return fb;
+      case FB_MMAP:
+	if (!~mode && (int)(mode = fcntl(fd, F_GETFL)) < 0)
+          die("Cannot get flags of fd %d: %m", fd);
+	return bfmmopen_internal(fd, name, mode);
       default:
 	ASSERT(0);
     }
 }
 
+static struct fastbuf *
+bopen_file_internal(const byte *name, int mode, struct fb_params *params, int try)
+{
+  if (params->type == FB_DIRECT && !fbdir_cheat)
+    mode |= O_DIRECT;
+  if (params->type == FB_MMAP && (mode & O_ACCMODE) == O_WRONLY)
+    mode = (mode & ~O_ACCMODE) | O_RDWR;
+  int fd = sh_open(name, mode, 0666);
+  if (fd < 0)
+    if (try)
+      return NULL;
+    else
+      die("Unable to %s file %s: %m", (mode & O_CREAT) ? "create" : "open", name);
+  struct fastbuf *fb = bopen_fd_internal(fd, params, mode, name);
+  ASSERT(fb);
+  if (mode & O_APPEND)
+    bseek(fb, 0, SEEK_END);
+  return fb;
+}
+
 struct fastbuf *
-bopen_file_try(byte *name, int mode, struct fb_params *params)
+bopen_file(const char *name, int mode, struct fb_params *params)
 {
-  params = params ? : &fbpar_defaults;
-  switch (params->type)
-    {
-      case FB_STD:
-        return bopen_try(name, mode, params->buffer_size);
-      case FB_DIRECT:
-        return fbdir_open_try(name, mode, NULL);
-      default:
-	ASSERT(0);
-    }
+  return bopen_file_internal(name, mode, params ? : &fbpar_def, 0);
+}
+
+struct fastbuf *
+bopen_file_try(const char *name, int mode, struct fb_params *params)
+{
+  return bopen_file_internal(name, mode, params ? : &fbpar_def, 1);
 }
 
 struct fastbuf *
 bopen_fd(int fd, struct fb_params *params)
 {
-  params = params ? : &fbpar_defaults;
-  switch (params->type)
-    {
-      case FB_STD:
-        return bfdopen(fd, params->buffer_size);
-      case FB_DIRECT:
-        return fbdir_open_fd(fd, NULL);
-      default:
-	ASSERT(0);
-    }
+  return bopen_fd_internal(fd, params ? : &fbpar_def, ~0U, NULL);
 }
 
 struct fastbuf *
 bopen_tmp_file(struct fb_params *params)
 {
-  params = params ? : &fbpar_defaults;
-  switch (params->type)
-    {
-      case FB_STD:
-        return bopen_tmp(params->buffer_size);
-      case FB_DIRECT:
-        return fbdir_open_tmp(NULL);
-      default:
-	ASSERT(0);
-    }
+  byte buf[TEMP_FILE_NAME_LEN];
+  temp_file_name(buf);
+  struct fastbuf *fb = bopen_file_internal(buf, O_RDWR | O_CREAT | O_TRUNC, params, 0);
+  bconfig(fb, BCONFIG_IS_TEMP_FILE, 1);
+  return fb;
 }