From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 30 Sep 2002 19:38:11 +0000 (+0000)
Subject: wakeup-only-returns-int-on-aix-20020930
X-Git-Tag: openafs-devel-1_3_50~598
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ab0716fb86698506f0cfaf9b7c1e751e5a68bc8d;p=packages%2Fo%2Fopenafs.git

wakeup-only-returns-int-on-aix-20020930


reported by several people.
---

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index 0bcd42a6b..ed7e3a196 100644
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -1406,12 +1406,16 @@ static int afs_UFSCacheFetchProc(register struct rx_call *acall,
 	    abase += tlen;
 	    length -= tlen;
 	    adc->validPos = abase;
+#ifdef AFS_AIX_ENV	    
 	    if (afs_osi_Wakeup(&adc->validPos) == 0)
 		afs_Trace4(afs_iclSetp, CM_TRACE_DCACHEWAKE,
 			   ICL_TYPE_STRING, __FILE__,
 			   ICL_TYPE_INT32, __LINE__,
 			   ICL_TYPE_POINTER, adc,
 			   ICL_TYPE_INT32, adc->dflags);
+#else
+	    afs_osi_Wakeup(&adc->validPos);
+#endif
 	}
     } while (moredata);
     osi_FreeLargeSpace(tbuffer);
@@ -2021,12 +2025,16 @@ RetryLookup:
 	tdc->validPos = Position;	/*  which is AFS_CHUNKBASE(abyte) */
 	if (tdc->mflags & DFFetchReq) {
 	    tdc->mflags &= ~DFFetchReq;
+#ifdef AFS_AIX_ENV
 	    if (afs_osi_Wakeup(&tdc->validPos) == 0)
 	        afs_Trace4(afs_iclSetp, CM_TRACE_DCACHEWAKE,
 		       ICL_TYPE_STRING, __FILE__,
 		       ICL_TYPE_INT32, __LINE__,
 		       ICL_TYPE_POINTER, tdc,
 		       ICL_TYPE_INT32, tdc->dflags);
+#else
+	    afs_osi_Wakeup(&tdc->validPos);
+#endif
 	}
 	tsmall = (struct tlocal1 *) osi_AllocLargeSpace(sizeof(struct tlocal1));
 	setVcacheStatus = 0;
@@ -2332,12 +2340,16 @@ RetryLookup:
 #endif /* AFS_NOSTATS */
 
 	tdc->dflags &= ~DFFetching;
+#ifdef AFS_AIX_ENV
 	if (afs_osi_Wakeup(&tdc->validPos) == 0)
 	    afs_Trace4(afs_iclSetp, CM_TRACE_DCACHEWAKE,
 		       ICL_TYPE_STRING, __FILE__,
 		       ICL_TYPE_INT32, __LINE__,
 		       ICL_TYPE_POINTER, tdc,
 		       ICL_TYPE_INT32, tdc->dflags);
+#else
+	    afs_osi_Wakeup(&tdc->validPos);
+#endif
 	if (avc->execsOrWriters == 0) tdc->f.states &= ~DWriting;
 
 	/* now, if code != 0, we have an error and should punt.
diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index 46fbeeff6..57e1e0a61 100644
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -29,10 +29,15 @@ typedef struct socket *osi_socket;
 #ifdef RX_KERNEL_TRACE
 #include "../afs/icl.h"
 #include "../afs/afs_trace.h"
+#ifdef AFS_AIX_ENV
 #define osi_rxSleep(a)  afs_Trace2(afs_iclSetp, CM_TRACE_RXSLEEP, \
         ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__); afs_osi_Sleep(a)
 #define osi_rxWakeup(a) if (afs_osi_Wakeup(a) == 0) afs_Trace2(afs_iclSetp, \
         CM_TRACE_RXWAKE, ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__)
+#else
+#define osi_rxSleep(a)  afs_osi_Sleep(a)
+#define osi_rxWakeup(a) afs_osi_Wakeup(a)
+#endif
 #else /* RX_KERNEL_TRACE */
 #define	osi_rxSleep(a)	afs_osi_Sleep(a)
 #define	osi_rxWakeup(a)	afs_osi_Wakeup(a)