[mpich2-commits] r5560 - mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2009-10-26 12:52:56 -0500 (Mon, 26 Oct 2009)
New Revision: 5560

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c
Log:
use typedefed name for pthread_mutex_t

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c	2009-10-26 17:25:01 UTC (rev 5559)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c	2009-10-26 17:52:56 UTC (rev 5560)
@@ -130,7 +130,7 @@
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
     int ret;
     int ipc_lock_offset;
-    pthread_mutex_t *ipc_lock;
+    OPA_emulation_ipl_t *ipc_lock;
 #endif
     int key_max_sz;
     int val_max_sz;
@@ -182,7 +182,7 @@
     /* offset from memory->base_addr to the start of ipc_lock */
     ipc_lock_offset = MPID_NEM_CACHE_LINE_LEN;
 
-    MPIU_Assert(ipc_lock_offset >= sizeof(pthread_mutex_t));
+    MPIU_Assert(ipc_lock_offset >= sizeof(OPA_emulation_ipl_t));
     segment_len += MPID_NEM_CACHE_LINE_LEN;
 #endif
 
@@ -202,7 +202,7 @@
 
         /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-        ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+        ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
         ret = OPA_Interprocess_lock_init(ipc_lock, TRUE/*isLeader*/);
         MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 #endif
@@ -224,7 +224,7 @@
 
             /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-            ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+            ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
             ret = OPA_Interprocess_lock_init(ipc_lock, local_rank == 0);
             MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 #endif
@@ -258,7 +258,7 @@
 
             /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-            ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+            ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
             ret = OPA_Interprocess_lock_init(ipc_lock, local_rank == 0);
             MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 
@@ -302,7 +302,7 @@
 
         /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-        ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+        ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
         ret = OPA_Interprocess_lock_init(ipc_lock, TRUE/*isLeader*/);
         MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 #endif
@@ -341,7 +341,7 @@
 
             /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-            ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+            ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
             ret = OPA_Interprocess_lock_init(ipc_lock, local_rank == 0);
             MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 #endif
@@ -370,7 +370,7 @@
 
             /* must come before barrier_init since we use OPA in that function */
 #ifdef OPA_USE_LOCK_BASED_PRIMITIVES
-            ipc_lock = (pthread_mutex_t *)((char *)memory->base_addr + ipc_lock_offset);
+            ipc_lock = (OPA_emulation_ipl_t *)((char *)memory->base_addr + ipc_lock_offset);
             ret = OPA_Interprocess_lock_init(ipc_lock, local_rank == 0);
             MPIU_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", ret);
 #endif