Attachment 586267 Details for Bug 822337 – properly setting the 'THIS' variable with right translator.

[patch] properly setting the 'THIS' variable with right translator.

0001-rdma-set-the-proper-THIS-value-after-thread-creation.patch (text/plain), 3.28 KB, created by Amar Tumballi on 2012-05-23 07:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amar Tumballi

Created: 2012-05-23 07:56:36 UTC

Size: 3.28 KB

patch

obsolete

>From 71e54ca14dcfa37a5d5f7e442977e2b6f35c3432 Mon Sep 17 00:00:00 2001
>From: Amar Tumballi <amarts@redhat.com>
>Date: Wed, 23 May 2012 13:23:15 +0530
>Subject: [PATCH] rdma: set the proper THIS value after thread creation
>
>Change-Id: Ife07b46ac8b2a973c3327f75d2fa8cb0a633a243
>Signed-off-by: Amar Tumballi <amarts@redhat.com>
>BUG: 822337
>---
> rpc/rpc-transport/rdma/src/rdma.c |   22 ++++++++++++++++++----
> rpc/rpc-transport/rdma/src/rdma.h |    1 +
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
>diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
>index 8e9472f..3c04285 100644
>--- a/rpc/rpc-transport/rdma/src/rdma.c
>+++ b/rpc/rpc-transport/rdma/src/rdma.c
>@@ -3297,8 +3297,13 @@ gf_rdma_recv_completion_proc (void *data)
>         struct ibv_wc            wc        = {0, };
>         void                    *event_ctx = NULL;
>         int32_t                  ret       = 0;
>+        gf_rdma_device_t        *temp      = NULL;
> 
>-        chan = data;
>+        temp = data;
>+
>+        THIS = temp->xl;
>+
>+        chan = temp->recv_chan;
> 
>         while (1) {
>                 ret = ibv_get_cq_event (chan, &event_cq, &event_ctx);
>@@ -3481,8 +3486,14 @@ gf_rdma_send_completion_proc (void *data)
>         struct ibv_wc            wc         = {0, };
>         char                     is_request = 0;
>         int32_t                  ret        = 0, quota_ret = 0;
>+        gf_rdma_device_t        *temp       = NULL;
>+
>+        temp = data;
>+
>+        THIS = temp->xl;
>+
>+        chan = temp->send_chan;
> 
>-        chan = data;
>         while (1) {
>                 ret = ibv_get_cq_event (chan, &event_cq, &event_ctx);
>                 if (ret) {
>@@ -3884,11 +3895,14 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx)
>                         return NULL;
>                 }
> 
>+                /* need to set it back in new thread */
>+                trav->xl = THIS;
>+
>                 /* completion threads */
>                 ret = pthread_create (&trav->send_thread,
>                                       NULL,
>                                       gf_rdma_send_completion_proc,
>-                                      trav->send_chan);
>+                                      trav);
>                 if (ret) {
>                         gf_rdma_destroy_posts (this);
>                         mem_pool_destroy (trav->ioq_pool);
>@@ -3909,7 +3923,7 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx)
>                 ret = pthread_create (&trav->recv_thread,
>                                       NULL,
>                                       gf_rdma_recv_completion_proc,
>-                                      trav->recv_chan);
>+                                      trav);
>                 if (ret) {
>                         gf_rdma_destroy_posts (this);
>                         mem_pool_destroy (trav->ioq_pool);
>diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h
>index 687d600..541a2ee 100644
>--- a/rpc/rpc-transport/rdma/src/rdma.h
>+++ b/rpc/rpc-transport/rdma/src/rdma.h
>@@ -324,6 +324,7 @@ struct __gf_rdma_device {
>         struct mem_pool *request_ctx_pool;
>         struct mem_pool *ioq_pool;
>         struct mem_pool *reply_info_pool;
>+        xlator_t *xl;
> };
> typedef struct __gf_rdma_device gf_rdma_device_t;
> 
>-- 
>1.7.6.5
>

Actions: View | Diff

Attachments on bug 822337: 586267