100% cosmetic rename

[skip travis]
SDL-Hercules-390 · Oct 21, 2020 · 360156d · 360156d
1 parent abe92d7
commit 360156d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/channel.c b/channel.c
@@ -6436,7 +6436,7 @@ static void chann_txf_ref( int acc, BYTE* maddr, size_t len, const char* locatio
         OBTAIN_INTLOCK( NULL );
         {
             while (sysblk.syncing)
-                hthread_wait_condition( &sysblk.sync_bc_cond, &sysblk.intlock, location );
+                hthread_wait_condition( &sysblk.sync_done_cond, &sysblk.intlock, location );
             TXF_MADDRL( 0, len, 0, NULL, acc, maddr );
         }
         RELEASE_INTLOCK( NULL );

diff --git a/cpu.c b/cpu.c
@@ -2551,8 +2551,8 @@ static void CPU_Wait( REGS* regs )
     {
         sysblk.sync_mask &= ~HOSTREGS->cpubit;
         if (!sysblk.sync_mask)
-            signal_condition(&sysblk.sync_cond);
-        wait_condition (&sysblk.sync_bc_cond, &sysblk.intlock);
+            signal_condition(&sysblk.all_synced_cond);
+        wait_condition (&sysblk.sync_done_cond, &sysblk.intlock);
     }
 
     /*

diff --git a/hinlines.h b/hinlines.h
@@ -286,14 +286,15 @@ static inline void synchronize_cpus( REGS* regs, const char* location )
     {
         sysblk.sync_mask = mask;
         sysblk.syncing   = true;
-        sysblk.intowner  = LOCK_OWNER_NONE;
-
-        hthread_wait_condition( &sysblk.sync_cond, &sysblk.intlock, location );
 
+        sysblk.intowner  = LOCK_OWNER_NONE;
+        {
+            hthread_wait_condition( &sysblk.all_synced_cond, &sysblk.intlock, location );
+        }
         sysblk.intowner  = HOSTREGS->cpuad;
-        sysblk.syncing   = false;
 
-        hthread_broadcast_condition( &sysblk.sync_bc_cond, location );
+        sysblk.syncing   = false;
+        hthread_broadcast_condition( &sysblk.sync_done_cond, location );
     }
     /* All active processors other than self, are now waiting at their
      * respective sync point. We may now safely proceed doing whatever
@@ -389,14 +390,23 @@ static inline void Interrupt_Lock_Obtained( REGS* regs, const char* location )
 {
     if (regs)
     {
+        /* Wait for any SYNCHRONIZE_CPUS to finish before proceeding */
         while (sysblk.syncing)
         {
+            /* Indicate we have reached the sync point */
             sysblk.sync_mask &= ~HOSTREGS->cpubit;
 
+            /* If we're the last CPU to reach this sync point,
+               signal the CPU that requested the sync that it
+               may now safely proceed with its exclusive logic.
+            */
             if (!sysblk.sync_mask)
-                hthread_signal_condition( &sysblk.sync_cond, location );
+                hthread_signal_condition( &sysblk.all_synced_cond, location );
 
-            hthread_wait_condition( &sysblk.sync_bc_cond, &sysblk.intlock, location );
+            /* Wait for CPU that requested the sync to indicate
+               it's done and thus is now safe for us to proceed.
+            */
+            hthread_wait_condition( &sysblk.sync_done_cond, &sysblk.intlock, location );
         }
 
         HOSTREGS->intwait = false;

diff --git a/hstructs.h b/hstructs.h
@@ -942,8 +942,8 @@ struct SYSBLK {
      /* Fields used by SYNCHRONIZE_CPUS */
         bool    syncing;                /* 1=Sync in progress        */
         CPU_BITMAP sync_mask;           /* CPU mask for syncing CPUs */
-        COND    sync_cond;              /* COND for syncing CPU      */
-        COND    sync_bc_cond;           /* COND for other CPUs       */
+        COND    all_synced_cond;        /* Sync in progress COND     */
+        COND    sync_done_cond;         /* Synchronization done COND */
 
 #if defined( OPTION_SHARED_DEVICES )
         LOCK    shrdlock;               /* shrdport LOCK             */

diff --git a/impl.c b/impl.c
@@ -900,8 +900,8 @@ int     rc;
 #endif
         }
     }
-    initialize_condition( &sysblk.sync_cond );
-    initialize_condition( &sysblk.sync_bc_cond );
+    initialize_condition( &sysblk.all_synced_cond );
+    initialize_condition( &sysblk.sync_done_cond );
 
     /* Copy length for regs */
     sysblk.regs_copy_len = (int)((uintptr_t)&sysblk.dummyregs.regs_copy_end

diff --git a/sie.c b/sie.c
@@ -1018,7 +1018,7 @@ static int ARCH_DEP( run_sie )( REGS* regs )
                                 timed_wait_condition( &regs->intcond, &sysblk.intlock, &waittime );
 
                                 while (sysblk.syncing)
-                                     wait_condition( &sysblk.sync_bc_cond, &sysblk.intlock );
+                                     wait_condition( &sysblk.sync_done_cond, &sysblk.intlock );
                             }
                             sysblk.intowner       =   regs->cpuad;
                             sysblk.waiting_mask  &=  ~regs->cpubit;