Changeset 1162

Timestamp:

Jun 30, 2004, 2:14:40 PM (22 years ago)

Author:

harman

Message:

Added psAbort for failed memory allocation

Location:

trunk/psLib/src

Files:

• collections/psBitSet.c (modified) (5 diffs)
• collections/psScalar.c (modified) (3 diffs)
• mathtypes/psScalar.c (modified) (3 diffs)
• types/psBitSet.c (modified) (5 diffs)

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #include "psMemory.h"
 #include "psError.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -90 +91 @@
     numBytes = ceil(n/8.0);
     newObj = psAlloc(sizeof(psBitSet));
+    if(newObj == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
     p_psMemSetDeallocator(newObj,(psFreeFcn)bitSetFree);
     newObj->n = numBytes;
@@ -96 +100 @@
     /*@i@*/
     newObj->bits = psAlloc(sizeof(char)*numBytes);
+    if(newObj->bits == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     memset(newObj->bits, numBytes, 0);
 
@@ -225 +233 @@
     int numBits = inBitSet->n*8;
     char* outString = psAlloc((size_t)numBits+1);
+    if(outString == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';

trunk/psLib/src/collections/psScalar.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-19 01:59:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include "psScalar.h"
 #include "psLogMsg.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -61 +62 @@
     // Create scalar
     scalar = (psScalar *)psAlloc(sizeof(psScalar));
+    if(scalar == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     scalar->type.dimen = PS_DIMEN_SCALAR;
     scalar->type.type = dataType;

trunk/psLib/src/mathtypes/psScalar.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-19 01:59:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include "psScalar.h"
 #include "psLogMsg.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -61 +62 @@
     // Create scalar
     scalar = (psScalar *)psAlloc(sizeof(psScalar));
+    if(scalar == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     scalar->type.dimen = PS_DIMEN_SCALAR;
     scalar->type.type = dataType;

trunk/psLib/src/types/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #include "psMemory.h"
 #include "psError.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -90 +91 @@
     numBytes = ceil(n/8.0);
     newObj = psAlloc(sizeof(psBitSet));
+    if(newObj == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
     p_psMemSetDeallocator(newObj,(psFreeFcn)bitSetFree);
     newObj->n = numBytes;
@@ -96 +100 @@
     /*@i@*/
     newObj->bits = psAlloc(sizeof(char)*numBytes);
+    if(newObj->bits == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     memset(newObj->bits, numBytes, 0);
 
@@ -225 +233 @@
     int numBits = inBitSet->n*8;
     char* outString = psAlloc((size_t)numBits+1);
+    if(outString == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';