Enhance debug logging.

Author: vehre

src/runtime-libraries/mpi/mpi_caf.c

@@ -69,10 +69,19 @@ static char *caf_ref_type_str[] = {
 #define dprint(...)
 #define chk_err(...)
 #else
+#ifdef GCC_GE_15
+#define dprint(format, ...)                                                    \
+  fprintf(stderr, "%d/%d (t(%d):%d/%d): %s(%d) " format,                       \
+          global_this_image + 1, global_num_images,                            \
+          current_team ? current_team->team_list_elem->team_id : -99,          \
+          caf_this_image, caf_num_images, __FUNCTION__, __LINE__,              \
+          ##__VA_ARGS__)
+#else
 #define dprint(format, ...)                                                    \
-  fprintf(stderr, "%d/%d (t:%d/%d): %s(%d) " format, global_this_image + 1,    \
+  fprintf(stderr, "%d/%d (%d/%d): %s(%d) " format, global_this_image + 1,      \
           global_num_images, caf_this_image, caf_num_images, __FUNCTION__,     \
           __LINE__, ##__VA_ARGS__)
+#endif
 #define chk_err(ierr)                                                          \
   do                                                                           \
   {                                                                            \
@@ -2384,13 +2393,11 @@ PREFIX(deregister)(caf_token_t *token, int *stat, char *errmsg,
       if (cur->token == *token)
       {
         p = TOKEN(*token);
-#ifdef GCC_GE_7
-        dprint("Found regular token %p for memptr_win: %d.\n", *token,
-               ((mpi_caf_token_t *)*token)->memptr_win);
-#endif
+        dprint("Found regular token %p for memptr_win: %d.\n", *token, *p);
         CAF_Win_unlock_all(*p);
         ierr = MPI_Win_free(p);
         chk_err(ierr);
+        dprint("Window destroyed.\n");
 
         if (cur == current_team->allocated_tokens)
           current_team->allocated_tokens = cur->next;
@@ -2536,7 +2543,13 @@ PREFIX(sync_all)(int *stat, char *errmsg, charlen_t errmsg_len)
     ierr = MPI_Barrier(CAF_COMM_WORLD);
     chk_err(ierr);
 #endif
-    dprint("MPI_Barrier = %d.\n", err);
+    dprint("Sync all on team %d, MPI_Barrier = %d.\n",
+#ifdef GCC_GE_15
+           current_team->team_list_elem->team_id,
+#else
+           -1,
+#endif
+           err);
     if (ierr == STAT_FAILED_IMAGE)
       err = STAT_FAILED_IMAGE;
     else if (ierr != 0)
@@ -10448,6 +10461,7 @@ PREFIX(change_team)(caf_team_t team, int *stat, char *errmsg,
   chk_err(ierr);
   ierr = MPI_Barrier(CAF_COMM_WORLD);
   chk_err(ierr);
+  dprint("changed to team %d.\n", current_team->team_list_elem->team_id);
 }
 #else
 void
@@ -10582,6 +10596,7 @@ PREFIX(end_team)(int *stat, char *errmsg, charlen_t errmsg_len)
     return;
   }
 
+  dprint("ending team %d.\n", ending_team->team_list_elem->team_id);
   for (struct allocated_tokens_t *ac = current_team->allocated_tokens; ac;)
   {
     struct allocated_tokens_t *nac = ac->next;
@@ -10601,6 +10616,7 @@ PREFIX(end_team)(int *stat, char *errmsg, charlen_t errmsg_len)
   ierr = MPI_Comm_size(CAF_COMM_WORLD, &caf_num_images);
   chk_err(ierr);
   free(ending_team);
+  dprint("switched to team %d.\n", current_team->team_list_elem->team_id);
 }
 #else
 void
@@ -10660,8 +10676,10 @@ PREFIX(sync_team)(caf_team_t team, int *stat, char *errmsg,
     return;
   }
 
+  dprint("syncing team %d.\n", current_team->team_list_elem->team_id);
   int ierr = MPI_Barrier(team_to_sync->communicator);
   chk_err(ierr);
+  dprint("synced team %d.\n", current_team->team_list_elem->team_id);
 }
 #else
 void