Changeset 64

Timestamp:

04/27/10 12:14:45 (3 years ago)

Author:

faltet

Message:

Added new blosc_free_resources() function to release resources in Blosc.

Location:

branches/threaded/src

Files:

• bench.c (modified) (2 diffs)
• blosc.c (modified) (1 diff)
• blosc.h (modified) (2 diffs)

branches/threaded/src/bench.c

@@ -141 +141 @@
   int fd;
   int status;
-  unsigned int size = 128*1024;   /* Buffer size */
+  unsigned int size = 256*1024;   /* Buffer size */
   unsigned int elsize = 8;        /* Datatype size */
   int rshift = 12;                /* For random data */
-  int nthreads = 1;               /* The number of threads */
+  int nthreads = 4;               /* The number of threads */
   int doshuffle = 1;              /* Shuffle? */
   unsigned char *orig, *round;
@@ -260 +260 @@
     free(dest[i]);
   }
+
+  /* Free blosc resources */
+  blosc_free_resources();
+
   return 0;
 }

branches/threaded/src/blosc.c

@@ -842 +842 @@
 }
 
+
+/* Free possible memory temporaries and thread resources */
+void
+blosc_free_resources(void)
+{
+  int t, rc;
+  void *status;
+
+  /* Release temporaries */
+  if (init_temps_done) {
+    release_temporaries();
+  }
+
+  /* Finish the possible thread pool */
+  if (nthreads > 1 && init_threads_done) {
+    /* Tell all existing threads to end */
+    end_threads = 1;
+    rc = pthread_barrier_wait(&barr_init);
+    if (rc != 0 && rc != PTHREAD_BARRIER_SERIAL_THREAD) {
+      exit(-1);
+    }
+    /* Join exiting threads */
+    for (t=0; t<nthreads; t++) {
+      rc = pthread_join(threads[t], &status);
+      if (rc) {
+        fprintf(stderr, "ERROR; return code from pthread_join() is %d\n", rc);
+        fprintf(stderr, "\tError detail: %s\n", strerror(rc));
+        exit(-1);
+      }
+    }
+
+    /* Release mutex and condition variable objects */
+    pthread_mutex_destroy(&count_mutex);
+
+    /* Barriers */
+    pthread_barrier_destroy(&barr_init);
+    pthread_barrier_destroy(&barr_inter);
+    pthread_barrier_destroy(&barr_finish);
+
+    /* Thread attributes */
+    pthread_attr_destroy(&ct_attr);
+
+    init_threads_done = 0;
+    end_threads = 0;
+  }
+}

branches/threaded/src/blosc.h

@@ -29 +29 @@
 /**
 
-   Initialize a pool of threads for compression/decompression.  If
-   `nthreads` is 1, then the serial version is chosen and a possible
-   previous existing pool is ended.  Returns the previous number of
-   threads.
+  Initialize a pool of threads for compression/decompression.  If
+  `nthreads` is 1, then the serial version is chosen and a possible
+  previous existing pool is ended.  Returns the previous number of
+  threads.
 
 */
@@ -97 +97 @@
 blosc_decompress(const void *src, void *dest, size_t dest_size);
 
+
+/**
+
+  Free possible memory temporaries and thread resources.  Use this
+  when you are not going to use Blosc for a long while.
+
+*/
+
+void
+blosc_free_resources(void);
+
 #endif