pcu: assert -> PCU_ALWAYS_ASSERT

SCOREC · Mar 8, 2017 · dba270e · dba270e
1 parent f27f64f
commit dba270e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/pcu/pcu_aa.c b/pcu/pcu_aa.c
@@ -18,7 +18,8 @@
 */
 
 #include <stdlib.h>
-#include <assert.h>
+#include <stdio.h>
+#include "pcu_util.h"
 #include "pcu_aa.h"
 
 static pcu_aa_node pcu_aa_bottom = 
@@ -99,7 +100,7 @@ struct remove_vars
 
 static void remove_successor(pcu_aa_tree* t, struct remove_vars* v)
 {
-  assert(*t);
+  PCU_ALWAYS_ASSERT(*t);
   if (*t != &pcu_aa_bottom)
   { /* search down the tree and set pointers last and deleted */
     v->last = *t;

diff --git a/pcu/pcu_io.c b/pcu/pcu_io.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
+#include "pcu_util.h"
 #include <sys/types.h>
 #include <limits.h>
 
@@ -70,20 +70,20 @@ static void compressed_read(pcu_file* pf, void* data, size_t size)
   int bzerror;
   int len;
   int rv;
-  assert(size < INT_MAX);
+  PCU_ALWAYS_ASSERT(size < INT_MAX);
   len = size;
   rv = BZ2_bzRead(&bzerror, pf->bzf, data, len);
   if (bzerror != BZ_OK && bzerror != BZ_STREAM_END)
     reel_fail("BZ2_bzRead failed with code %d", bzerror);
-  assert(rv == len);
+  PCU_ALWAYS_ASSERT(rv == len);
 }
 
 static void compressed_write(pcu_file* pf, void const* data, size_t size)
 {
   int bzerror;
   int len;
   void* bzip2_is_not_const_correct;
-  assert(size < INT_MAX);
+  PCU_ALWAYS_ASSERT(size < INT_MAX);
   len = size;
   bzip2_is_not_const_correct = (void*)data;
   BZ2_bzWrite(&bzerror, pf->bzf, bzip2_is_not_const_correct, len);
@@ -272,14 +272,14 @@ static void pcu_swap_64(uint32_t* p)
 
 void pcu_swap_unsigneds(unsigned* p, size_t n)
 {
-  assert(sizeof(unsigned)==4);
+  PCU_ALWAYS_ASSERT(sizeof(unsigned)==4);
   for (size_t i=0; i < n; ++i)
     pcu_swap_32(p++);
 }
 
 void pcu_swap_doubles(double* p, size_t n)
 {
-  assert(sizeof(double)==8);
+  PCU_ALWAYS_ASSERT(sizeof(double)==8);
   for (size_t i=0; i < n; ++i)
     pcu_swap_64((uint32_t*)(p++));
 }
@@ -288,7 +288,7 @@ void pcu_write_unsigneds(pcu_file* f, unsigned* p, size_t n)
 {
   unsigned* tmp;
   if (n)
-    assert(p != 0);
+    PCU_ALWAYS_ASSERT(p != 0);
   if (PCU_ENDIANNESS != PCU_ENCODED_ENDIAN) {
     tmp = malloc(n * sizeof(unsigned));
     memcpy(tmp, p, n * sizeof(unsigned));
@@ -304,7 +304,7 @@ void pcu_write_doubles(pcu_file* f, double* p, size_t n)
 {
   double* tmp;
   if (n)
-    assert(p != 0);
+    PCU_ALWAYS_ASSERT(p != 0);
   if (PCU_ENDIANNESS != PCU_ENCODED_ENDIAN) {
     tmp = malloc(n * sizeof(double));
     memcpy(tmp, p, n * sizeof(double));

diff --git a/pcu/pcu_mpi.c b/pcu/pcu_mpi.c
@@ -7,8 +7,9 @@
   BSD license as described in the LICENSE file in the top-level directory.
 
 *******************************************************************************/
+#include <stdio.h>
 #include "pcu_mpi.h"
-#include <assert.h>
+#include "pcu_util.h"
 
 static pcu_mpi* global_mpi;
 
@@ -45,8 +46,8 @@ int pcu_mpi_rank(void)
 static void check_rank(int rank)
 {
   (void)rank;
-  assert(0 <= rank);
-  assert(rank < pcu_mpi_size());
+  PCU_ALWAYS_ASSERT(0 <= rank);
+  PCU_ALWAYS_ASSERT(rank < pcu_mpi_size());
 }
 
 void pcu_mpi_send(pcu_message* m, MPI_Comm comm)

diff --git a/pcu/pcu_order.c b/pcu/pcu_order.c
@@ -11,7 +11,7 @@
 #include "pcu_aa.h"
 #include "pcu_msg.h"
 #include "noto_malloc.h"
-#include <assert.h>
+#include "pcu_util.h"
 
 struct message {
   pcu_aa_node node;