More logging and error checking.

vehre · vehre · commit 3717c0f273ec · 2025-02-21T16:27:35.000+01:00
diff --git a/src/runtime-libraries/mpi/mpi_caf.c b/src/runtime-libraries/mpi/mpi_caf.c
@@ -967,7 +967,8 @@ handle_incoming_message(MPI_Status *status_in, MPI_Message *msg_han,
 
   ierr = MPI_Mrecv(msg, cnt, MPI_BYTE, msg_han, status_in);
   chk_err(ierr);
-  dprint("ct: Received request of size %d.\n", cnt);
+  dprint("ct: Received request of size %d (sizeof(ct_msg) = %zd).\n", cnt,
+         sizeof(ct_msg_t));
 
   if (msg->win != MPI_WIN_NULL)
   {
@@ -1039,7 +1040,8 @@ communication_thread(void *)
            status.MPI_SOURCE, status.MPI_TAG, status.MPI_ERROR);
     if (status.MPI_TAG == CAF_CT_TAG && status.MPI_ERROR == MPI_SUCCESS)
     {
-      MPI_Get_count(&status, MPI_BYTE, &cnt);
+      ierr = MPI_Get_count(&status, MPI_BYTE, &cnt);
+      chk_err(ierr);
 
       if (cnt >= sizeof(ct_msg_t))
       {

Original file line number	Diff line number	Diff line change
`@@ -967,7 +967,8 @@ handle_incoming_message(MPI_Status status_in, MPI_Message msg_han,`
`967`	`967`
`968`	`968`	`ierr = MPI_Mrecv(msg, cnt, MPI_BYTE, msg_han, status_in);`
`969`	`969`	`chk_err(ierr);`
`970`		`- dprint("ct: Received request of size %d.\n", cnt);`
	`970`	`+ dprint("ct: Received request of size %d (sizeof(ct_msg) = %zd).\n", cnt,`
	`971`	`+ sizeof(ct_msg_t));`
`971`	`972`
`972`	`973`	`if (msg->win != MPI_WIN_NULL)`
`973`	`974`	`{`
`@@ -1039,7 +1040,8 @@ communication_thread(void *)`
`1039`	`1040`	`status.MPI_SOURCE, status.MPI_TAG, status.MPI_ERROR);`
`1040`	`1041`	`if (status.MPI_TAG == CAF_CT_TAG && status.MPI_ERROR == MPI_SUCCESS)`
`1041`	`1042`	`{`
`1042`		`- MPI_Get_count(&status, MPI_BYTE, &cnt);`
	`1043`	`+ ierr = MPI_Get_count(&status, MPI_BYTE, &cnt);`
	`1044`	`+ chk_err(ierr);`
`1043`	`1045`
`1044`	`1046`	`if (cnt >= sizeof(ct_msg_t))`
`1045`	`1047`	`{`