Changeset 1905

Timestamp:

Sep 27, 2004, 10:38:02 AM (22 years ago)

Author:

desonia

Message:

added psErrorRegister.

Location:

trunk/psLib/src

Files:

• sys/psError.c (modified) (2 diffs)
• sys/psErrorCodes.c (modified) (5 diffs)
• sys/psErrorCodes.h (modified) (2 diffs)
• sysUtils/psError.c (modified) (2 diffs)
• sysUtils/psErrorCodes.c (modified) (5 diffs)
• sysUtils/psErrorCodes.h (modified) (2 diffs)
• sysUtils/psSysUtilsErrors.dat (modified) (1 diff)
• sysUtils/psSysUtilsErrors.h (modified) (2 diffs)

trunk/psLib/src/sys/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-24 21:59:29 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 static unsigned int errorStackSize = 0;
 pthread_mutex_t lockErrorStack = PTHREAD_MUTEX_INITIALIZER;
-
 
 static void pushErrorStack(psErr* err);

trunk/psLib/src/sys/psErrorCodes.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-24 01:09:18 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 
+#include "psError.h"
 #include "psErrorCodes.h"
 #include "psList.h"
 #include "psMemory.h"
+
+#include "psSysUtilsErrors.h"
 
 /* N.B., lines between '//~Start' and '//~End' are automatic generated from
@@ -28 +31 @@
  */
 
-static psErrorDescription errorDescriptions[] = {
+static psErrorDescription staticErrorCodes[] = {
             {PS_ERR_NONE,"not an error"},
             {PS_ERR_BASE,"base error"},
@@ -46 +49 @@
         };
 
-static psList* errorCodes = NULL;
-static psErrorDescription* getErrorDescription(psErrorCode code);
+static psList* dynamicErrorCodes = NULL;
+static const psErrorDescription* getErrorDescription(psErrorCode code);
 
 
-static psErrorDescription* getErrorDescription(psErrorCode code)
+static const psErrorDescription* getErrorDescription(psErrorCode code)
 {
     // first, search the static error codes
 
     int n = 0;
-    while(errorDescriptions[n].code != PS_ERR_N_ERR_CLASSES &&
-            errorDescriptions[n].code != code) {
+    while(staticErrorCodes[n].code != PS_ERR_N_ERR_CLASSES &&
+            staticErrorCodes[n].code != code) {
         n++;
     }
 
-    if (errorDescriptions[n].code == code) {
-        return &errorDescriptions[n];
+    if (staticErrorCodes[n].code == code) {
+        return &staticErrorCodes[n];
     } else {
         psErrorDescription* desc;
         // make sure there is a list to search
-        if (errorCodes == NULL) {
+        if (dynamicErrorCodes == NULL) {
             return NULL;
         }
 
         // search dynamic list of error descriptions before giving up.
-        desc = (psErrorDescription*)psListGet(errorCodes,PS_LIST_HEAD);
-        while (desc != NULL && desc->code != code) {
-            desc = (psErrorDescription*)psListGetNext(errorCodes);
-        }
-
-        if (desc != NULL && desc->code == code) {
-            return psMemIncrRefCounter(desc);
+        desc = (psErrorDescription*)psListGet(dynamicErrorCodes,PS_LIST_HEAD);
+        while (desc != NULL) {
+            desc = (psErrorDescription*)psListGetNext(dynamicErrorCodes);
+            if (desc != NULL && desc->code == code) {
+                return desc;
+            }
         }
     }
@@ -89 +91 @@
     }
 
-    psErrorDescription* desc = getErrorDescription(code);
+    const psErrorDescription* desc = getErrorDescription(code);
 
     if (desc == NULL) {
@@ -98 +100 @@
 }
 
+void psErrorRegister(const psErrorDescription* errors,
+                     int nerror)
+{
+    if (nerror < 1) {
+        return;
+    }
+
+    if (errors == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psErrorRegister",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psErrorCode_NULL_ERRORDESCRIPTION);
+        return;
+    }
+
+    for (int i=0;i<nerror;i++) {
+        if (! psListAdd(dynamicErrorCodes,
+                        PS_LIST_HEAD,
+                        (void*)&errors[i]) ) {
+
+            psErrorMsg(PS_ERRORNAME_DOMAIN "psErrorRegister",
+                       PS_ERR_UNKNOWN, false,
+                       PS_ERRORTEXT_psErrorCode_ERRORCODE_REGISTER_FAILED,
+                       i);
+        }
+    }
+}
+

trunk/psLib/src/sys/psErrorCodes.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-16 18:51:32 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -75 +75 @@
 );
 
+/** Register an error code
+ *
+ *  Any project needed to use psLib must define the necessary error codes and
+ *  associated message strings.  This function registers an array of error 
+ *  codes with the error handling subsystem.
+ *
+ */
+void psErrorRegister(
+    const psErrorDescription* errors,  ///< Array of error codes to register
+    int nerror                         ///< number of errors in input array
+);
+
 /// @}
 

trunk/psLib/src/sysUtils/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-24 21:59:29 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 static unsigned int errorStackSize = 0;
 pthread_mutex_t lockErrorStack = PTHREAD_MUTEX_INITIALIZER;
-
 
 static void pushErrorStack(psErr* err);

trunk/psLib/src/sysUtils/psErrorCodes.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-24 01:09:18 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 
+#include "psError.h"
 #include "psErrorCodes.h"
 #include "psList.h"
 #include "psMemory.h"
+
+#include "psSysUtilsErrors.h"
 
 /* N.B., lines between '//~Start' and '//~End' are automatic generated from
@@ -28 +31 @@
  */
 
-static psErrorDescription errorDescriptions[] = {
+static psErrorDescription staticErrorCodes[] = {
             {PS_ERR_NONE,"not an error"},
             {PS_ERR_BASE,"base error"},
@@ -46 +49 @@
         };
 
-static psList* errorCodes = NULL;
-static psErrorDescription* getErrorDescription(psErrorCode code);
+static psList* dynamicErrorCodes = NULL;
+static const psErrorDescription* getErrorDescription(psErrorCode code);
 
 
-static psErrorDescription* getErrorDescription(psErrorCode code)
+static const psErrorDescription* getErrorDescription(psErrorCode code)
 {
     // first, search the static error codes
 
     int n = 0;
-    while(errorDescriptions[n].code != PS_ERR_N_ERR_CLASSES &&
-            errorDescriptions[n].code != code) {
+    while(staticErrorCodes[n].code != PS_ERR_N_ERR_CLASSES &&
+            staticErrorCodes[n].code != code) {
         n++;
     }
 
-    if (errorDescriptions[n].code == code) {
-        return &errorDescriptions[n];
+    if (staticErrorCodes[n].code == code) {
+        return &staticErrorCodes[n];
     } else {
         psErrorDescription* desc;
         // make sure there is a list to search
-        if (errorCodes == NULL) {
+        if (dynamicErrorCodes == NULL) {
             return NULL;
         }
 
         // search dynamic list of error descriptions before giving up.
-        desc = (psErrorDescription*)psListGet(errorCodes,PS_LIST_HEAD);
-        while (desc != NULL && desc->code != code) {
-            desc = (psErrorDescription*)psListGetNext(errorCodes);
-        }
-
-        if (desc != NULL && desc->code == code) {
-            return psMemIncrRefCounter(desc);
+        desc = (psErrorDescription*)psListGet(dynamicErrorCodes,PS_LIST_HEAD);
+        while (desc != NULL) {
+            desc = (psErrorDescription*)psListGetNext(dynamicErrorCodes);
+            if (desc != NULL && desc->code == code) {
+                return desc;
+            }
         }
     }
@@ -89 +91 @@
     }
 
-    psErrorDescription* desc = getErrorDescription(code);
+    const psErrorDescription* desc = getErrorDescription(code);
 
     if (desc == NULL) {
@@ -98 +100 @@
 }
 
+void psErrorRegister(const psErrorDescription* errors,
+                     int nerror)
+{
+    if (nerror < 1) {
+        return;
+    }
+
+    if (errors == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psErrorRegister",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psErrorCode_NULL_ERRORDESCRIPTION);
+        return;
+    }
+
+    for (int i=0;i<nerror;i++) {
+        if (! psListAdd(dynamicErrorCodes,
+                        PS_LIST_HEAD,
+                        (void*)&errors[i]) ) {
+
+            psErrorMsg(PS_ERRORNAME_DOMAIN "psErrorRegister",
+                       PS_ERR_UNKNOWN, false,
+                       PS_ERRORTEXT_psErrorCode_ERRORCODE_REGISTER_FAILED,
+                       i);
+        }
+    }
+}
+

trunk/psLib/src/sysUtils/psErrorCodes.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-16 18:51:32 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -75 +75 @@
 );
 
+/** Register an error code
+ *
+ *  Any project needed to use psLib must define the necessary error codes and
+ *  associated message strings.  This function registers an array of error 
+ *  codes with the error handling subsystem.
+ *
+ */
+void psErrorRegister(
+    const psErrorDescription* errors,  ///< Array of error codes to register
+    int nerror                         ///< number of errors in input array
+);
+
 /// @}
 

trunk/psLib/src/sysUtils/psSysUtilsErrors.dat

@@ -38 +38 @@
 psTrace_MALFORMED_COMPONENT_NAME       Failed to add '%s' to the root component tree; component must start with '.'.
 psTrace_FAILED_TO_ADD_COMPONENT        Failed to set trace level (%d) to '%s'.
+#
+# Error Messages from psErrorCodes.c
+#
+psErrorCode_NULL_ERRORDESCRIPTION      Specified psErrorDescription pointer can not be NULL.
+psErrorCode_ERRORCODE_REGISTER_FAILED  Failed to add input psErrorDescription at array index %d.

trunk/psLib/src/sysUtils/psSysUtilsErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 00:43:54 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-27 20:38:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
 #define PS_ERRORTEXT_psTrace_ADD_NULL_COMPONENT "Failed to add null component to trace tree."
 #define PS_ERRORTEXT_psTrace_MALFORMED_COMPONENT_NAME "Failed to add '%s' to the root component tree; component must start with '.'."
-#define PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT "Failed to set trace level (%d) to '%s'"
+#define PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT "Failed to set trace level (%d) to '%s'."
+#define PS_ERRORTEXT_psErrorCode_NULL_ERRORDESCRIPTION "Specified psErrorDescription pointer can not be NULL."
+#define PS_ERRORTEXT_psErrorCode_ERRORCODE_REGISTER_FAILED "Failed to add input psErrorDescription at array index %d"
 //~End