workqueue: Added non-blocking wait functions.

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

diff --git a/lib/fb-file.c b/lib/fb-file.c
index 169f25e1a027ac858600b3824a7015a12994fbc7..9ef992a8b6bf9cf80f3006a579f4000923ddfbc6 100644 (file)
--- a/lib/fb-file.c
+++ b/lib/fb-file.c
@@ -1,8 +1,7 @@
 /*
 /*

- *     Sherlock Library -- Fast Buffered I/O on Files
+ *     UCW Library -- Fast Buffered I/O on Files

  *
  *     (c) 1997--2004 Martin Mares <mj@ucw.cz>
  *
  *     (c) 1997--2004 Martin Mares <mj@ucw.cz>

- *     (c) 2004 Robert Spalek <robert@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.


@@ -12,7 +11,6 @@
 #include "lib/fastbuf.h"
 #include "lib/lfs.h"
 
 #include "lib/fastbuf.h"
 #include "lib/lfs.h"
 

-#include <stdlib.h>

 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>


@@ -120,20 +118,26 @@ bfdopen_internal(int fd, uns buflen, byte *name)
 }
 
 struct fastbuf *
 }
 
 struct fastbuf *

-bopen(byte *name, uns mode, uns buflen)
+bopen_try(byte *name, uns mode, uns buflen)

 {
 {

-  struct fastbuf *b;
-  int fd;
+  int fd = sh_open(name, mode, 0666);
+  if (fd < 0)
+    return NULL;
+  struct fastbuf *b = bfdopen_internal(fd, buflen, name);
+  if (mode & O_APPEND)
+    bfd_seek(b, 0, SEEK_END);
+  return b;
+}

 
 

+struct fastbuf *
+bopen(byte *name, uns mode, uns buflen)
+{

   if (!buflen)
     return bopen_mm(name, mode);
   if (!buflen)
     return bopen_mm(name, mode);

-  fd = sh_open(name, mode, 0666);
-  if (fd < 0)
+  struct fastbuf *b = bopen_try(name, mode, buflen);
+  if (!b)

     die("Unable to %s file %s: %m",
        (mode & O_CREAT) ? "create" : "open", name);
     die("Unable to %s file %s: %m",
        (mode & O_CREAT) ? "create" : "open", name);

-  b = bfdopen_internal(fd, buflen, name);
-  if (mode & O_APPEND)
-    bfd_seek(b, 0, SEEK_END);

   return b;
 }
 
   return b;
 }
 


@@ -154,6 +158,14 @@ bfdopen_shared(int fd, uns buflen)
   return f;
 }
 
   return f;
 }
 

+void
+bfilesync(struct fastbuf *b)
+{
+  bflush(b);
+  if (fsync(FB_FILE(b)->fd) < 0)
+    log(L_ERROR, "fsync(%s) failed: %m", b->name);
+}
+

 #ifdef TEST
 
 int main(int argc, char **argv)
 #ifdef TEST
 
 int main(int argc, char **argv)