Changeset 29812

Timestamp:

Nov 23, 2010, 1:48:00 PM (15 years ago)

Author:

eugene

Message:

update psMetadataConfigWrite and psSlurp to support I/O compresion

Location:

branches/eam_branches/ipp-20101103/psLib/src

Files:

• sys/psSlurp.c (modified) (5 diffs)
• sys/psSlurp.h (modified) (2 diffs)
• types/psMetadataConfig.c (modified) (2 diffs)
• types/psMetadataConfig.h (modified) (2 diffs)

branches/eam_branches/ipp-20101103/psLib/src/sys/psSlurp.c

@@ -27 +27 @@
 #include "psMemory.h"
 
-#define SLURP_SIZE 4096
+# define SLURP_SIZE 4096
+
+# if (PS_SLURP_GZIP) 
+
+psString psSlurpFD(int fd) {
+
+ gzFile file = gzdopen (fd, "r");
+ if (file == Z_NULL) {
+     psError(PS_ERR_IO, true, "Failed to open file\n");
+     return NULL;
+ }
+ 
+ psString str = psSlurpGZIP(file);
+
+ return str;
+}
+
+# else
 
 psString psSlurpFD(int fd)
@@ -59 +76 @@
     return str;
 }
+# endif
 
+# if (PS_SLURP_GZIP)
+psString psSlurpGZIP(gzFile fd)
+{
+    psString str = NULL;                // String to which to write
+    size_t size  = 1;                   // bytes allocated -  make sure there is room for '\0'
+    size_t used = 0;                    // bytes actually used
+    ssize_t bytes;                      // Number of bytes read
+    do {
+        // increase the allocated string size
+        size += SLURP_SIZE;
+        str = psStringRealloc(str, size);
+
+        // read a block from the stream
+        bytes = gzread(fd, str + used, SLURP_SIZE);
+        if (bytes < 0) {
+            // it's an error
+            psError(PS_ERR_IO, true, "slurp failed on read");
+            psFree(str);
+            return NULL;
+        }
+
+        // Increase the size of the known string
+        used += bytes;
+
+    } while (bytes != 0);
+
+    // append '\0' to the end of the string
+    str[used] = '\0';
+
+    return str;
+}
+# endif
 
 psString psSlurpFile(FILE *stream)
@@ -70 +120 @@
 {
     PS_ASSERT_PTR_NON_NULL(filename, NULL);
+    
+# if (PS_SLURP_GZIP)
+    gzFile fd = gzopen(filename, "r");
+    if (fd == Z_NULL) {
+        psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+        return NULL;
+    }
+    psString text = psSlurpGZIP(fd);
+
+    if (gzclose(fd) != Z_OK) {
+        psError(PS_ERR_IO, true, "Failed to close specified file, %s\n", filename);
+        psFree(text);
+        return NULL;
+    }
+
+# else
 
     int fd = open(filename, O_RDONLY);
@@ -76 +142 @@
         return NULL;
     }
-
     psString text = psSlurpFD(fd);
 
@@ -84 +149 @@
         return NULL;
     }
+# endif
 
     return text;

branches/eam_branches/ipp-20101103/psLib/src/sys/psSlurp.h

@@ -12 +12 @@
 
 #include <psString.h>
+
+# define PS_SLURP_GZIP 1
+
+# if (PS_SLURP_GZIP) 
+# include <zlib.h>
+# endif
 
 /// @addtogroup FileIO Input/Output
@@ -31 +37 @@
                     );
 
+# if (PS_SLURP_GZIP)
+psString psSlurpGZIP(gzFile fd);
+# endif
+
 /// @}
 #endif

branches/eam_branches/ipp-20101103/psLib/src/types/psMetadataConfig.c

@@ -1630 +1630 @@
 }
 
-
+# if (PS_SLURP_GZIP)
 bool psMetadataConfigWrite(psMetadata *md,
-                           const char *filename)
+                           const char *filename, const char *compress)
 {
     PS_ASSERT_METADATA_NON_NULL(md, NULL);
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
-    FILE *file;
-    if ( !(file = fopen(filename, "w")) ) {
-        psError(PS_ERR_IO, true,
-                "Failed to open specified file, %s\n", filename);
-        return false;
-    }
+
+    char modeString[4];
+
+    if (compress) {
+        if (strlen(compress) > 2) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "invalid compression options %s", compress);
+            return false;
+        }
+        snprintf (modeString, 4, "w%s", compress);
+    } else {
+        strcpy (modeString, "w");
+    }   
+
+    gzFile file = gzopen(filename, modeString);
+    if (file == Z_NULL) {
+        psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+        return false;
+    }
+
     psString fileString = NULL;
     fileString = psMetadataConfigFormat(md);
     if (fileString == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, false,
-                "psMetadataConfigFormat returned NULL.\n");
-        return false;
-    }
-    if (fprintf(file, "%s", fileString) != strlen(fileString)) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
+        return false;
+    }
+
+    int nbytes = gzwrite (file, fileString, strlen(fileString));
+    if (nbytes != strlen(fileString)) {
+        psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
+        psFree(fileString);
+        gzclose(file);
+        return false;
+    }
+    psFree(fileString);
+    if (gzclose(file) != Z_OK) {
+        psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+        return false;
+    }
+    return true;
+}
+
+# else
+
+bool psMetadataConfigWrite(psMetadata *md,
+                           const char *filename, const char *compress)
+{
+    PS_ASSERT_METADATA_NON_NULL(md, NULL);
+    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
+
+    FILE *file = fopen(filename, "w");
+    if (file == NULL) {
+        psError(PS_ERR_IO, true,
+                "Failed to open specified file, %s\n", filename);
+        return false;
+    }
+
+    psString fileString = NULL;
+    fileString = psMetadataConfigFormat(md);
+    if (fileString == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
+        return false;
+    }
+
+    int nbytes = fwrite(fileString, 1, strlen(fileString), file);
+    if (nbytes != strlen(fileString)) {
         psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
         psFree(fileString);
@@ -1657 +1708 @@
     psFree(fileString);
     if (fclose(file) == EOF) {
-        psError(PS_ERR_IO, true,
-                "Failed to close file, %s\n", filename);
+        psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
         return false;
     }
     return true;
 }
+# endif /* PS_SLURP_GZIP */
 
 bool psMetadataConfigPrint(FILE *stream,

branches/eam_branches/ipp-20101103/psLib/src/types/psMetadataConfig.h

@@ -33 +33 @@
  *  a string, the formatting command must also be for a string. If the
  *  metadata type is any other data type, printing is not allowed.
+ *  Currently, this function does not compress the output file
  *
  * @return psMetadataItem* :    Pointer metadata item.
@@ -85 +86 @@
 bool psMetadataConfigWrite(
     psMetadata *md,                    ///< The metadata to convert
-    const char *filename               ///< Name of file to write
+    const char *filename,              ///< Name of file to write
+    const char *compress               ///< Output compression options 
 );
 
 /** Converts a psMetadata structure (including any nested psMetadata) into a
  *  configuration file formatted string that is written a file stream.
+ *  Currently, this function does not compress the output file
  *
  *  @return bool:       True if successful, otherwise false.