add new type to handle out void stars

from buffer detach operations.

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -214,6 +214,28 @@ def type_text(self, enable_count=False):
         return f'void *'
 
 
+@Type.add_type('BUFFER_ADDR_OUT', abi_type=['ompi'])
+class TypeBufferOut(Type):
+
+    def type_text(self, enable_count=False):
+        return f'void *'
+
+
+@Type.add_type('BUFFER_ADDR_OUT', abi_type=['standard'])
+class TypeBufferOutStandard(StandardABIType):
+
+    @property
+    def final_code(self):
+        return [f'if (NULL != {self.name}) *(void **){self.name} = {ConvertOMPIToStandard.BUFFER}(*(void **){self.name});']
+
+    def type_text(self, enable_count=False):
+        return f'void *'
+
+    @property
+    def argument(self):
+        return f'{self.name}'
+
+
 @Type.add_type('BUFFER', abi_type=['standard'])
 class TypeBuffer(StandardABIType):
 

ompi/mpi/c/buffer_detach.c.in

@@ -29,19 +29,19 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 
-PROTOTYPE ERROR_CLASS buffer_detach(BUFFER_OUT buffer, COUNT_OUT size)
+PROTOTYPE ERROR_CLASS buffer_detach(BUFFER_ADDR_OUT buffer_addr, COUNT_OUT size)
 {
     size_t size_arg;
     int ret = OMPI_SUCCESS;
 
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == buffer || NULL == size) {
+        if (NULL == buffer_addr || NULL == size) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
         }
     }
 
-    ret = mca_pml_base_bsend_detach(BASE_BSEND_BUF, NULL, buffer, &size_arg);
+    ret = mca_pml_base_bsend_detach(BASE_BSEND_BUF, NULL, buffer_addr, &size_arg);
     if (MPI_SUCCESS == ret) {
 #if OMPI_BIGCOUNT_SRC
         *size = size_arg;

ompi/mpi/c/comm_detach_buffer.c.in

@@ -29,22 +29,22 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 
-PROTOTYPE ERROR_CLASS comm_detach_buffer(COMM comm, BUFFER_OUT buffer, COUNT_OUT size)
+PROTOTYPE ERROR_CLASS comm_detach_buffer(COMM comm, BUFFER_ADDR_OUT buffer_addr, COUNT_OUT size)
 {
     size_t size_arg;
     int ret = OMPI_SUCCESS;
 
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == buffer || NULL == size) {
+        if (NULL == buffer_addr || NULL == size) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
         }
         if (ompi_comm_invalid(comm)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_COMM, FUNC_NAME);
         }
     }
 
-    ret = mca_pml_base_bsend_detach(COMM_BSEND_BUF, comm, buffer, &size_arg);
+    ret = mca_pml_base_bsend_detach(COMM_BSEND_BUF, comm, buffer_addr, &size_arg);
     if (MPI_SUCCESS == ret) {
 #if OMPI_BIGCOUNT_SRC
         *size = size_arg;

ompi/mpi/c/session_detach_buffer.c.in

@@ -29,14 +29,14 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 
-PROTOTYPE ERROR_CLASS session_detach_buffer(SESSION session, BUFFER_OUT buffer, COUNT_OUT size)
+PROTOTYPE ERROR_CLASS session_detach_buffer(SESSION session, BUFFER_ADDR_OUT buffer_addr, COUNT_OUT size)
 {
     size_t size_arg;
     int ret = OMPI_SUCCESS;
 
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == buffer || NULL == size) {
+        if (NULL == buffer_addr || NULL == size) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
         }
         if (ompi_instance_invalid(session)) {
@@ -48,7 +48,7 @@ PROTOTYPE ERROR_CLASS session_detach_buffer(SESSION session, BUFFER_OUT buffer,
         }
     }
 
-    ret = mca_pml_base_bsend_detach(SESSION_BSEND_BUF, session, buffer, &size_arg);
+    ret = mca_pml_base_bsend_detach(SESSION_BSEND_BUF, session, buffer_addr, &size_arg);
     if (MPI_SUCCESS == ret) {
 #if OMPI_BIGCOUNT_SRC
         *size = size_arg;