From: Jeffrey Altman Date: Sun, 19 Sep 2010 16:08:42 +0000 (-0700) Subject: Rx: move TSFPQ prototypes from rx_globals.h to rx_protoypes.h X-Git-Tag: openafs-devel-1_5_78~130 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e7bd67e5bd700b502f47a7c82bb19b4ad98f7dab;p=packages%2Fo%2Fopenafs.git Rx: move TSFPQ prototypes from rx_globals.h to rx_protoypes.h Function prototypes belong in rx_prototypes.h not in rx_globals.h. Remove EXT macro from function prototypes as functions do not require special treatment in order to be exported by a DLL on Windows. Change-Id: Ieb617db634f2cfa57410e77e276c703311304547 Reviewed-on: http://gerrit.openafs.org/2777 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 00afdbed0ff474aaf45a49b157843af9cb8483ad) Reviewed-on: http://gerrit.openafs.org/2812 Reviewed-by: Rod Widdowson --- diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h index e5208d252..26e19c697 100644 --- a/src/rx/rx_globals.h +++ b/src/rx/rx_globals.h @@ -262,9 +262,6 @@ EXT afs_kmutex_t rx_freePktQ_lock; EXT int rx_TSFPQGlobSize GLOBALSINIT(3); /* number of packets to transfer between global and local queues in one op */ EXT int rx_TSFPQLocalMax GLOBALSINIT(15); /* max number of packets on local FPQ before returning a glob to the global pool */ EXT int rx_TSFPQMaxProcs GLOBALSINIT(0); /* max number of threads expected */ -EXT void rxi_MorePacketsTSFPQ(int apackets, int flush_global, int num_keep_local); /* more flexible packet alloc function */ -EXT 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 */ -EXT void rxi_FlushLocalPacketsTSFPQ(void); /* flush all thread-local packets to global queue */ #define RX_TS_FPQ_FLUSH_GLOBAL 1 #define RX_TS_FPQ_PULL_GLOBAL 1 #define RX_TS_FPQ_ALLOW_OVERCOMMIT 1 diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index 3a1dad2ef..383d2ed23 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -518,6 +518,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);