Really fix #411 on all mpi-installations reliably.

Fix #411.
Fix #412.

Author: vehre

CMakeLists.txt

@@ -595,8 +595,9 @@ if(opencoarrays_aware_compiler)
     add_mpi_test(get-put-alloc-comp 3 ${tests_root}/regression/reported/issue-422-send-get)
   endif()
 
+  add_mpi_test(event_post_1 4 ${tests_root}/unit/events/event_post_1)
   # Fixed GCC 7 regressions, should run on GCC 6 and 7
-  add_mpi_test(event-post 3 ${tests_root}/regression/reported/event-post)
+  add_mpi_test(event_post_2 3 ${tests_root}/unit/events/event_post_2)
 
   # These co_reduce (#172, fixed by PR #332, addl discussion in PR
   # #331) tests are for bugs not regressions. Should be fixed in all

src/mpi/mpi_caf.c

@@ -4454,39 +4454,36 @@ PREFIX (event_wait) (caf_token_t token, size_t index,
 		     int until_count, int *stat,
 		     char *errmsg, int errmsg_len)
 {
-  int ierr=0,count=0,i,image=caf_this_image-1;
-  int *var=NULL,flag,old=0;
-  int newval=0;
+  int ierr = 0, count = 0, i, image = caf_this_image - 1;
+  int *var = NULL, flag, old = 0;
+  int newval = 0;
   const int spin_loop_max = 20000;
   MPI_Win *p = TOKEN(token);
   const char msg[] = "Error on event wait";
 
   if(stat != NULL)
     *stat = 0;
 
-  MPI_Win_get_attr(*p,MPI_WIN_BASE,&var,&flag);
+  MPI_Win_get_attr (*p, MPI_WIN_BASE, &var, &flag);
 
   for(i = 0; i < spin_loop_max; ++i)
     {
-      MPI_Win_sync(*p);
+      MPI_Win_sync (*p);
       count = var[index];
       if(count >= until_count)
 	break;
     }
 
-  i=1;
+  i = 1;
   while(count < until_count)
-    /* for(i = 0; i < spin_loop_max; ++i) */
-      {
-	MPI_Win_sync(*p);
-	count = var[index];
-	/* if(count >= until_count) */
-	/*   break; */
-	usleep(10*i);
-	i++;
-	/* Needed to enforce MPI progress */
-	CAF_Win_unlock (image, *p);
-      }
+    {
+      MPI_Win_sync (*p);
+      count = var[index];
+      usleep (10 * i);
+	++i;
+      /* Needed to enforce MPI progress */
+      MPI_Win_flush (image, *p);
+    }
 
   newval = -until_count;
 

src/tests/regression/reported/CMakeLists.txt

@@ -13,9 +13,6 @@ target_link_libraries(source-alloc-sync OpenCoarrays)
 add_executable(convert-before-put issue-292-convert-type-before-put.f90)
 target_link_libraries(convert-before-put OpenCoarrays)
 
-add_executable(event-post issue-293-silent-event-failure.F90)
-target_link_libraries(event-post OpenCoarrays)
-
 add_executable(issue-422-send issue-422-send.F90)
 target_link_libraries(issue-422-send OpenCoarrays)
 

src/tests/unit/CMakeLists.txt

@@ -4,6 +4,7 @@ if (${opencoarrays_aware_compiler})
   add_subdirectory(init_register)
   add_subdirectory(collectives)
   add_subdirectory(sync)
+  add_subdirectory(events)
   if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7)
     add_subdirectory(fail_images)
   endif()

src/tests/unit/events/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Fortran tests
+
+add_executable(event_post_1 event_post_1.f90)
+target_link_libraries(event_post_1 OpenCoarrays)
+
+add_executable(event_post_2 event_post_2.f90)
+target_link_libraries(event_post_2 OpenCoarrays)
+

src/tests/unit/events/event_post_1.f90

@@ -0,0 +1,20 @@
+program event_post_1
+  use iso_fortran_env
+  implicit none
+
+  type(event_type), allocatable :: snd_copied(:)[:]
+ 
+  associate(me => this_image(), np => num_images())
+    allocate(snd_copied(np)[*])
+    if (me == 2) print*,'I am  image 2, I am posting to 4'
+    if (me == 2) event post(snd_copied(2)[4])
+    if (me == 2) print*,' I am image 2, I have posted to 4'
+    if (me == 4) then
+      event wait(snd_copied(2))
+      print *, 'Test passed.'
+    end if
+    if (allocated(snd_copied)) deallocate(snd_copied)
+  end associate
+end program event_post_1
+! vim:ts=2:sts=2:sw=2:
+