From 9358e452a90c3d87f025a54e503da2b2d062dbef Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 25 Oct 2012 11:32:03 +0100 Subject: [PATCH] rx: Don't have 2 different protos for rxi_CheckCall Use a single prototype for rxi_CheckCall in both the pthread and lwp cases. Remove the #ifdef maze at the call sites, and take advantage of the fact that MUTEX_EXIT reduces to an empty string in the lwp case. Change-Id: Iaa8c1b983f1c8372e9c2e1b90aaef25a2bc5f81f Reviewed-on: http://gerrit.openafs.org/8291 Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/rx/rx.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/rx/rx.c b/src/rx/rx.c index 269d21580..c4c98149e 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -151,12 +151,10 @@ static void rxi_ScheduleGrowMTUEvent(struct rx_call *call, int secs); static void rxi_KeepAliveOn(struct rx_call *call); static void rxi_GrowMTUOn(struct rx_call *call); static void rxi_ChallengeOn(struct rx_connection *conn); +static int rxi_CheckCall(struct rx_call *call, int haveCTLock); #ifdef RX_ENABLE_LOCKS -static int rxi_CheckCall(struct rx_call *call, int haveCTLock); static void rxi_SetAcksInTransmitQueue(struct rx_call *call); -#else -static int rxi_CheckCall(struct rx_call *call); #endif #ifdef AFS_GLOBAL_RXLOCK_KERNEL @@ -6319,13 +6317,8 @@ rxi_Send(struct rx_call *call, struct rx_packet *p, * may be freed! * haveCTLock Set if calling from rxi_ReapConnections */ -#ifdef RX_ENABLE_LOCKS static int rxi_CheckCall(struct rx_call *call, int haveCTLock) -#else /* RX_ENABLE_LOCKS */ -static int -rxi_CheckCall(struct rx_call *call) -#endif /* RX_ENABLE_LOCKS */ { struct rx_connection *conn = call->conn; afs_uint32 now; @@ -6622,15 +6615,10 @@ rxi_KeepAliveEvent(struct rxevent *event, void *arg1, void *dummy, now = clock_Sec(); -#ifdef RX_ENABLE_LOCKS if (rxi_CheckCall(call, 0)) { MUTEX_EXIT(&call->lock); return; } -#else /* RX_ENABLE_LOCKS */ - if (rxi_CheckCall(call)) - return; -#endif /* RX_ENABLE_LOCKS */ /* Don't try to keep alive dallying calls */ if (call->state == RX_STATE_DALLY) { @@ -6664,15 +6652,10 @@ rxi_GrowMTUEvent(struct rxevent *event, void *arg1, void *dummy, int dummy2) call->growMTUEvent = NULL; } -#ifdef RX_ENABLE_LOCKS if (rxi_CheckCall(call, 0)) { MUTEX_EXIT(&call->lock); return; } -#else /* RX_ENABLE_LOCKS */ - if (rxi_CheckCall(call)) - return; -#endif /* RX_ENABLE_LOCKS */ /* Don't bother with dallying calls */ if (call->state == RX_STATE_DALLY) { @@ -7088,11 +7071,7 @@ rxi_ReapConnections(struct rxevent *unused, void *unused1, void *unused2, code = MUTEX_TRYENTER(&call->lock); if (!code) continue; -#ifdef RX_ENABLE_LOCKS result = rxi_CheckCall(call, 1); -#else /* RX_ENABLE_LOCKS */ - result = rxi_CheckCall(call); -#endif /* RX_ENABLE_LOCKS */ MUTEX_EXIT(&call->lock); if (result == -2) { /* If CheckCall freed the call, it might -- 2.39.5