Add owning memory flag.

Author: vehre

src/application-binary-interface/libcaf.h

@@ -88,7 +88,10 @@ typedef enum caf_register_t
   CAF_REGTYPE_EVENT_STATIC,
   CAF_REGTYPE_EVENT_ALLOC,
   CAF_REGTYPE_COARRAY_ALLOC_REGISTER_ONLY,
-  CAF_REGTYPE_COARRAY_ALLOC_ALLOCATE_ONLY
+  CAF_REGTYPE_COARRAY_ALLOC_ALLOCATE_ONLY,
+#ifdef GCC_GE_16
+  CAF_REGTYPE_COARRAY_MAP_EXISTING,
+#endif
 } caf_register_t;
 
 /* Describes the action to take on _caf_deregister. Keep in sync with

src/runtime-libraries/mpi/mpi_caf.c

@@ -121,6 +121,11 @@ typedef struct mpi_caf_token_t
   /* The pointer to the primary array, i.e., to coarrays that are arrays and
    * not a derived type. */
   gfc_descriptor_t *desc;
+#ifdef GCC_GE_16
+  /* Only set to false, when this token maps memory into another token's
+   * memory segment. This only happens when in an associate or a change team. */
+  int owning_memory;
+#endif
 } mpi_caf_token_t;
 
 /* For components of derived type coarrays a slave_token is needed when the
@@ -2147,6 +2152,38 @@ void PREFIX(register)(size_t size, caf_register_t type, caf_token_t *token,
                slave_token, slave_token->memptr, slave_token->desc);
       }
       break;
+#ifdef GCC_GE_16
+    case CAF_REGTYPE_COARRAY_MAP_EXISTING:
+      {
+        mpi_caf_token_t *mpi_token;
+        MPI_Win *p;
+
+        *token = calloc(1, sizeof(mpi_caf_token_t));
+        mpi_token = (mpi_caf_token_t *)(*token);
+        p = TOKEN(mpi_token);
+        mem = desc->base_addr;
+        ierr = MPI_Win_create(mem, actual_size, 1, MPI_INFO_NULL,
+                              CAF_COMM_WORLD, p);
+        chk_err(ierr);
+        CAF_Win_lock_all(*p);
+        mpi_token->owning_memory = 0;
+
+        struct allocated_tokens_t *allocated_token
+            = malloc(sizeof(struct allocated_tokens_t));
+        allocated_token->next = current_team->allocated_tokens;
+        allocated_token->token = *token;
+        current_team->allocated_tokens = allocated_token;
+
+        if (stat)
+          *stat = 0;
+
+        mpi_token->memptr = mem;
+        dprint("Token %p on exit of mapping: mpi_caf_token_t "
+               "{ (local_)memptr: %p (size: %zd), memptr_win: %d }\n",
+               mpi_token, mpi_token->memptr, size, mpi_token->memptr_win);
+        break;
+      }
+#endif
     default:
       {
         mpi_caf_token_t *mpi_token;
@@ -2168,6 +2205,9 @@ void PREFIX(register)(size_t size, caf_register_t type, caf_token_t *token,
                               CAF_COMM_WORLD, p);
         chk_err(ierr);
 #endif // MPI_VERSION
+#ifdef GCC_GE_16
+        mpi_token->owning_memory = 1;
+#endif
 
 #ifndef GCC_GE_8
         if (GFC_DESCRIPTOR_RANK(desc) != 0)
@@ -10601,9 +10641,20 @@ PREFIX(end_team)(int *stat, char *errmsg, charlen_t errmsg_len)
   {
     struct allocated_tokens_t *nac = ac->next;
 
-    PREFIX(deregister)((void **)&ac->token,
-                       CAF_DEREGTYPE_COARRAY_DEALLOCATE_ONLY, stat, errmsg,
-                       errmsg_len);
+    if (((mpi_caf_token_t *)ac->token)->owning_memory)
+      PREFIX(deregister)((void **)&ac->token,
+                         CAF_DEREGTYPE_COARRAY_DEALLOCATE_ONLY, stat, errmsg,
+                         errmsg_len);
+    else
+    {
+      MPI_Win *p = TOKEN(ac->token);
+
+      CAF_Win_unlock_all(*p);
+      ierr = MPI_Win_free(p);
+      chk_err(ierr);
+
+      free(ac->token);
+    }
     free(ac);
     ac = nac;
   }