From 544b5096e5f3a12426f149c91dfeba1c5c207002 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Wed, 27 Mar 2013 13:37:42 -0400 Subject: [PATCH] Remove rx_SetEpoch, rx_SetConnectionEpoch, rx_SetConnectionId The core RX code now manages the Epoch and CID; external callers should not be modifying them. Change-Id: Ia517205aa280b2a0bbd2568274be7fb010fba0bc Reviewed-on: http://gerrit.openafs.org/10843 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/libafsrpc/afsrpc.def | 4 ++-- src/rx/liboafs_rx.la.sym | 3 --- src/rx/rx.c | 23 +---------------------- src/rx/rx.h | 2 -- src/rx/rx_conn.c | 10 ---------- src/rx/rx_prototypes.h | 1 - 6 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def index d7beb72..c3911b5 100755 --- a/src/libafsrpc/afsrpc.def +++ b/src/libafsrpc/afsrpc.def @@ -297,9 +297,9 @@ EXPORTS rx_GetThreadNum @305 rx_SetThreadNum @306 - rx_SetConnectionEpoch @307 +; rx_SetConnectionEpoch @307 rx_GetConnectionEpoch @308 - rx_SetConnectionId @309 +; rx_SetConnectionId @309 rx_GetConnectionId @310 rx_GetSecurityData @311 rx_SetSecurityData @312 diff --git a/src/rx/liboafs_rx.la.sym b/src/rx/liboafs_rx.la.sym index 26902e7..c6390a9 100644 --- a/src/rx/liboafs_rx.la.sym +++ b/src/rx/liboafs_rx.la.sym @@ -79,9 +79,6 @@ rx_SetCallAbortCode rx_SetConnDeadTime rx_SetConnHardDeadTime rx_SetConnSecondsUntilNatPing -rx_SetConnectionEpoch -rx_SetConnectionId -rx_SetEpoch rx_SetLocalStatus rx_SetMaxMTU rx_SetMaxReceiveWindow diff --git a/src/rx/rx.c b/src/rx/rx.c index 07c6d73..416ce07 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -443,27 +443,6 @@ struct rx_serverQueueEntry *rx_waitForPacket = 0; /* ------------Exported Interfaces------------- */ -#ifdef AFS_PTHREAD_ENV -/* - * This mutex protects the following global variables: - * rx_epoch - */ - -#define LOCK_EPOCH MUTEX_ENTER(&epoch_mutex) -#define UNLOCK_EPOCH MUTEX_EXIT(&epoch_mutex) -#else -#define LOCK_EPOCH -#define UNLOCK_EPOCH -#endif /* AFS_PTHREAD_ENV */ - -void -rx_SetEpoch(afs_uint32 epoch) -{ - LOCK_EPOCH; - rx_epoch = epoch; - UNLOCK_EPOCH; -} - /* Initialize rx. A port number may be mentioned, in which case this * becomes the default port number for any service installed later. * If 0 is provided for the port number, a random port will be chosen @@ -7958,7 +7937,7 @@ shutdown_rx(void) rxi_StopListener(); #endif /* AFS_PTHREAD_ENV */ shutdown_rxevent(); - rx_SetEpoch(0); + rx_epoch = 0; #ifndef AFS_PTHREAD_ENV #ifndef AFS_USE_GETTIMEOFDAY clock_UnInit(); diff --git a/src/rx/rx.h b/src/rx/rx.h index 8e671f0..859fe99 100644 --- a/src/rx/rx.h +++ b/src/rx/rx.h @@ -69,9 +69,7 @@ struct rx_packet; /* Connection management */ -extern void rx_SetConnectionEpoch(struct rx_connection *conn, afs_uint32 epoch); extern afs_uint32 rx_GetConnectionEpoch(struct rx_connection *conn); -extern void rx_SetConnectionId(struct rx_connection *conn, afs_uint32 id); extern afs_uint32 rx_GetConnectionId(struct rx_connection *conn); extern void *rx_GetSecurityData(struct rx_connection *conn); extern void rx_SetSecurityData(struct rx_connection *conn, void *data); diff --git a/src/rx/rx_conn.c b/src/rx/rx_conn.c index e8b7cbe..b75ac35 100644 --- a/src/rx/rx_conn.c +++ b/src/rx/rx_conn.c @@ -16,21 +16,11 @@ #include "rx.h" #include "rx_conn.h" -void -rx_SetConnectionEpoch(struct rx_connection *conn, afs_uint32 epoch) { - conn->epoch = epoch; -} - afs_uint32 rx_GetConnectionEpoch(struct rx_connection *conn) { return conn->epoch; } -void -rx_SetConnectionId(struct rx_connection *conn, afs_uint32 cid) { - conn->cid = cid; -} - afs_uint32 rx_GetConnectionId(struct rx_connection *conn) { return conn->cid; diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index 87cffff..297c7be 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -22,7 +22,6 @@ extern int (*rx_almostSent) (struct rx_packet *, struct sockaddr_in *); extern void rx_rto_setPeerTimeoutSecs(struct rx_peer *, int secs); -extern void rx_SetEpoch(afs_uint32 epoch); extern int rx_Init(u_int port); extern int rx_InitHost(u_int host, u_int port); extern void rx_SetBusyChannelError(afs_int32 onoff); -- 1.9.4