diff options
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 19 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.h | 4 |
2 files changed, 21 insertions, 2 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 7bc9010f0b9..11d6cedfe07 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -810,6 +810,16 @@ out: static void rpc_clnt_destroy (struct rpc_clnt *rpc); +#define RPC_THIS_SAVE(xl) do { \ + old_THIS = THIS ; \ + if (!old_THIS) \ + gf_log_callingfn ("rpc", GF_LOG_CRITICAL, \ + "THIS is not initialised."); \ + THIS = xl; \ +} while (0) + +#define RPC_THIS_RESTORE (THIS = old_THIS) + int rpc_clnt_notify (rpc_transport_t *trans, void *mydata, rpc_transport_event_t event, void *data, ...) @@ -821,6 +831,7 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata, rpc_transport_pollin_t *pollin = NULL; struct timespec ts = {0, }; void *clnt_mydata = NULL; + DECLARE_OLD_THIS; conn = mydata; if (conn == NULL) { @@ -830,6 +841,8 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata, if (!clnt) goto out; + RPC_THIS_SAVE (clnt->owner); + switch (event) { case RPC_TRANSPORT_DISCONNECT: { @@ -930,6 +943,7 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata, } out: + RPC_THIS_RESTORE; return ret; } @@ -1034,11 +1048,13 @@ out: } struct rpc_clnt * -rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name, +rpc_clnt_new (dict_t *options, xlator_t *owner, char *name, uint32_t reqpool_size) { int ret = -1; struct rpc_clnt *rpc = NULL; + glusterfs_ctx_t *ctx = owner->ctx; + rpc = GF_CALLOC (1, sizeof (*rpc), gf_common_mt_rpcclnt_t); if (!rpc) { @@ -1047,6 +1063,7 @@ rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name, pthread_mutex_init (&rpc->lock, NULL); rpc->ctx = ctx; + rpc->owner = owner; if (!reqpool_size) reqpool_size = RPC_CLNT_DEFAULT_REQUEST_COUNT; diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h index ee46a9a9263..6a4bb40793f 100644 --- a/rpc/rpc-lib/src/rpc-clnt.h +++ b/rpc/rpc-lib/src/rpc-clnt.h @@ -188,9 +188,11 @@ typedef struct rpc_clnt { int refcount; int auth_null; char disabled; + xlator_t *owner; } rpc_clnt_t; -struct rpc_clnt *rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, + +struct rpc_clnt *rpc_clnt_new (dict_t *options, xlator_t *owner, char *name, uint32_t reqpool_size); int rpc_clnt_start (struct rpc_clnt *rpc); |