jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rx warning removal

Browse Source 
This patch set removes many but not all of the warnings
in the rx library.

 - use AFS_PTR_FMT in dpf debugging output

 - fix many signed vs unsigned warnings

 - on Windows, the first parameter to select() is ignored.
   Passing an osi_socket produces an unnecessary warning.

 - In rx_SlowReadPacket and rx_SlowWritePacket, use 'r' the
   unsigned value for internal computation and 'resid' for
   holding the original value.  This avoids many signed vs
   unsigned warnings.

LICENSE BSD

Reviewed-on: http://gerrit.openafs.org/695
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Jeffrey Altman 2009-10-20 15:08:51 -04:00 committed by Derrick Brashear
parent c188acf396
commit e7e057346f
4 changed files with 106 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/rx/rx.c
View File

@ -800,7 +800,8 @@ rx_NewConnection(afs_uint32 shost, u_short sport, u_short sservice,
SPLVAR; SPLVAR;
clock_NewTime(); clock_NewTime();
dpf(("rx_NewConnection(host %x, port %u, service %u, securityObject %x, serviceSecurityIndex %d)\n", ntohl(shost), ntohs(sport), sservice, securityObject, serviceSecurityIndex)); dpf(("rx_NewConnection(host %x, port %u, service %u, securityObject %x, serviceSecurityIndex %d)\n",
ntohl(shost), ntohs(sport), sservice, securityObject, serviceSecurityIndex));
/* Vasilsi said: "NETPRI protects Cid and Alloc", but can this be true in /* Vasilsi said: "NETPRI protects Cid and Alloc", but can this be true in
* the case of kmem_alloc? */ * the case of kmem_alloc? */
@ -1132,7 +1133,7 @@ rx_NewCall(struct rx_connection *conn)
SPLVAR; SPLVAR;
clock_NewTime(); clock_NewTime();
dpf(("rx_NewCall(conn %x)\n", conn)); dpf(("rx_NewCall(conn %"AFS_PTR_FMT")\n", conn));
NETPRI; NETPRI;
clock_GetTime(&queueTime); clock_GetTime(&queueTime);
@ -1247,7 +1248,7 @@ rx_NewCall(struct rx_connection *conn)
MUTEX_EXIT(&call->lock); MUTEX_EXIT(&call->lock);
#endif /* AFS_GLOBAL_RXLOCK_KERNEL */ #endif /* AFS_GLOBAL_RXLOCK_KERNEL */
dpf(("rx_NewCall(call %x)\n", call)); dpf(("rx_NewCall(call %"AFS_PTR_FMT")\n", call));
return call; return call;
} }
@ -1733,14 +1734,14 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
#endif #endif
rxi_calltrace(RX_CALL_START, call); rxi_calltrace(RX_CALL_START, call);
dpf(("rx_GetCall(port=%d, service=%d) ==> call %x\n", dpf(("rx_GetCall(port=%d, service=%d) ==> call %"AFS_PTR_FMT"\n",
call->conn->service->servicePort, call->conn->service->serviceId, call->conn->service->servicePort, call->conn->service->serviceId,
call)); call));
CALL_HOLD(call, RX_CALL_REFCOUNT_BEGIN); CALL_HOLD(call, RX_CALL_REFCOUNT_BEGIN);
MUTEX_EXIT(&call->lock); MUTEX_EXIT(&call->lock);
} else { } else {
dpf(("rx_GetCall(socketp=0x%x, *socketp=0x%x)\n", socketp, *socketp)); dpf(("rx_GetCall(socketp=0x%"AFS_PTR_FMT", *socketp=0x%"AFS_PTR_FMT")\n", socketp, *socketp));
} }
return call; return call;
@ -1891,7 +1892,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
call->conn->service->servicePort, call->conn->service->serviceId, call->conn->service->servicePort, call->conn->service->serviceId,
call)); call));
} else { } else {
dpf(("rx_GetCall(socketp=0x%x, *socketp=0x%x)\n", socketp, *socketp)); dpf(("rx_GetCall(socketp=0x%"AFS_PTR_FMT", *socketp=0x%"AFS_PTR_FMT")\n", socketp, *socketp));
} }
USERPRI; USERPRI;
@ -1938,7 +1939,8 @@ rx_EndCall(struct rx_call *call, afs_int32 rc)
dpf(("rx_EndCall(call %x rc %d error %d abortCode %d)\n", call, rc, call->error, call->abortCode)); dpf(("rx_EndCall(call %"AFS_PTR_FMT" rc %d error %d abortCode %d)\n",
call, rc, call->error, call->abortCode));
NETPRI; NETPRI;
MUTEX_ENTER(&call->lock); MUTEX_ENTER(&call->lock);
@ -2185,7 +2187,7 @@ rxi_NewCall(struct rx_connection *conn, int channel)
struct rx_call *nxp; /* Next call pointer, for queue_Scan */ struct rx_call *nxp; /* Next call pointer, for queue_Scan */
#endif /* AFS_GLOBAL_RXLOCK_KERNEL */ #endif /* AFS_GLOBAL_RXLOCK_KERNEL */
dpf(("rxi_NewCall(conn %x, channel %d)\n", conn, channel)); dpf(("rxi_NewCall(conn %"AFS_PTR_FMT", channel %d)\n", conn, channel));
/* Grab an existing call structure, or allocate a new one. /* Grab an existing call structure, or allocate a new one.
* Existing call structures are assumed to have been left reset by * Existing call structures are assumed to have been left reset by
@ -2596,7 +2598,7 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
* this is the first time the packet has been seen */ * this is the first time the packet has been seen */
packetType = (np->header.type > 0 && np->header.type < RX_N_PACKET_TYPES) packetType = (np->header.type > 0 && np->header.type < RX_N_PACKET_TYPES)
? rx_packetTypes[np->header.type - 1] : "*UNKNOWN*"; ? rx_packetTypes[np->header.type - 1] : "*UNKNOWN*";
dpf(("R %d %s: %x.%d.%d.%d.%d.%d.%d flags %d, packet %x", dpf(("R %d %s: %x.%d.%d.%d.%d.%d.%d flags %d, packet %"AFS_PTR_FMT,
np->header.serial, packetType, ntohl(host), ntohs(port), np->header.serviceId, np->header.serial, packetType, ntohl(host), ntohs(port), np->header.serviceId,
np->header.epoch, np->header.cid, np->header.callNumber, np->header.epoch, np->header.cid, np->header.callNumber,
np->header.seq, np->header.flags, np)); np->header.seq, np->header.flags, np));
@ -2773,7 +2775,10 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
*call->callNumber = np->header.callNumber; *call->callNumber = np->header.callNumber;
#ifdef RXDEBUG #ifdef RXDEBUG
if (np->header.callNumber == 0) if (np->header.callNumber == 0)
dpf(("RecPacket call 0 %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %lx resend %d.%0.3d len %d", np->header.serial, rx_packetTypes[np->header.type - 1], ntohl(conn->peer->host), ntohs(conn->peer->port), np->header.serial, np->header.epoch, np->header.cid, np->header.callNumber, np->header.seq, np->header.flags, (unsigned long)np, np->retryTime.sec, np->retryTime.usec / 1000, np->length)); dpf(("RecPacket call 0 %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %"AFS_PTR_FMT" resend %d.%0.06d len %d",
np->header.serial, rx_packetTypes[np->header.type - 1], ntohl(conn->peer->host), ntohs(conn->peer->port),
np->header.serial, np->header.epoch, np->header.cid, np->header.callNumber, np->header.seq,
np->header.flags, np, np->retryTime.sec, np->retryTime.usec / 1000, np->length));
#endif #endif
call->state = RX_STATE_PRECALL; call->state = RX_STATE_PRECALL;
clock_GetTime(&call->queueTime); clock_GetTime(&call->queueTime);
@ -2838,7 +2843,10 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
*call->callNumber = np->header.callNumber; *call->callNumber = np->header.callNumber;
#ifdef RXDEBUG #ifdef RXDEBUG
if (np->header.callNumber == 0) if (np->header.callNumber == 0)
dpf(("RecPacket call 0 %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %lx resend %d.%06d len %d", np->header.serial, rx_packetTypes[np->header.type - 1], ntohl(conn->peer->host), ntohs(conn->peer->port), np->header.serial, np->header.epoch, np->header.cid, np->header.callNumber, np->header.seq, np->header.flags, (unsigned long)np, np->retryTime.sec, np->retryTime.usec, np->length)); dpf(("RecPacket call 0 %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %"AFS_PTR_FMT" resend %d.%06d len %d",
np->header.serial, rx_packetTypes[np->header.type - 1], ntohl(conn->peer->host), ntohs(conn->peer->port),
np->header.serial, np->header.epoch, np->header.cid, np->header.callNumber, np->header.seq,
np->header.flags, np, np->retryTime.sec, np->retryTime.usec, np->length));
#endif #endif
call->state = RX_STATE_PRECALL; call->state = RX_STATE_PRECALL;
clock_GetTime(&call->queueTime); clock_GetTime(&call->queueTime);
@ -2986,8 +2994,8 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
struct rx_peer *peer; struct rx_peer *peer;
peer = conn->peer; peer = conn->peer;
if (skew > peer->inPacketSkew) { if (skew > peer->inPacketSkew) {
dpf(("*** In skew changed from %d to %d\n", peer->inPacketSkew, dpf(("*** In skew changed from %d to %d\n",
skew)); peer->inPacketSkew, skew));
peer->inPacketSkew = skew; peer->inPacketSkew = skew;
} }
} }
@ -3271,7 +3279,7 @@ rxi_ReceiveDataPacket(struct rx_call *call,
rx_MutexIncrement(rx_stats.noPacketBuffersOnRead, rx_stats_mutex); rx_MutexIncrement(rx_stats.noPacketBuffersOnRead, rx_stats_mutex);
call->rprev = np->header.serial; call->rprev = np->header.serial;
rxi_calltrace(RX_TRACE_DROP, call); rxi_calltrace(RX_TRACE_DROP, call);
dpf(("packet %x dropped on receipt - quota problems", np)); dpf(("packet %"AFS_PTR_FMT" dropped on receipt - quota problems", np));
if (rxi_doreclaim) if (rxi_doreclaim)
rxi_ClearReceiveQueue(call); rxi_ClearReceiveQueue(call);
clock_GetTime(&now); clock_GetTime(&now);
@ -3335,7 +3343,7 @@ rxi_ReceiveDataPacket(struct rx_call *call,
&& queue_First(&call->rq, rx_packet)->header.seq == seq) { && queue_First(&call->rq, rx_packet)->header.seq == seq) {
if (rx_stats_active) if (rx_stats_active)
rx_MutexIncrement(rx_stats.dupPacketsRead, rx_stats_mutex); rx_MutexIncrement(rx_stats.dupPacketsRead, rx_stats_mutex);
dpf(("packet %x dropped on receipt - duplicate", np)); dpf(("packet %"AFS_PTR_FMT" dropped on receipt - duplicate", np));
rxevent_Cancel(call->delayedAckEvent, call, rxevent_Cancel(call->delayedAckEvent, call,
RX_CALL_REFCOUNT_DELAY); RX_CALL_REFCOUNT_DELAY);
np = rxi_SendAck(call, np, serial, RX_ACK_DUPLICATE, istack); np = rxi_SendAck(call, np, serial, RX_ACK_DUPLICATE, istack);
@ -3930,7 +3938,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np,
/* If the ack packet has a "recommended" size that is less than /* If the ack packet has a "recommended" size that is less than
* what I am using now, reduce my size to match */ * what I am using now, reduce my size to match */
rx_packetread(np, rx_AckDataSize(ap->nAcks) + sizeof(afs_int32), rx_packetread(np, rx_AckDataSize(ap->nAcks) + (int)sizeof(afs_int32),
(int)sizeof(afs_int32), &tSize); (int)sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize); tSize = (afs_uint32) ntohl(tSize);
peer->natMTU = rxi_AdjustIfMTU(MIN(tSize, peer->ifMTU)); peer->natMTU = rxi_AdjustIfMTU(MIN(tSize, peer->ifMTU));
@ -3957,7 +3965,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np,
if (np->length == rx_AckDataSize(ap->nAcks) + 3 * sizeof(afs_int32)) { if (np->length == rx_AckDataSize(ap->nAcks) + 3 * sizeof(afs_int32)) {
/* AFS 3.4a */ /* AFS 3.4a */
rx_packetread(np, rx_packetread(np,
rx_AckDataSize(ap->nAcks) + 2 * sizeof(afs_int32), rx_AckDataSize(ap->nAcks) + 2 * (int)sizeof(afs_int32),
(int)sizeof(afs_int32), &tSize); (int)sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize); /* peer's receive window, if it's */ tSize = (afs_uint32) ntohl(tSize); /* peer's receive window, if it's */
if (tSize < call->twind) { /* smaller than our send */ if (tSize < call->twind) { /* smaller than our send */
@ -3979,7 +3987,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np,
rx_AckDataSize(ap->nAcks) + 4 * sizeof(afs_int32)) { rx_AckDataSize(ap->nAcks) + 4 * sizeof(afs_int32)) {
/* AFS 3.5 */ /* AFS 3.5 */
rx_packetread(np, rx_packetread(np,
rx_AckDataSize(ap->nAcks) + 2 * sizeof(afs_int32), rx_AckDataSize(ap->nAcks) + 2 * (int)sizeof(afs_int32),
sizeof(afs_int32), &tSize); sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize); tSize = (afs_uint32) ntohl(tSize);
/* /*
@ -4001,8 +4009,8 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np,
* larger than the natural MTU. * larger than the natural MTU.
*/ */
rx_packetread(np, rx_packetread(np,
rx_AckDataSize(ap->nAcks) + 3 * sizeof(afs_int32), rx_AckDataSize(ap->nAcks) + 3 * (int)sizeof(afs_int32),
sizeof(afs_int32), &tSize); (int)sizeof(afs_int32), &tSize);
maxDgramPackets = (afs_uint32) ntohl(tSize); maxDgramPackets = (afs_uint32) ntohl(tSize);
maxDgramPackets = MIN(maxDgramPackets, rxi_nDgramPackets); maxDgramPackets = MIN(maxDgramPackets, rxi_nDgramPackets);
maxDgramPackets = maxDgramPackets =
@ -4474,7 +4482,7 @@ rxi_ClearReceiveQueue(struct rx_call *call)
#ifdef RXDEBUG_PACKET #ifdef RXDEBUG_PACKET
call->rqc -= count; call->rqc -= count;
if ( call->rqc != 0 ) if ( call->rqc != 0 )
dpf(("rxi_ClearReceiveQueue call %x rqc %u != 0", call, call->rqc)); dpf(("rxi_ClearReceiveQueue call %"AFS_PTR_FMT" rqc %u != 0", call, call->rqc));
#endif #endif
call->flags &= ~(RX_CALL_RECEIVE_DONE | RX_CALL_HAVE_LAST); call->flags &= ~(RX_CALL_RECEIVE_DONE | RX_CALL_HAVE_LAST);
} }
@ -4583,7 +4591,7 @@ rxi_ConnectionError(struct rx_connection *conn,
if (error) { if (error) {
int i; int i;
dpf(("rxi_ConnectionError conn %x error %d", conn, error)); dpf(("rxi_ConnectionError conn %"AFS_PTR_FMT" error %d", conn, error));
MUTEX_ENTER(&conn->conn_data_lock); MUTEX_ENTER(&conn->conn_data_lock);
if (conn->challengeEvent) if (conn->challengeEvent)
@ -4615,7 +4623,7 @@ rxi_CallError(struct rx_call *call, afs_int32 error)
#ifdef DEBUG #ifdef DEBUG
osirx_AssertMine(&call->lock, "rxi_CallError"); osirx_AssertMine(&call->lock, "rxi_CallError");
#endif #endif
dpf(("rxi_CallError call %x error %d call->error %d", call, error, call->error)); dpf(("rxi_CallError call %"AFS_PTR_FMT" error %d call->error %d", call, error, call->error));
if (call->error) if (call->error)
error = call->error; error = call->error;
@ -4649,7 +4657,7 @@ rxi_ResetCall(struct rx_call *call, int newcall)
#ifdef DEBUG #ifdef DEBUG
osirx_AssertMine(&call->lock, "rxi_ResetCall"); osirx_AssertMine(&call->lock, "rxi_ResetCall");
#endif #endif
dpf(("rxi_ResetCall(call %x, newcall %d)\n", call, newcall)); dpf(("rxi_ResetCall(call %"AFS_PTR_FMT", newcall %d)\n", call, newcall));
/* Notify anyone who is waiting for asynchronous packet arrival */ /* Notify anyone who is waiting for asynchronous packet arrival */
if (call->arrivalProc) { if (call->arrivalProc) {
@ -4708,7 +4716,7 @@ rxi_ResetCall(struct rx_call *call, int newcall)
rxi_ClearTransmitQueue(call, 1); rxi_ClearTransmitQueue(call, 1);
/* why init the queue if you just emptied it? queue_Init(&call->tq); */ /* why init the queue if you just emptied it? queue_Init(&call->tq); */
if (call->tqWaiters || (flags & RX_CALL_TQ_WAIT)) { if (call->tqWaiters || (flags & RX_CALL_TQ_WAIT)) {
dpf(("rcall %x has %d waiters and flags %d\n", call, call->tqWaiters, call->flags)); dpf(("rcall %"AFS_PTR_FMT" has %d waiters and flags %d\n", call, call->tqWaiters, call->flags));
} }
call->flags = 0; call->flags = 0;
while (call->tqWaiters) { while (call->tqWaiters) {
@ -5350,9 +5358,8 @@ rxi_Start(struct rxevent *event,
* some of them have been retransmitted more times than more * some of them have been retransmitted more times than more
* recent additions. * recent additions.
* Do a dance to avoid blocking after setting now. */ * Do a dance to avoid blocking after setting now. */
clock_Zero(&retryTime);
MUTEX_ENTER(&peer->peer_lock); MUTEX_ENTER(&peer->peer_lock);
clock_Add(&retryTime, &peer->timeout); retryTime = peer->timeout;
MUTEX_EXIT(&peer->peer_lock); MUTEX_EXIT(&peer->peer_lock);
clock_GetTime(&now); clock_GetTime(&now);
clock_Add(&retryTime, &now); clock_Add(&retryTime, &now);
@ -5396,11 +5403,15 @@ rxi_Start(struct rxevent *event,
if (call->flags & RX_CALL_FAST_RECOVER_WAIT) { if (call->flags & RX_CALL_FAST_RECOVER_WAIT) {
/* We shouldn't be sending packets if a thread is waiting /* We shouldn't be sending packets if a thread is waiting
* to initiate congestion recovery */ * to initiate congestion recovery */
dpf(("call %d waiting to initiate fast recovery\n",
*(call->callNumber)));
break; break;
} }
if ((nXmitPackets) if ((nXmitPackets)
&& (call->flags & RX_CALL_FAST_RECOVER)) { && (call->flags & RX_CALL_FAST_RECOVER)) {
/* Only send one packet during fast recovery */ /* Only send one packet during fast recovery */
dpf(("call %d restricted to one packet per send during fast recovery\n",
*(call->callNumber)));
break; break;
} }
if ((p->flags & RX_PKTFLAG_FREE) if ((p->flags & RX_PKTFLAG_FREE)
@ -5430,8 +5441,9 @@ rxi_Start(struct rxevent *event,
/* Note: if we're waiting for more window space, we can /* Note: if we're waiting for more window space, we can
* still send retransmits; hence we don't return here, but * still send retransmits; hence we don't return here, but
* break out to schedule a retransmit event */ * break out to schedule a retransmit event */
dpf(("call %d waiting for window", dpf(("call %d waiting for window (seq %d, twind %d, nSoftAcked %d, cwind %d)\n",
*(call->callNumber))); *(call->callNumber), p->header.seq, call->twind, call->nSoftAcked,
call->cwind));
break; break;
} }
@ -5445,6 +5457,11 @@ rxi_Start(struct rxevent *event,
sizeof(struct rx_packet *)); sizeof(struct rx_packet *));
goto restart; goto restart;
} }
dpf(("call %d xmit packet %"AFS_PTR_FMT" now %u.%06u retryTime %u.%06u nextRetry %u.%06u\n",
*(call->callNumber), p,
now.sec, now.usec,
p->retryTime.sec, p->retryTime.usec,
retryTime.sec, retryTime.usec));
xmitList[nXmitPackets++] = p; xmitList[nXmitPackets++] = p;
} }
} }
@ -5466,7 +5483,8 @@ rxi_Start(struct rxevent *event,
if (call->flags & RX_CALL_FAST_RECOVER_WAIT) { if (call->flags & RX_CALL_FAST_RECOVER_WAIT) {
call->flags &= ~RX_CALL_TQ_BUSY; call->flags &= ~RX_CALL_TQ_BUSY;
if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) { if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) {
dpf(("call %x has %d waiters and flags %d\n", call, call->tqWaiters, call->flags)); dpf(("call %"AFS_PTR_FMT" has %d waiters and flags %d\n",
call, call->tqWaiters, call->flags));
#ifdef RX_ENABLE_LOCKS #ifdef RX_ENABLE_LOCKS
osirx_AssertMine(&call->lock, "rxi_Start start"); osirx_AssertMine(&call->lock, "rxi_Start start");
CV_BROADCAST(&call->cv_tq); CV_BROADCAST(&call->cv_tq);
@ -5485,7 +5503,8 @@ rxi_Start(struct rxevent *event,
rx_MutexIncrement(rx_tq_debug.rxi_start_aborted, rx_stats_mutex); rx_MutexIncrement(rx_tq_debug.rxi_start_aborted, rx_stats_mutex);
call->flags &= ~RX_CALL_TQ_BUSY; call->flags &= ~RX_CALL_TQ_BUSY;
if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) { if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) {
dpf(("call %x has %d waiters and flags %d\n", call, call->tqWaiters, call->flags)); dpf(("call error %d while xmit %x has %d waiters and flags %d\n",
call, call->error, call->tqWaiters, call->flags));
#ifdef RX_ENABLE_LOCKS #ifdef RX_ENABLE_LOCKS
osirx_AssertMine(&call->lock, "rxi_Start middle"); osirx_AssertMine(&call->lock, "rxi_Start middle");
CV_BROADCAST(&call->cv_tq); CV_BROADCAST(&call->cv_tq);
@ -5578,7 +5597,8 @@ rxi_Start(struct rxevent *event,
*/ */
call->flags &= ~RX_CALL_TQ_BUSY; call->flags &= ~RX_CALL_TQ_BUSY;
if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) { if (call->tqWaiters || (call->flags & RX_CALL_TQ_WAIT)) {
dpf(("call %x has %d waiters and flags %d\n", call, call->tqWaiters, call->flags)); dpf(("call %"AFS_PTR_FMT" has %d waiters and flags %d\n",
call, call->tqWaiters, call->flags));
#ifdef RX_ENABLE_LOCKS #ifdef RX_ENABLE_LOCKS
osirx_AssertMine(&call->lock, "rxi_Start end"); osirx_AssertMine(&call->lock, "rxi_Start end");
CV_BROADCAST(&call->cv_tq); CV_BROADCAST(&call->cv_tq);
@ -5966,6 +5986,8 @@ rxi_ComputeRoundTripTime(struct rx_packet *p,
return; /* somebody set the clock back, don't count this time. */ return; /* somebody set the clock back, don't count this time. */
} }
clock_Sub(rttp, sentp); clock_Sub(rttp, sentp);
dpf(("rxi_ComputeRoundTripTime(call=%d packet=%"AFS_PTR_FMT" rttp=%d.%06d sec)\n",
p->header.callNumber, p, rttp->sec, rttp->usec));
if (rx_stats_active) { if (rx_stats_active) {
MUTEX_ENTER(&rx_stats_mutex); MUTEX_ENTER(&rx_stats_mutex);
if (clock_Lt(rttp, &rx_stats.minRtt)) if (clock_Lt(rttp, &rx_stats.minRtt))
@ -6045,7 +6067,8 @@ rxi_ComputeRoundTripTime(struct rx_packet *p,
clock_Zero(&(peer->timeout)); clock_Zero(&(peer->timeout));
clock_Addmsec(&(peer->timeout), rtt_timeout); clock_Addmsec(&(peer->timeout), rtt_timeout);
dpf(("rxi_ComputeRoundTripTime(rtt=%d ms, srtt=%d ms, rtt_dev=%d ms, timeout=%d.%06d sec)\n", MSEC(rttp), peer->rtt >> 3, peer->rtt_dev >> 2, (peer->timeout.sec), (peer->timeout.usec))); dpf(("rxi_ComputeRoundTripTime(call=%d packet=%"AFS_PTR_FMT" rtt=%d ms, srtt=%d ms, rtt_dev=%d ms, timeout=%d.%06d sec)\n",
p->header.callNumber, p, MSEC(rttp), peer->rtt >> 3, peer->rtt_dev >> 2, (peer->timeout.sec), (peer->timeout.usec)));
} }
@ -6283,7 +6306,9 @@ rxi_ComputeRate(struct rx_peer *peer, struct rx_call *call,
return; return;
} }
dpf(("CONG peer %lx/%u: sample (%s) size %ld, %ld ms (to %d.%06d, rtt %u, ps %u)", ntohl(peer->host), ntohs(peer->port), (ackReason == RX_ACK_REQUESTED ? "dataack" : "pingack"), xferSize, xferMs, peer->timeout.sec, peer->timeout.usec, peer->smRtt, peer->ifMTU)); dpf(("CONG peer %lx/%u: sample (%s) size %ld, %ld ms (to %d.%06d, rtt %u, ps %u)",
ntohl(peer->host), ntohs(peer->port), (ackReason == RX_ACK_REQUESTED ? "dataack" : "pingack"),
xferSize, xferMs, peer->timeout.sec, peer->timeout.usec, peer->smRtt, peer->ifMTU));
/* Track only packets that are big enough. */ /* Track only packets that are big enough. */
if ((p->length + RX_HEADER_SIZE + call->conn->securityMaxTrailerSize) < if ((p->length + RX_HEADER_SIZE + call->conn->securityMaxTrailerSize) <
@ -6329,7 +6354,9 @@ rxi_ComputeRate(struct rx_peer *peer, struct rx_call *call,
* one packet exchange */ * one packet exchange */
if (clock_Gt(&newTO, &peer->timeout)) { if (clock_Gt(&newTO, &peer->timeout)) {
dpf(("CONG peer %lx/%u: timeout %d.%06d ==> %ld.%06d (rtt %u, ps %u)", ntohl(peer->host), ntohs(peer->port), peer->timeout.sec, peer->timeout.usec, newTO.sec, newTO.usec, peer->smRtt, peer->packetSize)); dpf(("CONG peer %lx/%u: timeout %d.%06d ==> %ld.%06d (rtt %u, ps %u)",
ntohl(peer->host), ntohs(peer->port), peer->timeout.sec, peer->timeout.usec,
newTO.sec, newTO.usec, peer->smRtt, peer->packetSize));
peer->timeout = newTO; peer->timeout = newTO;
} }
@ -6674,7 +6701,11 @@ MakeDebugCall(osi_socket socket, afs_uint32 remoteAddr, afs_uint16 remotePort,
} }
tv_delta.tv_sec -= tv_now.tv_sec; tv_delta.tv_sec -= tv_now.tv_sec;
#ifdef AFS_NT40_ENV
code = select(0, &imask, 0, 0, &tv_delta);
#else /* AFS_NT40_ENV */
code = select(socket + 1, &imask, 0, 0, &tv_delta); code = select(socket + 1, &imask, 0, 0, &tv_delta);
#endif /* AFS_NT40_ENV */
if (code == 1 && FD_ISSET(socket, &imask)) { if (code == 1 && FD_ISSET(socket, &imask)) {
/* now receive a packet */ /* now receive a packet */
faddrLen = sizeof(struct sockaddr_in); faddrLen = sizeof(struct sockaddr_in);

70
src/rx/rx_packet.c
View File

@ -189,17 +189,17 @@ rx_SlowReadPacket(struct rx_packet * packet, unsigned int offset, int resid,
* offset only applies to the first iovec. * offset only applies to the first iovec.
*/ */
r = resid; r = resid;
while ((resid > 0) && (i < packet->niovecs)) { while ((r > 0) && (i < packet->niovecs)) {
j = MIN(resid, packet->wirevec[i].iov_len - (offset - l)); j = MIN(r, packet->wirevec[i].iov_len - (offset - l));
memcpy(out, (char *)(packet->wirevec[i].iov_base) + (offset - l), j); memcpy(out, (char *)(packet->wirevec[i].iov_base) + (offset - l), j);
resid -= j; r -= j;
out += j; out += j;
l += packet->wirevec[i].iov_len; l += packet->wirevec[i].iov_len;
offset = l; offset = l;
i++; i++;
} }
return (resid ? (r - resid) : r); return (r ? (resid - r) : resid);
} }
@ -211,11 +211,11 @@ rx_SlowReadPacket(struct rx_packet * packet, unsigned int offset, int resid,
afs_int32 afs_int32
rx_SlowWritePacket(struct rx_packet * packet, int offset, int resid, char *in) rx_SlowWritePacket(struct rx_packet * packet, int offset, int resid, char *in)
{ {
int i, j, l, r; unsigned int i, j, l, o, r;
char *b; char *b;
for (l = 0, i = 1; i < packet->niovecs; i++) { for (l = 0, i = 1, o = offset; i < packet->niovecs; i++) {
if (l + packet->wirevec[i].iov_len > offset) { if (l + packet->wirevec[i].iov_len > o) {
break; break;
} }
l += packet->wirevec[i].iov_len; l += packet->wirevec[i].iov_len;
@ -227,22 +227,22 @@ rx_SlowWritePacket(struct rx_packet * packet, int offset, int resid, char *in)
* offset only applies to the first iovec. * offset only applies to the first iovec.
*/ */
r = resid; r = resid;
while ((resid > 0) && (i <= RX_MAXWVECS)) { while ((r > 0) && (i <= RX_MAXWVECS)) {
if (i >= packet->niovecs) if (i >= packet->niovecs)
if (rxi_AllocDataBuf(packet, resid, RX_PACKET_CLASS_SEND_CBUF) > 0) /* ++niovecs as a side-effect */ if (rxi_AllocDataBuf(packet, r, RX_PACKET_CLASS_SEND_CBUF) > 0) /* ++niovecs as a side-effect */
break; break;
b = (char *)(packet->wirevec[i].iov_base) + (offset - l); b = (char *)(packet->wirevec[i].iov_base) + (offset - l);
j = MIN(resid, packet->wirevec[i].iov_len - (offset - l)); j = MIN(r, packet->wirevec[i].iov_len - (offset - l));
memcpy(b, in, j); memcpy(b, in, j);
resid -= j; r -= j;
in += j; in += j;
l += packet->wirevec[i].iov_len; l += packet->wirevec[i].iov_len;
offset = l; offset = l;
i++; i++;
} }
return (resid ? (r - resid) : r); return (r ? (resid - r) : resid);
} }
int int
@ -812,7 +812,7 @@ void
rxi_FreePacketNoLock(struct rx_packet *p) rxi_FreePacketNoLock(struct rx_packet *p)
{ {
struct rx_ts_info_t * rx_ts_info; struct rx_ts_info_t * rx_ts_info;
dpf(("Free %lx\n", (unsigned long)p)); dpf(("Free %"AFS_PTR_FMT"\n", p));
RX_TS_INFO_GET(rx_ts_info); RX_TS_INFO_GET(rx_ts_info);
RX_TS_FPQ_CHECKIN(rx_ts_info,p); RX_TS_FPQ_CHECKIN(rx_ts_info,p);
@ -824,7 +824,7 @@ rxi_FreePacketNoLock(struct rx_packet *p)
void void
rxi_FreePacketNoLock(struct rx_packet *p) rxi_FreePacketNoLock(struct rx_packet *p)
{ {
dpf(("Free %lx\n", (unsigned long)p)); dpf(("Free %"AFS_PTR_FMT"\n", p));
RX_FPQ_MARK_FREE(p); RX_FPQ_MARK_FREE(p);
rx_nFreePackets++; rx_nFreePackets++;
@ -837,7 +837,7 @@ void
rxi_FreePacketTSFPQ(struct rx_packet *p, int flush_global) rxi_FreePacketTSFPQ(struct rx_packet *p, int flush_global)
{ {
struct rx_ts_info_t * rx_ts_info; struct rx_ts_info_t * rx_ts_info;
dpf(("Free %lx\n", (unsigned long)p)); dpf(("Free %"AFS_PTR_FMT"\n", p));
RX_TS_INFO_GET(rx_ts_info); RX_TS_INFO_GET(rx_ts_info);
RX_TS_FPQ_CHECKIN(rx_ts_info,p); RX_TS_FPQ_CHECKIN(rx_ts_info,p);
@ -973,7 +973,7 @@ int rxi_nBadIovecs = 0;
void void
rxi_RestoreDataBufs(struct rx_packet *p) rxi_RestoreDataBufs(struct rx_packet *p)
{ {
int i; unsigned int i;
struct iovec *iov = &p->wirevec[2]; struct iovec *iov = &p->wirevec[2];
RX_PACKET_IOV_INIT(p); RX_PACKET_IOV_INIT(p);
@ -1162,7 +1162,7 @@ rxi_AllocPacketNoLock(int class)
RX_TS_FPQ_CHECKOUT(rx_ts_info,p); RX_TS_FPQ_CHECKOUT(rx_ts_info,p);
dpf(("Alloc %lx, class %d\n", (unsigned long)p, class)); dpf(("Alloc %"AFS_PTR_FMT", class %d\n", p, class));
/* have to do this here because rx_FlushWrite fiddles with the iovs in /* have to do this here because rx_FlushWrite fiddles with the iovs in
@ -1220,7 +1220,7 @@ rxi_AllocPacketNoLock(int class)
queue_Remove(p); queue_Remove(p);
RX_FPQ_MARK_USED(p); RX_FPQ_MARK_USED(p);
dpf(("Alloc %lx, class %d\n", (unsigned long)p, class)); dpf(("Alloc %"AFS_PTR_FMT", class %d\n", p, class));
/* have to do this here because rx_FlushWrite fiddles with the iovs in /* have to do this here because rx_FlushWrite fiddles with the iovs in
@ -1258,7 +1258,7 @@ rxi_AllocPacketTSFPQ(int class, int pull_global)
RX_TS_FPQ_CHECKOUT(rx_ts_info,p); RX_TS_FPQ_CHECKOUT(rx_ts_info,p);
dpf(("Alloc %lx, class %d\n", (unsigned long)p, class)); dpf(("Alloc %"AFS_PTR_FMT", class %d\n", p, class));
/* have to do this here because rx_FlushWrite fiddles with the iovs in /* have to do this here because rx_FlushWrite fiddles with the iovs in
* order to truncate outbound packets. In the near future, may need * order to truncate outbound packets. In the near future, may need
@ -1318,7 +1318,7 @@ rxi_AllocSendPacket(struct rx_call *call, int want)
(void)rxi_AllocDataBuf(p, (want - p->length), (void)rxi_AllocDataBuf(p, (want - p->length),
RX_PACKET_CLASS_SEND_CBUF); RX_PACKET_CLASS_SEND_CBUF);
if ((unsigned)p->length > mud) if (p->length > mud)
p->length = mud; p->length = mud;
if (delta >= p->length) { if (delta >= p->length) {
@ -1344,7 +1344,7 @@ rxi_AllocSendPacket(struct rx_call *call, int want)
(void)rxi_AllocDataBuf(p, (want - p->length), (void)rxi_AllocDataBuf(p, (want - p->length),
RX_PACKET_CLASS_SEND_CBUF); RX_PACKET_CLASS_SEND_CBUF);
if ((unsigned)p->length > mud) if (p->length > mud)
p->length = mud; p->length = mud;
if (delta >= p->length) { if (delta >= p->length) {
@ -1421,9 +1421,9 @@ rxi_ReadPacket(osi_socket socket, struct rx_packet *p, afs_uint32 * host,
u_short * port) u_short * port)
{ {
struct sockaddr_in from; struct sockaddr_in from;
int nbytes; unsigned int nbytes;
afs_int32 rlen; afs_int32 rlen;
afs_int32 tlen, savelen; afs_uint32 tlen, savelen;
struct msghdr msg; struct msghdr msg;
rx_computelen(p, tlen); rx_computelen(p, tlen);
rx_SetDataSize(p, tlen); /* this is the size of the user data area */ rx_SetDataSize(p, tlen); /* this is the size of the user data area */
@ -1459,7 +1459,7 @@ rxi_ReadPacket(osi_socket socket, struct rx_packet *p, afs_uint32 * host,
/* restore the vec to its correct state */ /* restore the vec to its correct state */
p->wirevec[p->niovecs - 1].iov_len = savelen; p->wirevec[p->niovecs - 1].iov_len = savelen;
p->length = (nbytes - RX_HEADER_SIZE); p->length = (u_short)(nbytes - RX_HEADER_SIZE);
if ((nbytes > tlen) || (p->length & 0x8000)) { /* Bogus packet */ if ((nbytes > tlen) || (p->length & 0x8000)) { /* Bogus packet */
if (nbytes < 0 && errno == EWOULDBLOCK) { if (nbytes < 0 && errno == EWOULDBLOCK) {
if (rx_stats_active) if (rx_stats_active)
@ -1839,7 +1839,7 @@ rxi_ReceiveDebugPacket(struct rx_packet *ap, osi_socket asocket,
case RX_DEBUGI_GETALLCONN: case RX_DEBUGI_GETALLCONN:
case RX_DEBUGI_GETCONN:{ case RX_DEBUGI_GETCONN:{
int i, j; unsigned int i, j;
struct rx_connection *tc; struct rx_connection *tc;
struct rx_call *tcall; struct rx_call *tcall;
struct rx_debugConn tconn; struct rx_debugConn tconn;
@ -1948,7 +1948,7 @@ rxi_ReceiveDebugPacket(struct rx_packet *ap, osi_socket asocket,
*/ */
case RX_DEBUGI_GETPEER:{ case RX_DEBUGI_GETPEER:{
int i; unsigned int i;
struct rx_peer *tp; struct rx_peer *tp;
struct rx_debugPeer tpeer; struct rx_debugPeer tpeer;
@ -2111,10 +2111,8 @@ rxi_SendDebugPacket(struct rx_packet *apacket, osi_socket asocket,
afs_int32 ahost, short aport, afs_int32 istack) afs_int32 ahost, short aport, afs_int32 istack)
{ {
struct sockaddr_in taddr; struct sockaddr_in taddr;
int i; unsigned int i, nbytes, savelen = 0;
int nbytes;
int saven = 0; int saven = 0;
size_t savelen = 0;
#ifdef KERNEL #ifdef KERNEL
int waslocked = ISAFS_GLOCK(); int waslocked = ISAFS_GLOCK();
#endif #endif
@ -2311,7 +2309,10 @@ rxi_SendPacket(struct rx_call *call, struct rx_connection *conn,
#endif #endif
#ifdef RXDEBUG #ifdef RXDEBUG
} }
dpf(("%c %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %lx resend %d.%0.3d len %d", deliveryType, p->header.serial, rx_packetTypes[p->header.type - 1], ntohl(peer->host), ntohs(peer->port), p->header.serial, p->header.epoch, p->header.cid, p->header.callNumber, p->header.seq, p->header.flags, (unsigned long)p, p->retryTime.sec, p->retryTime.usec / 1000, p->length)); dpf(("%c %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %"AFS_PTR_FMT" resend %d.%0.3d len %d",
deliveryType, p->header.serial, rx_packetTypes[p->header.type - 1], ntohl(peer->host),
ntohs(peer->port), p->header.serial, p->header.epoch, p->header.cid, p->header.callNumber,
p->header.seq, p->header.flags, p, p->retryTime.sec, p->retryTime.usec / 1000, p->length));
#endif #endif
if (rx_stats_active) if (rx_stats_active)
rx_MutexIncrement(rx_stats.packetsSent[p->header.type - 1], rx_stats_mutex); rx_MutexIncrement(rx_stats.packetsSent[p->header.type - 1], rx_stats_mutex);
@ -2494,7 +2495,10 @@ rxi_SendPacketList(struct rx_call *call, struct rx_connection *conn,
assert(p != NULL); assert(p != NULL);
dpf(("%c %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %lx resend %d.%0.3d len %d", deliveryType, p->header.serial, rx_packetTypes[p->header.type - 1], ntohl(peer->host), ntohs(peer->port), p->header.serial, p->header.epoch, p->header.cid, p->header.callNumber, p->header.seq, p->header.flags, (unsigned long)p, p->retryTime.sec, p->retryTime.usec / 1000, p->length)); dpf(("%c %d %s: %x.%u.%u.%u.%u.%u.%u flags %d, packet %"AFS_PTR_FMT" resend %d.%0.3d len %d",
deliveryType, p->header.serial, rx_packetTypes[p->header.type - 1], ntohl(peer->host),
ntohs(peer->port), p->header.serial, p->header.epoch, p->header.cid, p->header.callNumber,
p->header.seq, p->header.flags, p, p->retryTime.sec, p->retryTime.usec / 1000, p->length));
#endif #endif
if (rx_stats_active) if (rx_stats_active)
@ -2648,8 +2652,8 @@ rxi_PrepareSendPacket(struct rx_call *call,
struct rx_packet *p, int last) struct rx_packet *p, int last)
{ {
struct rx_connection *conn = call->conn; struct rx_connection *conn = call->conn;
int i; unsigned int i;
ssize_t len; /* len must be a signed type; it can go negative */ afs_int32 len; /* len must be a signed type; it can go negative */
p->flags &= ~RX_PKTFLAG_ACKED; p->flags &= ~RX_PKTFLAG_ACKED;
p->header.cid = (conn->cid | call->channel); p->header.cid = (conn->cid | call->channel);

2
src/rx/rx_packet.h
View File

@ -344,7 +344,7 @@ struct rx_packet {
rx_SlowReadPacket(p, off, len, (char*)(out)) : \ rx_SlowReadPacket(p, off, len, (char*)(out)) : \
((memcpy((char *)(out), (char*)((p)->wirevec[1].iov_base)+(off), (len))),0)) ((memcpy((char *)(out), (char*)((p)->wirevec[1].iov_base)+(off), (len))),0))
#define rx_computelen(p,l) { int i; \ #define rx_computelen(p,l) { unsigned int i; \
for (l=0, i=1; i < p->niovecs; i++ ) l += p->wirevec[i].iov_len; } for (l=0, i=1; i < p->niovecs; i++ ) l += p->wirevec[i].iov_len; }
/* return what the actual contiguous space is: should be min(length,size) */ /* return what the actual contiguous space is: should be min(length,size) */

4
src/rx/rx_rdwr.c
View File

@ -984,7 +984,7 @@ rxi_WritevAlloc(struct rx_call *call, struct iovec *iov, int *nio, int maxio,
int nextio; int nextio;
/* Temporary values, real work is done in rxi_WritevProc */ /* Temporary values, real work is done in rxi_WritevProc */
int tnFree; int tnFree;
int tcurvec; unsigned int tcurvec;
char *tcurpos; char *tcurpos;
int tcurlen; int tcurlen;
@ -1021,7 +1021,7 @@ rxi_WritevAlloc(struct rx_call *call, struct iovec *iov, int *nio, int maxio,
tcurpos = call->curpos; tcurpos = call->curpos;
tcurlen = call->curlen; tcurlen = call->curlen;
do { do {
unsigned int t; int t;
if (tnFree == 0) { if (tnFree == 0) {
/* current packet is full, allocate a new one */ /* current packet is full, allocate a new one */