handle user error classes and codes

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c.py

@@ -226,7 +226,7 @@ def generate_error_convert_fn(self):
             lines.append(f'case {self.mangle_name(error)}:')
             lines.append(f'return {error};')
         lines.append('default:')
-        lines.append('return error_class;')
+        lines.append('return (error_class - %s);' % ('OMPI_ABI_HANDLE_BASE_OFFSET'))
         lines.append('}')
         self.dump_lines(lines)
         self.dump('}')
@@ -240,7 +240,7 @@ def generate_error_convert_fn_intern_to_abi(self):
             lines.append(f'case {error}:')
             lines.append(f'return {self.mangle_name(error)};')
         lines.append('default:')
-        lines.append('return error_class;')
+        lines.append('return (error_class + %s);' % ('OMPI_ABI_HANDLE_BASE_OFFSET'))
         lines.append('}')
         self.dump_lines(lines)
         self.dump('}')

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -90,6 +90,17 @@ def callback_wrapper_code(self):
         """Return True if this parameter has callback wrapper code to generate."""
         return False
 
+class StandardABIType(Type):
+
+    @property
+    def tmpname(self):
+        return f'{self.name}_tmp'
+
+    @property
+    def argument(self):
+        return self.tmpname
+
+
 @Type.add_type('ERROR_CLASS', abi_type=['ompi'])
 class TypeErrorClass(Type):
 
@@ -100,15 +111,90 @@ def return_code(self, name):
         return [f'return {name};']
 
 @Type.add_type('ERROR_CLASS', abi_type=['standard'])
-class TypeErrorClass(Type):
+class TypeErrorClassStandard(StandardABIType):
 
     def type_text(self, enable_count=False):
         return 'int'
 
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.ERROR_CLASS}({self.name});']
+
     def return_code(self, name):
         return [f'return {ConvertOMPIToStandard.ERROR_CLASS}({name});']
 
 
+@Type.add_type('ERROR_CLASS_OUT', abi_type=['ompi'])
+class TypeErrorClassOut(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+@Type.add_type('ERROR_CLASS_OUT', abi_type=['standard'])
+class TypeErrorClassOutStandard(StandardABIType):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+    @property
+    def final_code(self): 
+        return [f'*{self.name} = {ConvertOMPIToStandard.ERROR_CLASS}(*{self.name});']
+
+    @property
+    def argument(self):
+        return f'{self.name}'
+
+#
+# types below seem duplicative of ERROR_CLASS but
+# are provided for clarity in the template files
+# to distinguish between classes and codes which can
+# have different values (in theory) if they are not
+# predeinfed by MPI
+#
+@Type.add_type('ERROR_CODE', abi_type=['ompi'])
+class TypeErrorCode(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+    def return_code(self, name):
+        return [f'return {name};']
+
+@Type.add_type('ERROR_CODE', abi_type=['standard'])
+class TypeErrorCodeStandard(StandardABIType):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.ERROR_CLASS}({self.name});']
+
+    def return_code(self, name):
+        return [f'return {ConvertOMPIToStandard.ERROR_CLASS}({name});']
+
+
+@Type.add_type('ERROR_CODE_OUT', abi_type=['ompi'])
+class TypeErrorCodeOut(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+@Type.add_type('ERROR_CODE_OUT', abi_type=['standard'])
+class TypeErrorCodeOutStandard(StandardABIType):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+    @property
+    def final_code(self):
+        return [f'*{self.name} = {ConvertOMPIToStandard.ERROR_CLASS}(*{self.name});']
+
+    @property
+    def argument(self):
+        return f'{self.name}'
+
+
 @Type.add_type('BUFFER')
 class TypeBuffer(Type):
 
@@ -411,16 +497,6 @@ def type_text(self, enable_count=False):
     def parameter(self, enable_count=False, **kwargs):
         return f'{self.type_text(enable_count=enable_count)} {self.name}[]'
 
-class StandardABIType(Type):
-
-    @property
-    def tmpname(self):
-        return f'{self.name}_tmp'
-
-    @property
-    def argument(self):
-        return self.tmpname
-
 
 @Type.add_type('DATATYPE', abi_type=['standard'])
 class TypeDatatypeStandard(StandardABIType):

ompi/mpi/c/add_error_class.c.in

@@ -31,7 +31,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 
-PROTOTYPE ERROR_CLASS add_error_class(INT_OUT errorclass)
+PROTOTYPE ERROR_CLASS add_error_class(ERROR_CLASS_OUT errorclass)
 {
     int err_class;
     int rc;

ompi/mpi/c/add_error_code.c.in

@@ -31,7 +31,7 @@
 #include "ompi/errhandler/errcode.h"
 #include "ompi/attribute/attribute.h"
 
-PROTOTYPE ERROR_CLASS add_error_code(INT errorclass, INT_OUT errorcode)
+PROTOTYPE ERROR_CLASS add_error_code(ERROR_CLASS errorclass, ERROR_CODE_OUT errorcode)
 {
     int code;
     int rc;

ompi/mpi/c/add_error_string.c.in

@@ -30,7 +30,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-PROTOTYPE ERROR_CLASS add_error_string(INT errorcode, STRING string)
+PROTOTYPE ERROR_CLASS add_error_string(ERROR_CODE errorcode, STRING string)
 {
     int rc;
 

ompi/mpi/c/comm_call_errhandler.c.in

@@ -28,7 +28,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS comm_call_errhandler(COMM comm, INT errorcode)
+PROTOTYPE ERROR_CLASS comm_call_errhandler(COMM comm, ERROR_CODE errorcode)
 {
     MEMCHECKER(
         memchecker_comm(comm);

ompi/mpi/c/error_class.c.in

@@ -28,7 +28,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-PROTOTYPE ERROR_CLASS error_class(INT errorcode, INT_OUT errorclass)
+PROTOTYPE ERROR_CLASS error_class(ERROR_CODE errorcode, ERROR_CLASS_OUT errorclass)
 {
     int ret;
 

ompi/mpi/c/error_string.c.in

@@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-PROTOTYPE ERROR_CLASS error_string(INT errorcode, STRING_OUT string,
+PROTOTYPE ERROR_CLASS error_string(ERROR_CLASS errorcode, STRING_OUT string,
                                    INT_OUT resultlen)
 {
     int ret;

ompi/mpi/c/file_call_errhandler.c.in

@@ -28,7 +28,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-PROTOTYPE ERROR_CLASS file_call_errhandler(FILE fh, INT errorcode)
+PROTOTYPE ERROR_CLASS file_call_errhandler(FILE fh, ERROR_CODE errorcode)
 {
   /* Error checking */
 

ompi/mpi/c/remove_error_class.c.in

@@ -32,7 +32,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 
-PROTOTYPE ERROR_CLASS remove_error_class(INT errorclass)
+PROTOTYPE ERROR_CLASS remove_error_class(ERROR_CLASS errorclass)
 {
     int rc;