Changeset baef9df for lib

Timestamp:

04/20/10 14:08:27 (12 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5b8f9ee

Parents:

8ed31c2

Message:

Add back support for opening files for write with arbitary flags

Location:

lib

Files:

• iow-stdio.c (modified) (5 diffs)
• wandio.c (modified) (7 diffs)
• wandio.h (modified) (2 diffs)

lib/iow-stdio.c

@@ -59 +59 @@
 #define DATA(iow) ((struct stdiow_t *)((iow)->data))
 
-static int safe_open(const char *filename)
+static int safe_open(const char *filename, int flags)
 {
         int fd;
@@ -65 +65 @@
 #ifdef O_DIRECT
         fd = open(filename,
-                O_WRONLY
+                flags
+                |O_WRONLY
                 |O_CREAT
                 |O_TRUNC
@@ -75 +76 @@
 /* If that failed (or we don't support O_DIRECT) try opening without */
         fd = open(filename,
-                O_WRONLY
+                flags
+                |O_WRONLY
                 |O_CREAT
                 |O_TRUNC,
@@ -84 +86 @@
 }
 
-iow_t *stdio_wopen(const char *filename)
+iow_t *stdio_wopen(const char *filename,int flags)
 {
         iow_t *iow = malloc(sizeof(iow_t));
@@ -93 +95 @@
                 DATA(iow)->fd = 1; /* STDOUT */
         else {
-                DATA(iow)->fd = safe_open(filename);
+                DATA(iow)->fd = safe_open(filename, flags);
         }
 

lib/wandio.c

@@ -112 +112 @@
 #define READ_TRACE 0
 #define WRITE_TRACE 0
+#define PIPELINE_TRACE 0
+
+#if PIPELINE_TRACE
+#define DEBUG_PIPELINE(x) fprintf(stderr,"PIPELINE: %s\n",x)
+#else
+#define DEBUG_PIPELINE(x) 
+#endif
 
 io_t *wandio_create(const char *filename)
@@ -121 +128 @@
          * the file */
 
+        DEBUG_PIPELINE("stdio");
+        DEBUG_PIPELINE("peek");
         io_t *io = peek_open(stdio_open(filename));
         char buffer[1024];
@@ -130 +139 @@
         /* Auto detect gzip compressed data */
         if (len>=2 && buffer[0] == '\037' && buffer[1] == '\213') { 
+                DEBUG_PIPELINE("zlib");
                 io = zlib_open(io);
         }
         /* Auto detect compress(1) compressed data (gzip can read this) */
         if (len>=2 && buffer[0] == '\037' && buffer[1] == '\235') {
+                DEBUG_PIPELINE("zlib");
                 io = zlib_open(io);
         }
@@ -140 +151 @@
         /* Auto detect bzip compressed data */
         if (len>=3 && buffer[0] == 'B' && buffer[1] == 'Z' && buffer[2] == 'h') { 
+                DEBUG_PIPELINE("bzip");
                 io = bz_open(io);
         }
@@ -147 +159 @@
          * to read the data */
 
-        if (use_threads)
+        if (use_threads) {
+                DEBUG_PIPELINE("thread");
                 io = thread_open(io);
+        }
         
+        DEBUG_PIPELINE("peek");
         return peek_open(io);
 }
@@ -174 +189 @@
 { 
         off_t ret;
+        ret=io->source->read(io,buffer,len); 
 #if READ_TRACE
-        fprintf(stderr,"read(%s): %d bytes\n",io->source->name, (int)len);
-#endif
-        ret=io->source->read(io,buffer,len); 
+        fprintf(stderr,"%p: read(%s): %d bytes = %d\n",io,io->source->name, (int)len,(int)ret);
+#endif
         return ret;
 }
@@ -207 +222 @@
         assert ( compression_level >= 0 && compression_level <= 9 );
 
-        iow=stdio_wopen(filename);
+        iow=stdio_wopen(filename, flags);
 
         /* We prefer zlib if available, otherwise we'll use bzip. If neither

lib/wandio.h

@@ -60 +60 @@
         const char *ext;
         /** Internal type identifying the compression method */
-        int compress_flag;
+        int compress_type;
 };
 
@@ -187 +187 @@
 iow_t *lzo_wopen(iow_t *child, int compress_level);
 iow_t *thread_wopen(iow_t *child);
-iow_t *stdio_wopen(const char *filename);
+iow_t *stdio_wopen(const char *filename, int fileflags);
 
 /* @} */