temp = rx_Writev(rxcallp, tiov, tnio, vbytes);
if (temp != vbytes) {
osi_Log3(afsd_logp, "rx_Writev failed bp 0x%p, %d != %d", bufp, temp, vbytes);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
nbytes_hi = ntohl(nbytes_hi);
} else {
nbytes_hi = 0;
- code = rxcallp->error;
+ code = rx_Error(rxcallp);
code1 = rx_EndCall(rxcallp, code);
rxcallp = NULL;
}
}
} else {
osi_Log1(afsd_logp, "cm_GetBuffer rx_Read32 returns %d != 4", temp);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
}
}
/* for the moment, nbytes_hi will always be 0 if code == 0
if (fs_fetchdata_offset_bug && first_read)
length_found = 0;
else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
if (fs_fetchdata_offset_bug && first_read)
length_found = 0;
else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
first_read = 0;
nbytes_hi = ntohl(nbytes_hi);
} else {
nbytes_hi = 0;
- code = rxcallp->error;
+ code = rx_Error(rxcallp);
code1 = rx_EndCall(rxcallp, code);
rxcallp = NULL;
}
}
} else {
osi_Log1(afsd_logp, "cm_GetData rx_Read32 returns %d != 4", temp);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
}
}
/* for the moment, nbytes_hi will always be 0 if code == 0
if (fs_fetchdata_offset_bug && first_read)
length_found = 0;
else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
if (fs_fetchdata_offset_bug && first_read)
length_found = 0;
else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
first_read = 0;
int code;
/* get auth details from server connection */
- code = rxkad_GetServerInfo(acall->conn, NULL, &exp, tname, tinst, tcell,
- NULL);
+ code = rxkad_GetServerInfo(rx_ConnectionOf(acall), NULL, &exp, tname,
+ tinst, tcell, NULL);
if (code)
return 0; /* bogus connection/other error */
memset(akeyinfo, 0, sizeof(struct bozo_keyInfo));
noauth = afsconf_GetNoAuthFlag(bozo_confdir);
- rxkad_GetServerInfo(acall->conn, &enc_level, 0, 0, 0, 0, 0);
+ rxkad_GetServerInfo(rx_ConnectionOf(acall), &enc_level, 0, 0, 0, 0, 0);
/*
* only return actual keys in noauth or if this is an encrypted connection
*/
goto fail;
}
noauth = afsconf_GetNoAuthFlag(bozo_confdir);
- rxkad_GetServerInfo(acall->conn, &enc_level, 0, 0, 0, 0, 0);
+ rxkad_GetServerInfo(rx_ConnectionOf(acall), &enc_level, 0, 0, 0, 0, 0);
if ((!noauth) && (enc_level != rxkad_crypt)) {
code = BZENCREQ;
goto fail;
return code;
}
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, NULL, NULL, NULL, rx_PeerOf(call->conn)->host,
- LOG_CRUSER);
+ KALOG(aname, ainstance, NULL, NULL, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_CRUSER);
return code;
}
goto abort;
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, NULL, NULL, NULL, rx_PeerOf(call->conn)->host,
- LOG_CHPASSWD);
+ KALOG(aname, ainstance, NULL, NULL, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_CHPASSWD);
return code;
abort:
DES_pcbc_encrypt(oanswer->SeqBody, oanswer->SeqBody, oanswer->SeqLen,
&user_schedule, ktc_to_cblockptr(&tentry.key), ENCRYPT);
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, sname, sinst, NULL, rx_PeerOf(call->conn)->host,
- LOG_AUTHENTICATE);
+ KALOG(aname, ainstance, sname, sinst, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_AUTHENTICATE);
return code;
abort:
COUNT_ABO;
ubik_AbortTrans(tt);
- KALOG(aname, ainstance, sname, sinst, NULL, rx_PeerOf(call->conn)->host,
- LOG_AUTHFAILED);
+ KALOG(aname, ainstance, sname, sinst, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_AUTHFAILED);
return code;
}
goto abort;
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, NULL, NULL, NULL, rx_PeerOf(call->conn)->host,
- LOG_SETFIELDS);
+ KALOG(aname, ainstance, NULL, NULL, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_SETFIELDS);
return code;
abort:
goto abort;
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, NULL, NULL, NULL, rx_PeerOf(call->conn)->host,
- LOG_DELUSER);
+ KALOG(aname, ainstance, NULL, NULL, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_DELUSER);
return code;
}
* only return user's key if security disabled or if admin and
* we have an encrypted connection to the user
*/
- rxkad_GetServerInfo(call->conn, &enc_level, 0, 0, 0, 0, 0);
+ rxkad_GetServerInfo(rx_ConnectionOf(call), &enc_level, 0, 0, 0, 0, 0);
if ((noAuthenticationRequired)
|| (callerIsAdmin && enc_level == rxkad_crypt))
memcpy(&aentry->key, &tentry.key, sizeof(struct ktc_encryptionKey));
&schedule, ktc_to_cblockptr(&authSessionKey), ENCRYPT);
code = ubik_EndTrans(tt);
KALOG(name, instance, sname, sinstance, (import ? authDomain : NULL),
- rx_PeerOf(call->conn)->host, LOG_GETTICKET);
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_GETTICKET);
return code;
abort:
kaux_write(to, 0, 0); /* zero failure counters at this offset */
code = ubik_EndTrans(tt);
- KALOG(aname, ainstance, NULL, NULL, NULL, rx_PeerOf(call->conn)->host,
- LOG_UNLOCK);
+ KALOG(aname, ainstance, NULL, NULL, NULL,
+ rx_PeerOf(rx_ConnectionOf(call))->host, LOG_UNLOCK);
goto exit;
abort:
Kvice.cs.o \
fcrypt.o \
rx.o \
+ rx_call.o \
rx_conn.o \
rx_rdwr.o \
rx_clock.o \
xdr_int32.o \
xdr_int64.o \
rx.o \
+ rx_call.o \
rx_conn.o \
rx_rdwr.o \
rx_clock.o \
$(CRULE_NOOPT) $(TOP_SRC_VNOPS)/afs_vnop_write.c
afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
$(CRULE_OPT) $(TOP_SRC_AFS)/afs_volume.c
+rx_call.o: $(TOP_SRC_RX)/rx_call.c
+ $(CRULE_OPT) $(TOP_SRC_RX)/rx_call.c
rx_conn.o: $(TOP_SRC_RX)/rx_conn.c
$(CRULE_OPT) $(TOP_SRC_RX)/rx_conn.c
rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
rx.o \
rx_null.o \
rx_opaque.o \
+ rx_call.o \
rx_conn.o \
rx_conncache.o \
rx_globals.o \
rx_conn.o: ${RX}/rx_conn.c
$(AFS_CCRULE) $(RX)/rx_conn.c
+rx_call.o: ${RX}/rx_call.c
+ $(AFS_CCRULE) $(RX)/rx_call.c
+
rx_null.o: ${RX}/rx_null.c
$(AFS_CCRULE) $(RX)/rx_null.c
$(OUT)\rx_packet.obj $(OUT)\rx_rdwr.obj $(OUT)\rx_trace.obj \
$(OUT)\rx_xmit_nt.obj $(OUT)\rx_conncache.obj $(OUT)\rx_opaque.obj \
$(OUT)\rx_identity.obj $(OUT)\rx_stats.obj \
- $(OUT)\rx_conn.obj
+ $(OUT)\rx_call.obj $(OUT)\rx_conn.obj
RXSTATBJS = $(OUT)\rxstat.obj $(OUT)\rxstat.ss.obj $(OUT)\rxstat.xdr.obj $(OUT)\rxstat.cs.obj
rx_ServiceOf @326
rx_ConnError @327
+ rx_ConnectionOf @328
+ rx_Error @329
+ rx_GetRemoteStatus @330
+ rx_SetLocalStatus @331
+ rx_GetCallAbortCode @332
+ rx_SetCallAbortCode @333
+ rx_RecordCallStatistics @334
+
+
; for performance testing
rx_TSFPQGlobSize @2001 DATA
rx_TSFPQLocalMax @2002 DATA
$(UOBJ)/rx_stats.o \
$(UOBJ)/rx_packet.o \
$(UOBJ)/rx_conncache.o \
+ $(UOBJ)/rx_call.o \
$(UOBJ)/rx_conn.o \
$(UOBJ)/xdr_rx.o \
$(UOBJ)/Kvldbint.cs.o \
$(PICOBJ)/rx_stats.o \
$(PICOBJ)/rx_packet.o \
$(PICOBJ)/rx_conncache.o \
+ $(PICOBJ)/rx_call.o \
$(PICOBJ)/rx_conn.o \
$(PICOBJ)/xdr_rx.o \
$(PICOBJ)/Kvldbint.cs.o \
$(WEBOBJ)/rx_stats.o \
$(WEBOBJ)/rx_packet.o \
$(WEBOBJ)/rx_conncache.o \
+ $(WEBOBJ)/rx_call.o \
$(WEBOBJ)/rx_conn.o \
$(WEBOBJ)/xdr_rx.o \
$(WEBOBJ)/Kvldbint.cs.o \
$(WEBOBJ)/rx_stats.o \
$(WEBOBJ)/rx_packet.o \
$(WEBOBJ)/rx_conncache.o \
+ $(WEBOBJ)/rx_call.o \
$(WEBOBJ)/rx_conn.o \
$(WEBOBJ)/xdr_rx.o \
$(WEBOBJ)/Kvldbint.cs.o \
$(JUAFS)/rx_stats.o \
$(JUAFS)/rx_packet.o \
$(JUAFS)/rx_conncache.o \
+ $(JUAFS)/rx_call.o \
$(JUAFS)/rx_conn.o \
$(JUAFS)/xdr_rx.o \
$(JUAFS)/Kvldbint.cs.o \
$(CRULE1)
$(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE1)
+$(UOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+ $(CRULE1)
$(UOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
$(CRULE1)
$(UOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULEPIC)
$(PICOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULEPIC)
+$(PICOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+ $(CRULEPIC)
$(PICOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
$(CRULEPIC)
$(PICOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULE2)
$(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE2)
+$(WEBOBJ)/rx_call.o: $(TOP_SRCDIR)/rx_rx_call.c
+ $(CRULE2)
$(WEBOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
$(CRULE2)
$(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULE1)
$(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE1)
+$(JUAFS)/rx_call.o: $(TOP_SRC_RX)/rx_call.c
+ $(CRULE1)
$(JUAFS)/rx_conn.o: $(TOP_SRC_RX)/rx_conn.c
$(CRULE1)
$(JUAFS)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
else if (code == 1) { /* vab class */
goto done; /* no longer supported */
} else if (code == 2) { /* kad class */
- if ((code = rxkad_GetServerInfo(acall->conn, NULL, NULL,
+ if ((code = rxkad_GetServerInfo(rx_ConnectionOf(acall), NULL, NULL,
name, inst, tcell, NULL)))
goto done;
XDROBJS = xdr_arrayn.o ${XDROBJS_common}
-RXOBJS_common = rx_clock.o rx_conn.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o \
- rx_globals.o rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o rx_trace.o \
- rx_conncache.o rx_opaque.o rx_identity.o rx_stats.o \
- xdr_int32.o xdr_int64.o xdr_update.o xdr_refernce.o
+RXOBJS_common = rx_clock.o rx_call.o rx_conn.o rx_event.o rx_user.o rx_lwp.o \
+ rx.o rx_null.o rx_globals.o rx_getaddr.o rx_misc.o rx_packet.o \
+ rx_rdwr.o rx_trace.o rx_conncache.o rx_opaque.o rx_identity.o \
+ rx_stats.o xdr_int32.o xdr_int64.o xdr_update.o xdr_refernce.o
RXOBJS = ${RXOBJS_common}
$(OUT)\rx_packet.obj $(OUT)\rx_rdwr.obj $(OUT)\rx_trace.obj \
$(OUT)\rx_xmit_nt.obj $(OUT)\rx_conncache.obj \
$(OUT)\rx_opaque.obj $(OUT)\rx_identity.obj $(OUT)\rx_stats.obj \
- $(OUT)\rx_conn.obj
+ $(OUT)\rx_call.obj $(OUT)\rx_conn.obj
MULTIOBJS = $(OUT)\rx_multi.obj
#include "rx_event.h"
#include "rx_conn.h"
+#include "rx_call.h"
#include <afs/rxgen_consts.h>
extern struct rx_service *rx_ServiceOf(struct rx_connection *);
extern int rx_ConnError(struct rx_connection *);
+/* Call management */
+extern struct rx_connection *rx_ConnectionOf(struct rx_call *call);
+extern int rx_Error(struct rx_call *call);
+extern int rx_GetRemoteStatus(struct rx_call *call);
+extern void rx_SetLocalStatus(struct rx_call *call, int status);
+extern int rx_GetCallAbortCode(struct rx_call *call);
+extern void rx_SetCallAbortCode(struct rx_call *call, int code);
+
+extern void rx_RecordCallStatistics(struct rx_call *call,
+ unsigned int rxInterface,
+ unsigned int currentFunc,
+ unsigned int totalFunc,
+ int isServer);
+
+
+/* Debugging */
+
+/* Call flags, states and modes are exposed by the debug interface */
+#ifndef KDUMP_RX_LOCK
+/* Major call states */
+#define RX_STATE_NOTINIT 0 /* Call structure has never been initialized */
+#define RX_STATE_PRECALL 1 /* Server-only: call is not in progress, but packets have arrived */
+#define RX_STATE_ACTIVE 2 /* An active call; a process is dealing with this call */
+#define RX_STATE_DALLY 3 /* Dallying after process is done with call */
+#define RX_STATE_HOLD 4 /* Waiting for acks on reply data packets */
+#define RX_STATE_RESET 5 /* Call is being reset */
+
+/* Call modes: the modes of a call in RX_STATE_ACTIVE state (process attached) */
+#define RX_MODE_SENDING 1 /* Sending or ready to send */
+#define RX_MODE_RECEIVING 2 /* Receiving or ready to receive */
+#define RX_MODE_ERROR 3 /* Something in error for current conversation */
+#define RX_MODE_EOF 4 /* Server has flushed (or client has read) last reply packet */
+
+/* Flags */
+#define RX_CALL_READER_WAIT 1 /* Reader is waiting for next packet */
+#define RX_CALL_WAIT_WINDOW_ALLOC 2 /* Sender is waiting for window to allocate buffers */
+#define RX_CALL_WAIT_WINDOW_SEND 4 /* Sender is waiting for window to send buffers */
+#define RX_CALL_WAIT_PACKETS 8 /* Sender is waiting for packet buffers */
+#define RX_CALL_WAIT_PROC 16 /* Waiting for a process to be assigned */
+#define RX_CALL_RECEIVE_DONE 32 /* All packets received on this call */
+#define RX_CALL_CLEARED 64 /* Receive queue cleared in precall state */
+#define RX_CALL_TQ_BUSY 128 /* Call's Xmit Queue is busy; don't modify */
+#define RX_CALL_TQ_CLEARME 256 /* Need to clear this call's TQ later */
+#define RX_CALL_TQ_SOME_ACKED 512 /* rxi_Start needs to discard ack'd packets. */
+#define RX_CALL_TQ_WAIT 1024 /* Reader is waiting for TQ_BUSY to be reset */
+#define RX_CALL_FAST_RECOVER 2048 /* call is doing congestion recovery */
+/* 4096 was RX_CALL_FAST_RECOVER_WAIT */
+#define RX_CALL_SLOW_START_OK 8192 /* receiver acks every other packet */
+#define RX_CALL_IOVEC_WAIT 16384 /* waiting thread is using an iovec */
+#define RX_CALL_HAVE_LAST 32768 /* Last packet has been received */
+#define RX_CALL_NEED_START 0x10000 /* tells rxi_Start to start again */
+#define RX_CALL_PEER_BUSY 0x20000 /* the last packet we received on this call was a
+ * BUSY packet; i.e. the channel for this call is busy */
+#define RX_CALL_ACKALL_SENT 0x40000 /* ACKALL has been sent on the call */
+
+#endif
+
/* Configurable parameters */
#define RX_IDLE_DEAD_TIME 60 /* default idle dead time */
#define RX_MAX_SERVICES 20 /* Maximum number of services that may be installed */
#define RX_WAIT 1
#define RX_DONTWAIT 0
-#define rx_ConnectionOf(call) ((call)->conn)
#define rx_HostOf(peer) ((peer)->host)
#define rx_PortOf(peer) ((peer)->port)
-#define rx_SetLocalStatus(call, status) ((call)->localStatus = (status))
#define rx_GetLocalStatus(call, status) ((call)->localStatus)
-#define rx_GetRemoteStatus(call) ((call)->remoteStatus)
-#define rx_Error(call) ((call)->error)
+
static_inline int
rx_IsLoopbackAddr(afs_uint32 addr)
#define rx_SetConnAbortThreshold(A) (rxi_connAbortThreshhold = (A))
#define rx_SetConnAbortDelay(A) (rxi_connAbortDelay = (A))
-#define rx_GetCallAbortCode(call) ((call)->abortCode)
-#define rx_SetCallAbortCode(call, code) ((call)->abortCode = (code))
+
#define cpspace(call) ((call)->curlen)
#define cppos(call) ((call)->curpos)
/* Maximum number of acknowledgements in an acknowledge packet */
#define RX_MAXACKS 255
-/* Call structure: only instantiated for active calls and dallying server calls. The permanent call state (i.e. the call number as well as state shared with other calls associated with this connection) is maintained in the connection structure. */
-#ifdef KDUMP_RX_LOCK
-struct rx_call_rx_lock {
-#else
-struct rx_call {
-#endif
- struct rx_queue queue_item_header; /* Call can be on various queues (one-at-a-time) */
- struct rx_queue tq; /* Transmit packet queue */
- struct rx_queue rq; /* Receive packet queue */
- /*
- * The following fields are accessed while the call is unlocked.
- * These fields are used by the caller/server thread to marshall
- * and unmarshall RPC data. The only time they may be changed by
- * other threads is when the RX_CALL_IOVEC_WAIT flag is set.
- *
- * NOTE: Be sure that these fields start and end on a double
- * word boundary. Otherwise threads that are changing
- * adjacent fields will cause problems.
- */
- struct rx_queue iovq; /* readv/writev packet queue */
- u_short nLeft; /* Number bytes left in first receive packet */
- u_short curvec; /* current iovec in currentPacket */
- u_short curlen; /* bytes remaining in curvec */
- u_short nFree; /* Number bytes free in last send packet */
- struct rx_packet *currentPacket; /* Current packet being assembled or being read */
- char *curpos; /* current position in curvec */
- /*
- * End of fields accessed with call unlocked
- */
- u_char channel; /* Index of call, within connection */
- u_char state; /* Current call state as defined below */
- u_char mode; /* Current mode of a call in ACTIVE state */
-#ifdef RX_ENABLE_LOCKS
- afs_kmutex_t lock; /* lock covers data as well as mutexes. */
- afs_kmutex_t *call_queue_lock; /* points to lock for queue we're on,
- * if any. */
- afs_kcondvar_t cv_twind;
- afs_kcondvar_t cv_rq;
- afs_kcondvar_t cv_tq;
-#endif
-#ifdef KDUMP_RX_LOCK
- struct rx_connection_rx_lock *conn; /* Parent connection for call */
-#else
- struct rx_connection *conn; /* Parent connection for this call */
-#endif
- afs_uint32 *callNumber; /* Pointer to call number field within connection */
- afs_uint32 flags; /* Some random flags */
- u_char localStatus; /* Local user status sent out of band */
- u_char remoteStatus; /* Remote user status received out of band */
- afs_int32 error; /* Error condition for this call */
- afs_uint32 timeout; /* High level timeout for this call */
- afs_uint32 rnext; /* Next sequence number expected to be read by rx_ReadData */
- afs_uint32 rprev; /* Previous packet received; used for deciding what the next packet to be received should be, in order to decide whether a negative acknowledge should be sent */
- afs_uint32 rwind; /* The receive window: the peer must not send packets with sequence numbers >= rnext+rwind */
- afs_uint32 tfirst; /* First unacknowledged transmit packet number */
- afs_uint32 tnext; /* Next transmit sequence number to use */
- afs_uint32 tprev; /* Last packet that we saw an ack for */
- u_short twind; /* The transmit window: we cannot assign a sequence number to a packet >= tfirst + twind */
- u_short cwind; /* The congestion window */
- u_short nSoftAcked; /* Number soft acked transmit packets */
- u_short nextCwind; /* The congestion window after recovery */
- u_short nCwindAcks; /* Number acks received at current cwind */
- u_short ssthresh; /* The slow start threshold */
- u_short nDgramPackets; /* Packets per AFS 3.5 jumbogram */
- u_short nAcks; /* The number of consecutive acks */
- u_short nNacks; /* Number packets acked that follow the
- * first negatively acked packet */
- u_short nSoftAcks; /* The number of delayed soft acks */
- u_short nHardAcks; /* The number of delayed hard acks */
- u_short congestSeq; /* Peer's congestion sequence counter */
- int rtt;
- int rtt_dev;
- struct clock rto; /* The round trip timeout calculated for this call */
- struct rxevent *resendEvent; /* If this is non-Null, there is a retransmission event pending */
- struct rxevent *timeoutEvent; /* If this is non-Null, then there is an overall timeout for this call */
- struct rxevent *keepAliveEvent; /* Scheduled periodically in active calls to keep call alive */
- struct rxevent *growMTUEvent; /* Scheduled periodically in active calls to discover true maximum MTU */
- struct rxevent *delayedAckEvent; /* Scheduled after all packets are received to send an ack if a reply or new call is not generated soon */
- struct clock delayedAckTime; /* Time that next delayed ack was scheduled for */
- struct rxevent *delayedAbortEvent; /* Scheduled to throttle looping client */
- int abortCode; /* error code from last RPC */
- int abortCount; /* number of times last error was sent */
- u_int lastSendTime; /* Last time a packet was sent on this call */
- u_int lastReceiveTime; /* Last time a packet was received for this call */
- u_int lastSendData; /* Last time a nonping was sent on this call */
- void (*arrivalProc) (struct rx_call * call, void * mh, int index); /* Procedure to call when reply is received */
- void *arrivalProcHandle; /* Handle to pass to replyFunc */
- int arrivalProcArg; /* Additional arg to pass to reply Proc */
- afs_uint32 lastAcked; /* last packet "hard" acked by receiver */
- afs_uint32 startWait; /* time server began waiting for input data/send quota */
- struct clock traceWait; /* time server began waiting for input data/send quota */
- struct clock traceStart; /* time the call started running */
- u_short MTU; /* size of packets currently sending */
-#ifdef RX_ENABLE_LOCKS
- short refCount; /* Used to keep calls from disappearring
- * when we get them from a queue. (rx_refcnt_lock) */
-#endif /* RX_ENABLE_LOCKS */
-/* Call refcount modifiers */
-#define RX_CALL_REFCOUNT_BEGIN 0 /* GetCall/NewCall/EndCall */
-#define RX_CALL_REFCOUNT_RESEND 1 /* resend event */
-#define RX_CALL_REFCOUNT_DELAY 2 /* delayed ack */
-#define RX_CALL_REFCOUNT_ALIVE 3 /* keep alive event */
-#define RX_CALL_REFCOUNT_PACKET 4 /* waiting for packets. */
-#define RX_CALL_REFCOUNT_SEND 5 /* rxi_Send */
-#define RX_CALL_REFCOUNT_ACKALL 6 /* rxi_AckAll */
-#define RX_CALL_REFCOUNT_ABORT 7 /* delayed abort */
-#define RX_CALL_REFCOUNT_MAX 8 /* array size. */
-#ifdef RX_REFCOUNT_CHECK
- short refCDebug[RX_CALL_REFCOUNT_MAX];
-#endif /* RX_REFCOUNT_CHECK */
-
- /*
- * iov, iovNBytes, iovMax, and iovNext are set in rxi_ReadvProc()
- * and adjusted by rxi_FillReadVec(). iov does not own the buffers
- * it refers to. The buffers belong to the packets stored in iovq.
- * Only one call to rx_ReadvProc() can be active at a time.
- */
-
- int iovNBytes; /* byte count for current iovec */
- int iovMax; /* number elements in current iovec */
- int iovNext; /* next entry in current iovec */
- struct iovec *iov; /* current iovec */
-
- struct clock queueTime; /* time call was queued */
- struct clock startTime; /* time call was started */
- afs_hyper_t bytesSent; /* Number bytes sent */
- afs_hyper_t bytesRcvd; /* Number bytes received */
- u_short tqWaiters;
-
- struct rx_packet *xmitList[RX_MAXACKS]; /* Can't xmit more than we ack */
- /* Protected by setting RX_CALL_TQ_BUSY */
-#ifdef RXDEBUG_PACKET
- u_short tqc; /* packet count in tq */
- u_short rqc; /* packet count in rq */
- u_short iovqc; /* packet count in iovq */
-
-#ifdef KDUMP_RX_LOCK
- struct rx_call_rx_lock *allNextp;
-#else
- struct rx_call *allNextp;
-#endif
- afs_uint32 call_id;
-#endif
-};
-
#ifndef KDUMP_RX_LOCK
-/* Major call states */
-#define RX_STATE_NOTINIT 0 /* Call structure has never been initialized */
-#define RX_STATE_PRECALL 1 /* Server-only: call is not in progress, but packets have arrived */
-#define RX_STATE_ACTIVE 2 /* An active call; a process is dealing with this call */
-#define RX_STATE_DALLY 3 /* Dallying after process is done with call */
-#define RX_STATE_HOLD 4 /* Waiting for acks on reply data packets */
-#define RX_STATE_RESET 5 /* Call is being reset */
-
-/* Call modes: the modes of a call in RX_STATE_ACTIVE state (process attached) */
-#define RX_MODE_SENDING 1 /* Sending or ready to send */
-#define RX_MODE_RECEIVING 2 /* Receiving or ready to receive */
-#define RX_MODE_ERROR 3 /* Something in error for current conversation */
-#define RX_MODE_EOF 4 /* Server has flushed (or client has read) last reply packet */
-
-/* Flags */
-#define RX_CALL_READER_WAIT 1 /* Reader is waiting for next packet */
-#define RX_CALL_WAIT_WINDOW_ALLOC 2 /* Sender is waiting for window to allocate buffers */
-#define RX_CALL_WAIT_WINDOW_SEND 4 /* Sender is waiting for window to send buffers */
-#define RX_CALL_WAIT_PACKETS 8 /* Sender is waiting for packet buffers */
-#define RX_CALL_WAIT_PROC 16 /* Waiting for a process to be assigned */
-#define RX_CALL_RECEIVE_DONE 32 /* All packets received on this call */
-#define RX_CALL_CLEARED 64 /* Receive queue cleared in precall state */
-#define RX_CALL_TQ_BUSY 128 /* Call's Xmit Queue is busy; don't modify */
-#define RX_CALL_TQ_CLEARME 256 /* Need to clear this call's TQ later */
-#define RX_CALL_TQ_SOME_ACKED 512 /* rxi_Start needs to discard ack'd packets. */
-#define RX_CALL_TQ_WAIT 1024 /* Reader is waiting for TQ_BUSY to be reset */
-#define RX_CALL_FAST_RECOVER 2048 /* call is doing congestion recovery */
-/* 4096 was RX_CALL_FAST_RECOVER_WAIT */
-#define RX_CALL_SLOW_START_OK 8192 /* receiver acks every other packet */
-#define RX_CALL_IOVEC_WAIT 16384 /* waiting thread is using an iovec */
-#define RX_CALL_HAVE_LAST 32768 /* Last packet has been received */
-#define RX_CALL_NEED_START 0x10000 /* tells rxi_Start to start again */
-#define RX_CALL_PEER_BUSY 0x20000 /* the last packet we received on this call was a
- * BUSY packet; i.e. the channel for this call is busy */
-#define RX_CALL_ACKALL_SENT 0x40000 /* ACKALL has been sent on the call */
-
/* The structure of the data portion of an acknowledge packet: An acknowledge
* packet is in network byte order at all times. An acknowledgement is always
#define RX_OTHER_IN 1 /* packets avail in in queue */
#define RX_OTHER_OUT 2 /* packets avail in out queue */
-
-
-/* Only include this once, even when re-loading for kdump. */
-#ifndef _CALL_REF_DEFINED_
-#define _CALL_REF_DEFINED_
-
-#ifdef RX_ENABLE_LOCKS
-#ifdef RX_REFCOUNT_CHECK
-/* RX_REFCOUNT_CHECK is used to test for call refcount leaks by event
- * type.
- */
-extern int rx_callHoldType;
-#define CALL_HOLD(call, type) do { \
- call->refCount++; \
- call->refCDebug[type]++; \
- if (call->refCDebug[type] > 50) {\
- rx_callHoldType = type; \
- osi_Panic("Huge call refCount"); \
- } \
- } while (0)
-#define CALL_RELE(call, type) do { \
- call->refCount--; \
- call->refCDebug[type]--; \
- if (call->refCDebug[type] > 50) {\
- rx_callHoldType = type; \
- osi_Panic("Negative call refCount"); \
- } \
- } while (0)
-#else /* RX_REFCOUNT_CHECK */
-#define CALL_HOLD(call, type) call->refCount++
-#define CALL_RELE(call, type) call->refCount--
-#endif /* RX_REFCOUNT_CHECK */
-
-#else /* RX_ENABLE_LOCKS */
-#define CALL_HOLD(call, type)
-#define CALL_RELE(call, type)
-#endif /* RX_ENABLE_LOCKS */
-
-#endif /* _CALL_REF_DEFINED_ */
-
#define RX_SERVER_DEBUG_SEC_STATS 0x1
#define RX_SERVER_DEBUG_ALL_CONN 0x2
#define RX_SERVER_DEBUG_RX_STATS 0x4
--- /dev/null
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * Copyright 2011, Your File System Inc
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License. For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+
+#include "rx.h"
+#include "rx_call.h"
+#include "rx_conn.h"
+
+struct rx_connection *
+rx_ConnectionOf(struct rx_call *call)
+{
+ return call->conn;
+}
+
+int
+rx_Error(struct rx_call *call)
+{
+ return call->error;
+}
+
+int
+rx_GetRemoteStatus(struct rx_call *call)
+{
+ return call->remoteStatus;
+}
+
+void
+rx_SetLocalStatus(struct rx_call *call, int status)
+{
+ call->localStatus = status;
+}
+
+int
+rx_GetCallAbortCode(struct rx_call *call)
+{
+ return call->abortCode;
+}
+
+void
+rx_SetCallAbortCode(struct rx_call *call, int code)
+{
+ call->abortCode = code;
+}
+
+void
+rx_RecordCallStatistics(struct rx_call *call, unsigned int rxInterface,
+ unsigned int currentFunc, unsigned int totalFunc,
+ int isServer)
+{
+ struct clock queue;
+ struct clock exec;
+
+ clock_GetTime(&exec);
+ clock_Sub(&exec, &call->startTime);
+ queue = call->startTime;
+ clock_Sub(&queue, &call->queueTime);
+
+ rx_IncrementTimeAndCount(call->conn->peer, rxInterface, currentFunc,
+ totalFunc, &queue, &exec, &call->bytesSent,
+ &call->bytesRcvd, 1);
+}
--- /dev/null
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License. For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef OPENAFS_RX_CALL_H
+#define OPENAFS_RX_CALL_H 1
+
+/* Call structure: only instantiated for active calls and dallying
+ * server calls. The permanent call state (i.e. the call number as
+ * well as state shared with other calls associated with this
+ * connection) is maintained in the connection structure. */
+
+#ifdef KDUMP_RX_LOCK
+struct rx_call_rx_lock {
+#else
+struct rx_call {
+#endif
+ struct rx_queue queue_item_header; /* Call can be on various queues (one-at-a-time) */
+ struct rx_queue tq; /* Transmit packet queue */
+ struct rx_queue rq; /* Receive packet queue */
+ /*
+ * The following fields are accessed while the call is unlocked.
+ * These fields are used by the caller/server thread to marshall
+ * and unmarshall RPC data. The only time they may be changed by
+ * other threads is when the RX_CALL_IOVEC_WAIT flag is set.
+ *
+ * NOTE: Be sure that these fields start and end on a double
+ * word boundary. Otherwise threads that are changing
+ * adjacent fields will cause problems.
+ */
+ struct rx_queue iovq; /* readv/writev packet queue */
+ u_short nLeft; /* Number bytes left in first receive packet */
+ u_short curvec; /* current iovec in currentPacket */
+ u_short curlen; /* bytes remaining in curvec */
+ u_short nFree; /* Number bytes free in last send packet */
+ struct rx_packet *currentPacket; /* Current packet being assembled or being read */
+ char *curpos; /* current position in curvec */
+ /*
+ * End of fields accessed with call unlocked
+ */
+ u_char channel; /* Index of call, within connection */
+ u_char state; /* Current call state as defined below */
+ u_char mode; /* Current mode of a call in ACTIVE state */
+#ifdef RX_ENABLE_LOCKS
+ afs_kmutex_t lock; /* lock covers data as well as mutexes. */
+ afs_kmutex_t *call_queue_lock; /* points to lock for queue we're on,
+ * if any. */
+ afs_kcondvar_t cv_twind;
+ afs_kcondvar_t cv_rq;
+ afs_kcondvar_t cv_tq;
+#endif
+#ifdef KDUMP_RX_LOCK
+ struct rx_connection_rx_lock *conn; /* Parent connection for call */
+#else
+ struct rx_connection *conn; /* Parent connection for this call */
+#endif
+ afs_uint32 *callNumber; /* Pointer to call number field within connection */
+ afs_uint32 flags; /* Some random flags */
+ u_char localStatus; /* Local user status sent out of band */
+ u_char remoteStatus; /* Remote user status received out of band */
+ afs_int32 error; /* Error condition for this call */
+ afs_uint32 timeout; /* High level timeout for this call */
+ afs_uint32 rnext; /* Next sequence number expected to be read by rx_ReadData */
+ afs_uint32 rprev; /* Previous packet received; used for deciding what the next packet to be received should be, in order to decide whether a negative acknowledge should be sent */
+ afs_uint32 rwind; /* The receive window: the peer must not send packets with sequence numbers >= rnext+rwind */
+ afs_uint32 tfirst; /* First unacknowledged transmit packet number */
+ afs_uint32 tnext; /* Next transmit sequence number to use */
+ afs_uint32 tprev; /* Last packet that we saw an ack for */
+ u_short twind; /* The transmit window: we cannot assign a sequence number to a packet >= tfirst + twind */
+ u_short cwind; /* The congestion window */
+ u_short nSoftAcked; /* Number soft acked transmit packets */
+ u_short nextCwind; /* The congestion window after recovery */
+ u_short nCwindAcks; /* Number acks received at current cwind */
+ u_short ssthresh; /* The slow start threshold */
+ u_short nDgramPackets; /* Packets per AFS 3.5 jumbogram */
+ u_short nAcks; /* The number of consecutive acks */
+ u_short nNacks; /* Number packets acked that follow the
+ * first negatively acked packet */
+ u_short nSoftAcks; /* The number of delayed soft acks */
+ u_short nHardAcks; /* The number of delayed hard acks */
+ u_short congestSeq; /* Peer's congestion sequence counter */
+ int rtt;
+ int rtt_dev;
+ struct clock rto; /* The round trip timeout calculated for this call */
+ struct rxevent *resendEvent; /* If this is non-Null, there is a retransmission event pending */
+ struct rxevent *timeoutEvent; /* If this is non-Null, then there is an overall timeout for this call */
+ struct rxevent *keepAliveEvent; /* Scheduled periodically in active calls to keep call alive */
+ struct rxevent *growMTUEvent; /* Scheduled periodically in active calls to discover true maximum MTU */
+ struct rxevent *delayedAckEvent; /* Scheduled after all packets are received to send an ack if a reply or new call is not generated soon */
+ struct clock delayedAckTime; /* Time that next delayed ack was scheduled for */
+ struct rxevent *delayedAbortEvent; /* Scheduled to throttle looping client */
+ int abortCode; /* error code from last RPC */
+ int abortCount; /* number of times last error was sent */
+ u_int lastSendTime; /* Last time a packet was sent on this call */
+ u_int lastReceiveTime; /* Last time a packet was received for this call */
+ u_int lastSendData; /* Last time a nonping was sent on this call */
+ void (*arrivalProc) (struct rx_call * call, void * mh, int index); /* Procedure to call when reply is received */
+ void *arrivalProcHandle; /* Handle to pass to replyFunc */
+ int arrivalProcArg; /* Additional arg to pass to reply Proc */
+ afs_uint32 lastAcked; /* last packet "hard" acked by receiver */
+ afs_uint32 startWait; /* time server began waiting for input data/send quota */
+ struct clock traceWait; /* time server began waiting for input data/send quota */
+ struct clock traceStart; /* time the call started running */
+ u_short MTU; /* size of packets currently sending */
+#ifdef RX_ENABLE_LOCKS
+ short refCount; /* Used to keep calls from disappearring
+ * when we get them from a queue. (rx_refcnt_lock) */
+#endif /* RX_ENABLE_LOCKS */
+/* Call refcount modifiers */
+#define RX_CALL_REFCOUNT_BEGIN 0 /* GetCall/NewCall/EndCall */
+#define RX_CALL_REFCOUNT_RESEND 1 /* resend event */
+#define RX_CALL_REFCOUNT_DELAY 2 /* delayed ack */
+#define RX_CALL_REFCOUNT_ALIVE 3 /* keep alive event */
+#define RX_CALL_REFCOUNT_PACKET 4 /* waiting for packets. */
+#define RX_CALL_REFCOUNT_SEND 5 /* rxi_Send */
+#define RX_CALL_REFCOUNT_ACKALL 6 /* rxi_AckAll */
+#define RX_CALL_REFCOUNT_ABORT 7 /* delayed abort */
+#define RX_CALL_REFCOUNT_MAX 8 /* array size. */
+#ifdef RX_REFCOUNT_CHECK
+ short refCDebug[RX_CALL_REFCOUNT_MAX];
+#endif /* RX_REFCOUNT_CHECK */
+
+ /*
+ * iov, iovNBytes, iovMax, and iovNext are set in rxi_ReadvProc()
+ * and adjusted by rxi_FillReadVec(). iov does not own the buffers
+ * it refers to. The buffers belong to the packets stored in iovq.
+ * Only one call to rx_ReadvProc() can be active at a time.
+ */
+
+ int iovNBytes; /* byte count for current iovec */
+ int iovMax; /* number elements in current iovec */
+ int iovNext; /* next entry in current iovec */
+ struct iovec *iov; /* current iovec */
+
+ struct clock queueTime; /* time call was queued */
+ struct clock startTime; /* time call was started */
+ afs_hyper_t bytesSent; /* Number bytes sent */
+ afs_hyper_t bytesRcvd; /* Number bytes received */
+ u_short tqWaiters;
+
+ struct rx_packet *xmitList[RX_MAXACKS]; /* Can't xmit more than we ack */
+ /* Protected by setting RX_CALL_TQ_BUSY */
+#ifdef RXDEBUG_PACKET
+ u_short tqc; /* packet count in tq */
+ u_short rqc; /* packet count in rq */
+ u_short iovqc; /* packet count in iovq */
+
+#ifdef KDUMP_RX_LOCK
+ struct rx_call_rx_lock *allNextp;
+#else
+ struct rx_call *allNextp;
+#endif
+ afs_uint32 call_id;
+#endif
+};
+
+/* Only include this once, even when re-loading for kdump. */
+#ifndef _CALL_REF_DEFINED_
+#define _CALL_REF_DEFINED_
+
+#ifdef RX_ENABLE_LOCKS
+#ifdef RX_REFCOUNT_CHECK
+/* RX_REFCOUNT_CHECK is used to test for call refcount leaks by event
+ * type.
+ */
+extern int rx_callHoldType;
+#define CALL_HOLD(call, type) do { \
+ call->refCount++; \
+ call->refCDebug[type]++; \
+ if (call->refCDebug[type] > 50) {\
+ rx_callHoldType = type; \
+ osi_Panic("Huge call refCount"); \
+ } \
+ } while (0)
+#define CALL_RELE(call, type) do { \
+ call->refCount--; \
+ call->refCDebug[type]--; \
+ if (call->refCDebug[type] > 50) {\
+ rx_callHoldType = type; \
+ osi_Panic("Negative call refCount"); \
+ } \
+ } while (0)
+#else /* RX_REFCOUNT_CHECK */
+#define CALL_HOLD(call, type) call->refCount++
+#define CALL_RELE(call, type) call->refCount--
+#endif /* RX_REFCOUNT_CHECK */
+
+#else /* RX_ENABLE_LOCKS */
+#define CALL_HOLD(call, type)
+#define CALL_RELE(call, type)
+#endif /* RX_ENABLE_LOCKS */
+
+#endif /* _CALL_REF_DEFINED_ */
+
+#endif
#include "rx.h"
#include "rx_atomic.h"
+#include "rx_call.h"
struct rxevent {
struct opr_queue q;
#include "rx_stats.h"
#include "rx_conn.h"
+#include "rx_call.h"
#ifdef RX_LOCKS_DB
/* rxdb_fileID is used to identify the lock location, along with line#. */
#include "rx_globals.h"
#include "rx_conn.h"
+#include "rx_call.h"
#ifdef RX_LOCKS_DB
/* rxdb_fileID is used to identify the lock location, along with line#. */
#include "rx_trace.h"
#include "rx_conn.h"
+#include "rx_call.h"
#ifdef RXTRACEON
char rxi_tracename[80] = "/tmp/rxcalltrace";
if (!(split_flag > 1) || (noofallparams != 0)) {
f_print(fout, "\tXDR z_xdrs;\n");
}
- /*
- * Print out client side stat gathering call
- */
- if (xflag && split_flag != 1) {
- f_print(fout, "\tstruct clock __QUEUE, __EXEC;\n");
- }
if ((!split_flag) || (split_flag == 1)) {
f_print(fout, "\txdrrx_create(&z_xdrs, z_call, XDR_ENCODE);\n");
}
if (xflag && split_flag != 1) {
f_print(fout, "\tif (rx_enable_stats) {\n");
- f_print(fout, "\t clock_GetTime(&__EXEC);\n");
- f_print(fout, "\t clock_Sub(&__EXEC, &z_call->startTime);\n");
- f_print(fout, "\t __QUEUE = z_call->startTime;\n");
- f_print(fout, "\t clock_Sub(&__QUEUE, &z_call->queueTime);\n");
if (PackageStatIndex[PackageIndex]) {
- if (!split_flag) {
- f_print(fout,
- "\t rx_IncrementTimeAndCount(rx_PeerOf(z_conn), %s,\n",
- PackageStatIndex[PackageIndex]);
- } else {
- f_print(fout,
- "\t rx_IncrementTimeAndCount(rx_PeerOf(z_call->conn), %s,\n",
- PackageStatIndex[PackageIndex]);
- }
+ f_print(fout,
+ "\t rx_RecordCallStatistics(z_call, %s,\n",
+ PackageStatIndex[PackageIndex]);
} else {
- if (!split_flag) {
- f_print(fout,
- "\t rx_IncrementTimeAndCount(rx_PeerOf(z_conn),\n"
- "\t\t(((afs_uint32)(ntohs(z_conn->serviceId) << 16)) \n"
- "\t\t| ((afs_uint32)ntohs(z_conn->peer->port))),\n");
- } else {
- f_print(fout,
- "\t rx_IncrementTimeAndCount(rx_PeerOf(z_call->conn),\n"
- "\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
- "\t\t((afs_uint32)ntohs(z_call->conn->peer->port))),\n");
- }
- }
- if (xflag) {
- f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, &__QUEUE, &__EXEC,\n",
- no_of_stat_funcs, PackagePrefix[PackageIndex]);
f_print(fout,
- "\t\t&z_call->bytesSent, &z_call->bytesRcvd, 1);\n");
+ "\t rx_RecordCallStatistics(z_call, \n"
+ "\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
+ "\t\t((afs_uint32)ntohs(z_call->conn->peer->port))),\n");
}
+ f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 1);\n",
+ no_of_stat_funcs, PackagePrefix[PackageIndex]);
f_print(fout, "\t}\n\n");
}
f_print(fout, "\treturn z_result;\n}\n\n");
PackagePrefix[PackageIndex], defp->pc.proc_name);
f_print(fout, "struct rx_call *z_call, XDR *z_xdrs)\n{\n");
f_print(fout, "\t" "afs_int32 z_result;\n");
- if (xflag) {
- f_print(fout, "\tstruct clock __QUEUE, __EXEC;\n");
- }
for (plist = defp->pc.plists; plist; plist = plist->next)
if (plist->component_kind == DEF_PARAM) {
if (xflag) {
f_print(fout, "\tif (rx_enable_stats) {\n");
- f_print(fout, "\t clock_GetTime(&__EXEC);\n");
- f_print(fout, "\t clock_Sub(&__EXEC, &z_call->startTime);\n");
- f_print(fout, "\t __QUEUE = z_call->startTime;\n");
- f_print(fout, "\t clock_Sub(&__QUEUE, &z_call->queueTime);\n");
- f_print(fout, "\t rx_IncrementTimeAndCount(rx_PeerOf(z_call->conn),");
+ f_print(fout, "\t rx_RecordCallStatistics(z_call,");
if (PackageStatIndex[PackageIndex]) {
f_print(fout, " %s,\n", PackageStatIndex[PackageIndex]);
} else {
"\n\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
"\t\t((afs_uint32)ntohs(z_call->conn->service->servicePort))),\n");
}
- f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, &__QUEUE, &__EXEC,\n",
+ f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 0);\n",
no_of_stat_funcs, PackagePrefix[PackageIndex]);
- f_print(fout, "\t\t&z_call->bytesSent, &z_call->bytesRcvd, 0);\n");
f_print(fout, "\t}\n\n");
}
if (xflag) {
f_print(fout, "\tif (rx_enable_stats) {\n");
- f_print(fout, "\t clock_GetTime(&__EXEC);\n");
- f_print(fout, "\t clock_Sub(&__EXEC, &z_call->startTime);\n");
- f_print(fout, "\t __QUEUE = z_call->startTime;\n");
- f_print(fout, "\t clock_Sub(&__QUEUE, &z_call->queueTime);\n");
f_print(fout,
- "\t rx_IncrementTimeAndCount(rx_PeerOf(z_call->conn),");
+ "\t rx_RecordCallStatistics(z_call,");
if (PackageStatIndex[PackageIndex]) {
f_print(fout, " %s,\n", PackageStatIndex[PackageIndex]);
} else {
"\n\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
"\t\t((afs_uint32)ntohs(z_call->conn->service->servicePort))),\n");
}
- f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, &__QUEUE, &__EXEC,\n",
+ f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 0);\n",
no_of_stat_funcs, PackagePrefix[PackageIndex]);
- f_print(fout,
- "\t\t&z_call->bytesSent, &z_call->bytesRcvd, 0);\n");
f_print(fout, "\t}\n\n");
}
rx_stats.o \
rx_trace.o \
rx_multi.o \
- rx_conn.o
+ rx_conn.o \
+ rx_call.o
RXSTATOBJS =\
rxstat.o \
rx_conncache.o: ${RX}/rx_conncache.c
$(AFS_CCRULE) $(RX)/rx_conncache.c
+rx_call.o: ${RX}/rx_call.c
+ $(AFS_CCRULE) $(RX)/rx_call.c
+
rx_conn.o : ${RX}/rx_conn.c
$(AFS_CCRULE) $(RX)/rx_conn.c
rx_ServiceIdOf;
rx_SecurityObjectOf;
rx_ConnError;
+ rx_ConnectionOf;
+ rx_RecordCallStatistics;
local:
*;
};
afs_int32 error;
*errornumber = 0;
- SETCLIENTCONTEXT(blob, rx_HostOf(rx_PeerOf(call->conn)), creds->uid,
+ SETCLIENTCONTEXT(blob, rx_HostOf(rx_PeerOf(rx_ConnectionOf(call))), creds->uid,
creds->group0, creds->group1, PSETPAG, NFS_EXPORTER);
data.in = (caddr_t) blob;
data.in_size = sizeof(blob);
afs_uint32 blob[PIOCTL_HEADER];
*errornumber = 0;
- SETCLIENTCONTEXT(blob, rx_HostOf(rx_PeerOf(call->conn)), creds->uid,
+ SETCLIENTCONTEXT(blob, rx_HostOf(rx_PeerOf(rx_ConnectionOf(call))), creds->uid,
creds->group0, creds->group1, cmd, NFS_EXPORTER);
data.in =
(char *)malloc(InData->rmtbulk_len +
return 0;
if (rx_SecurityClassOf(rx_ConnectionOf(call)) == 2) {
- code = rxkad_GetServerInfo(call->conn, &level, 0, 0, 0, 0, 0);
+ code = rxkad_GetServerInfo(rx_ConnectionOf(call), &level, 0, 0, 0, 0, 0);
if (code)
return 0;
} else
pntr->callValid = 0;
if (tt->rxCallPtr) { /*record call related info */
pntr->callValid = 1;
+#if 0
pntr->readNext = tt->rxCallPtr->rnext;
pntr->transmitNext = tt->rxCallPtr->tnext;
pntr->lastSendTime = tt->rxCallPtr->lastSendTime;
pntr->lastReceiveTime = tt->rxCallPtr->lastReceiveTime;
+#endif
}
VTRANS_OBJ_UNLOCK(tt);
pntr++;
projects / packages / o / openafs.git / commitdiff