Use mpi_free_mem for mem allocated via mpi_alloc.

While mpich and openmpi do not care whether memory allocated with
MPI_Alloc_mem is freed using free() or MPI_Free_mem, the intel MPI lib
crashes when not being in sync there. Therefore use MPI_Free_mem for all
memory allocate using MPI_Alloc_mem.

Author: vehre

src/runtime-libraries/mpi/mpi_caf.c

@@ -1040,9 +1040,11 @@ finalize_internal(int status_code)
     {
       ierr = MPI_Win_detach(global_dynamic_win, cur_stok->token->memptr);
       chk_err(ierr);
-      free(cur_stok->token->memptr);
+      ierr = MPI_Free_mem(cur_stok->token->memptr);
+      chk_err(ierr);
     }
-    free(cur_stok->token);
+    ierr = MPI_Free_mem(cur_stok->token);
+    chk_err(ierr);
     free(cur_stok);
     cur_stok = prev_stok;
   }
@@ -1065,10 +1067,13 @@ finalize_internal(int status_code)
 #ifdef GCC_GE_7
     /* Unregister the window to the descriptors when freeing the token. */
     dprint("MPI_Win_free(%p)\n", p);
-    ierr = MPI_Win_free(p); chk_err(ierr);
-    free(cur_tok->token);
+    ierr = MPI_Win_free(p);
+    chk_err(ierr);
+    ierr = MPI_Free_mem(cur_tok->token);
+    chk_err(ierr);
 #else // GCC_GE_7
-    ierr = MPI_Win_free(p); chk_err(ierr);
+    ierr = MPI_Win_free(p);
+    chk_err(ierr);
 #endif // GCC_GE_7
     free(cur_tok);
     cur_tok = prev;
@@ -1529,7 +1534,8 @@ PREFIX(deregister) (caf_token_t *token, int *stat, char *errmsg,
         {
           ierr = MPI_Win_detach(global_dynamic_win, slave_token->memptr);
           chk_err(ierr);
-          free(slave_token->memptr);
+          ierr = MPI_Free_mem(slave_token->memptr);
+          chk_err(ierr);
           slave_token->memptr = NULL;
           if (type == CAF_DEREGTYPE_COARRAY_DEALLOCATE_ONLY)
           {
@@ -1546,7 +1552,8 @@ PREFIX(deregister) (caf_token_t *token, int *stat, char *errmsg,
           caf_allocated_slave_tokens = prev_stok;
 
         free(cur_stok);
-        free(*token);
+        ierr = MPI_Free_mem(*token);
+        chk_err(ierr);
         return;
       }