rx: Don't call gettimeofday for every packet ack

[openafs.git] / src / rx / rx_prototypes.h

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 2f35bc6..afaa00f 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -57,7 +57,7 @@ extern struct rx_service *rx_NewService(u_short port, u_short serviceId,
                                        afs_int32(*serviceProc) (struct
                                                                 rx_call *
                                                                 acall));
-extern struct rx_service *rx_NewServiceHost(afs_uint32 host, u_short port, 
+extern struct rx_service *rx_NewServiceHost(afs_uint32 host, u_short port,
                                            u_short serviceId,
                                            char *serviceName,
                                            struct rx_securityClass
@@ -81,18 +81,11 @@ extern afs_int32 rx_EndCall(struct rx_call *call, afs_int32 rc);
 extern void rx_Finalize(void);
 extern void rxi_PacketsUnWait(void);
 extern struct rx_service *rxi_FindService(osi_socket socket,
-                                         u_short serviceId);
+                                          u_short serviceId);
 extern struct rx_call *rxi_NewCall(struct rx_connection *conn,
-                                  int channel);
-
-/* Don't like this - change source at some point to make calls identical */
-#ifdef RX_ENABLE_LOCKS
+                                   int channel);
 extern void rxi_FreeCall(struct rx_call *call, int haveCTLock);
-#else /* RX_ENABLE_LOCKS */
-extern void rxi_FreeCall(struct rx_call *call);
-#endif /* RX_ENABLE_LOCKS */
-
-extern char *rxi_Alloc(size_t size);
+extern void *rxi_Alloc(size_t size);
 extern void rxi_Free(void *addr, size_t size);
 extern void rxi_SetPeerMtu(struct rx_peer *peer, afs_uint32 host,
                           afs_uint32 port, int mtu);
@@ -155,7 +148,7 @@ extern struct rx_packet *rxi_SendAck(struct rx_call *call, struct rx_packet
 extern void rxi_StartUnlocked(struct rxevent *event,
                              void *call, /* struct rx_call */
                              void *arg1, int istack);
-extern void rxi_Start(struct rxevent *event, 
+extern void rxi_Start(struct rxevent *event,
                      void *call, /* struct rx_call */
                      void *arg1, int istack);
 extern void rxi_Send(struct rx_call *call,
@@ -166,7 +159,7 @@ extern int rxi_CheckCall(struct rx_call *call, int haveCTLock);
 extern int rxi_CheckCall(struct rx_call *call);
 #endif /* RX_ENABLE_LOCKS */
 extern void rxi_KeepAliveEvent(struct rxevent *event,
-                              void *call /* struct rx_call *call */, 
+                              void *call /* struct rx_call *call */,
                               void *dummy);
 extern void rxi_GrowMTUEvent(struct rxevent *event,
                             void *call /* struct rx_call *call */,
@@ -188,10 +181,7 @@ extern void rxi_ChallengeEvent(struct rxevent *event,
                               void *conn, /* struct rx_connection *conn */
                               void *arg1, int atries);
 extern void rxi_ChallengeOn(struct rx_connection *conn);
-extern void rxi_ComputeRoundTripTime(struct rx_packet *p,
-                                    struct clock *sentp,
-                                    struct rx_peer *peer);
-extern void rxi_ReapConnections(struct rxevent *unused, void *unused1, 
+extern void rxi_ReapConnections(struct rxevent *unused, void *unused1,
                                void *unused2);
 extern int rxs_Release(struct rx_securityClass *aobj);
 #ifndef KERNEL
@@ -324,16 +314,16 @@ extern struct rxevent *rxevent_Post(struct clock *when,
 /* this func seems to be called with tons of different style routines, need to look
 at another time. */
 #else
-extern struct rxevent *rxevent_Post(struct clock *when, 
+extern struct rxevent *rxevent_Post(struct clock *when,
                                    void (*func) (struct rxevent *, void *, void *),
                                    void *arg, void *arg1);
-extern struct rxevent *rxevent_Post2(struct clock *when, 
+extern struct rxevent *rxevent_Post2(struct clock *when,
                                    void (*func) (struct rxevent *, void *, void *, int),
                                    void *arg, void *arg1, int arg2);
 extern struct rxevent *rxevent_PostNow(struct clock *when, struct clock *now,
                                       void (*func) (struct rxevent *, void *, void *), void *arg, void *arg1);
 extern struct rxevent *rxevent_PostNow2(struct clock *when, struct clock *now,
-                                       void (*func) (struct rxevent *, void *, void *, int), void *arg, 
+                                       void (*func) (struct rxevent *, void *, void *, int), void *arg,
                                        void *arg1, int arg2);
 #endif
 extern void shutdown_rxevent(void);
@@ -351,7 +341,7 @@ extern int rxevent_RaiseEvents(struct clock *next);
 extern void rxi_setaddr(afs_uint32 x);
 extern afs_uint32 rxi_getaddr(void);
 extern int rx_getAllAddr(afs_uint32 * buffer, int maxSize);
-extern int rx_getAllAddrMaskMtu(afs_uint32 addrBuffer[], 
+extern int rx_getAllAddrMaskMtu(afs_uint32 addrBuffer[],
                                 afs_uint32 maskBuffer[],
                                 afs_uint32 mtuBuffer[],
                                 int maxSize);
@@ -518,6 +508,11 @@ extern int rxi_RoundUpPacket(struct rx_packet *p, unsigned int nb);
 extern int rxi_AllocDataBuf(struct rx_packet *p, int nb, int cla_ss);
 extern void rxi_MorePackets(int apackets);
 extern void rxi_MorePacketsNoLock(int apackets);
+#if defined(AFS_PTHREAD_ENV)
+extern void rxi_MorePacketsTSFPQ(int apackets, int flush_global, int num_keep_local); /* more flexible packet alloc function */
+extern void rxi_AdjustLocalPacketsTSFPQ(int num_keep_local, int allow_overcommit); /* adjust thread-local queue length, for places where we know how many packets we will need a priori */
+extern void rxi_FlushLocalPacketsTSFPQ(void); /* flush all thread-local packets to global queue */
+#endif
 extern void rxi_FreeAllPackets(void);
 extern void rx_CheckPackets(void);
 extern void rxi_FreePacketNoLock(struct rx_packet *p);
@@ -572,6 +567,7 @@ extern int rxi_AdjustDgramPackets(int frags, int mtu);
 
 
 /* rx_pthread.c */
+extern int rx_NewThreadId(void);
 extern void rxi_Delay(int sec);
 extern void rxi_InitializeThreadSupport(void);
 extern void rxi_StartServerProc(void *(*proc) (void *), int stacksize);
@@ -610,6 +606,10 @@ extern int rx_WritevProc(struct rx_call *call, struct iovec *iov, int nio,
 extern void rxi_FlushWrite(struct rx_call *call);
 extern void rx_FlushWrite(struct rx_call *call);
 
+/* rx_stats.c */
+extern struct rx_statistics * rx_GetStatistics(void);
+extern void rx_FreeStatistics(struct rx_statistics **);
+
 /* rx_trace.c */