Changeset 149

Timestamp:

06/08/10 04:21:32 (3 years ago)

Author:

faltet

Message:

Added symbol codes for compression flags.

Location:

trunk/src

Files:

• blosc.c (modified) (16 diffs)
• blosc.h (modified) (1 diff)

trunk/src/blosc.c

@@ -30 +30 @@
 
 
+/* Codes for flags */
+#define DOSHUFFLE 0x1
+#define MEMCPYED  0x2
+
 
 /* Minimal buffer size to be compressed */
@@ -84 +88 @@
   int32_t compress;
   int32_t clevel;
-  int32_t shuffle;
+  int32_t doshuffle;
+  int32_t memcpyed;
   int32_t ntbytes;
   uint32_t nbytes;
@@ -144 +149 @@
   size_t typesize = params.typesize;
 
-  if (params.shuffle && (typesize > 1)) {
+  if (params.doshuffle && (typesize > 1)) {
     /* Shuffle this block (this makes sense only if typesize > 1) */
     shuffle(typesize, blocksize, src, tmp);
@@ -216 +221 @@
   uint8_t *_tmp;
   size_t typesize = params.typesize;
-  size_t shuffle = params.shuffle;
-
-  if (shuffle && (typesize > 1)) {
+
+  if (params.doshuffle && (typesize > 1)) {
     _tmp = tmp;
   }
@@ -255 +259 @@
   } /* Closes j < nsplits */
 
-  if (shuffle && (typesize > 1)) {
+  if (params.doshuffle && (typesize > 1)) {
     if ((uintptr_t)dest % 16 == 0) {
       /* 16-bytes aligned dest.  SSE2 unshuffle will work. */
@@ -522 +526 @@
 
 /* The public routine for compression.  See blosc.h for docstrings. */
-unsigned int blosc_compress(int clevel, int shuffle, size_t typesize,
+unsigned int blosc_compress(int clevel, int doshuffle, size_t typesize,
                             size_t nbytes, const void *src, void *dest,
                             size_t maxbytes)
@@ -553 +557 @@
 
   /* Shuffle */
-  if (shuffle != 0 && shuffle != 1) {
+  if (doshuffle != 0 && doshuffle != 1) {
     fprintf(stderr, "`shuffle` parameter must be either 0 or 1!\n");
     return -10;
@@ -588 +592 @@
   ntbytes = _dest - (uint8_t *)dest;
 
-  if (shuffle == 1) {
+  if (doshuffle == 1) {
     /* Shuffle is active */
-    *flags |= 0x1;                         /* bit 0 set to one in flags */
+    *flags |= DOSHUFFLE;                   /* bit 0 set to one in flags */
   }
 
@@ -596 +600 @@
   params.compress = 1;
   params.clevel = clevel;
-  params.shuffle = shuffle;
+  params.doshuffle = doshuffle;
   params.typesize = typesize;
   params.blocksize = blocksize;
@@ -613 +617 @@
   /* Last chance for fitting `src` buffer in `dest` */
   if ((ntbytes == 0) && (nbytes+BLOSC_MAX_OVERHEAD <= maxbytes)) {
-    /* Specify that this buffer is memcpy'ed (bit 2 set to 1 in flags) */
     _dest = (uint8_t *)(dest);
-    _dest[2] = 0x2;
+    /* Specify that this buffer is memcpy'ed */
+    _dest[2] |= MEMCPYED;
     memcpy(dest+BLOSC_MAX_OVERHEAD, src, nbytes);
     ntbytes = nbytes+BLOSC_MAX_OVERHEAD;
@@ -635 +639 @@
   uint8_t version, versionlz;    /* versions for compressed header */
   uint8_t flags;                 /* flags for header */
-  int32_t shuffle = 0;           /* do unshuffle? */
+  int32_t doshuffle = 0;         /* do unshuffle? */
   int32_t ntbytes;               /* the number of uncompressed bytes */
   uint32_t nblocks;              /* number of total blocks in buffer */
@@ -656 +660 @@
 
   /* Check whether this buffer is memcpy'ed */
-  if (flags == 0x2) {
+  if (flags & MEMCPYED) {
     memcpy(dest, src+BLOSC_MAX_OVERHEAD, nbytes);
     return nbytes;
@@ -681 +685 @@
   }
 
-  if ((flags & 0x1) == 1) {
+  if (flags & DOSHUFFLE) {
     /* Input is shuffled.  Unshuffle it. */
-    shuffle = 1;
+    doshuffle = 1;
   }
 
@@ -689 +693 @@
   params.compress = 0;
   params.clevel = 0;            /* specific for compression */
-  params.shuffle = shuffle;
+  params.doshuffle = doshuffle;
   params.typesize = typesize;
   params.blocksize = blocksize;
@@ -730 +734 @@
 /* Return information about a compressed buffer, namely the type size
    (`typesize`), and whether the shuffle filter has been applied or
-   not (`shuffle`).  This function should always succeed. */
+   not (`doshuffle`).  This function should always succeed. */
 void blosc_cbuffer_metainfo(const void *cbuffer, size_t *typesize,
-                            int *shuffle)
+                            int *doshuffle)
 {
   uint8_t *_src = (uint8_t *)(cbuffer);  /* current pos for source buffer */
@@ -747 +751 @@
 
   /* Shuffle info */
-  if ((flags & 0x1) == 1) {
+  if (flags & DOSHUFFLE) {
     /* Input is shuffled.  Unshuffle it. */
-    *shuffle = 1;
+    *doshuffle = 1;
   }
   else {
-    *shuffle = 0;
+    *doshuffle = 0;
   }
 }

trunk/src/blosc.h

@@ -130 +130 @@
   Return information about a compressed buffer, namely the type size
   (`typesize`), and whether the shuffle filter has been applied or not
-  (`shuffle`).  This function should always succeed.
+  (`doshuffle`).  This function should always succeed.
 
 */
 
 void blosc_cbuffer_metainfo(const void *cbuffer, size_t *typesize,
-                            int *shuffle);
+                            int *doshuffle);