refresh (create temporary patch)

diff --git a/meta b/meta
index 8092728491024a1fbc339a4f7970c2d25fa819e7..937037178b5c0b7edb30f93b7d28e8aa3f0fbfcd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 4942c4abe0f1953b07ee7dffaf9d79be8983f692
-Head: b2ae615cc6c0119babd24414c657cb1962392e02
+Previous: de97c057e42f13e273fa3ac24de73d86fca0f076
+Head: 6859b010b2a9f2d56b94e8e158b577cb60f0083a
 Applied:
   dsocket: b2ae615cc6c0119babd24414c657cb1962392e02
+  refresh-temp: 6859b010b2a9f2d56b94e8e158b577cb60f0083a
 Unapplied:
   udpong: a42957509acbde99a7d8469e0819b7d75af51289
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..03b4a65
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,98 @@
+Bottom: 136936c0a82503ee0da9daccd8b948cd09e58b64
+Top:    49030a049bcacc4789ad20b05e6a7a3ee28c5e0d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-12-13 13:20:13 -0800
+
+Refresh of dsocket
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 6fa4c68..04f00dd 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -2242,9 +2242,9 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+ 
+       rs = idm_at(&idm, socket);
+       if (rs->type == SOCK_DGRAM) {
+-              fastlock_acquire(&rs->slock);
++              fastlock_acquire(&rs->rlock);
+               ret = ds_recvfrom(rs, buf, len, flags, NULL, 0);
+-              fastlock_release(&rs->slock);
++              fastlock_release(&rs->rlock);
+               return ret;
+       }
+ 
+@@ -2311,9 +2311,9 @@ ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags,
+ 
+       rs = idm_at(&idm, socket);
+       if (rs->type == SOCK_DGRAM) {
+-              fastlock_acquire(&rs->slock);
++              fastlock_acquire(&rs->rlock);
+               ret = ds_recvfrom(rs, buf, len, flags, src_addr, addrlen);
+-              fastlock_release(&rs->slock);
++              fastlock_release(&rs->rlock);
+               return ret;
+       }
+ 
+@@ -2500,7 +2500,7 @@ static ssize_t dsend(struct rsocket *rs, const void *buf, size_t len, int flags)
+       memcpy((void *) msg + rs->conn_dest->qp->hdr.length, buf, len);
+       sge.addr = (uintptr_t) msg;
+       sge.length = rs->conn_dest->qp->hdr.length + len;
+-      sge.lkey = rs->smr->lkey;
++      sge.lkey = rs->conn_dest->qp->smr->lkey;
+       offset = (uint8_t *) msg - rs->sbuf;
+ 
+       ret = ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length));
+@@ -3741,6 +3741,7 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t
+       }
+ 
+       ret = rdma_create_id(NULL, &id, NULL, dest->qp->cm_id->ps);
++      printf("%s rdma_create_id %d %s\n",__func__, ret, strerror(errno));
+       if  (ret)
+               return;
+ 
+@@ -3751,10 +3752,12 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t
+       else
+               saddr.sin6.sin6_port = 0;
+       ret = rdma_resolve_addr(id, &saddr.sa, &dest->addr.sa, 2000);
++      printf("%s rdma_resolve_addr %d %s\n",__func__, ret, strerror(errno));
+       if (ret)
+               goto out;
+ 
+       ret = rdma_resolve_route(id, 2000);
++      printf("%s rdma_resolve_route %d %s\n",__func__, ret, strerror(errno));
+       if (ret)
+               goto out;
+ 
+@@ -3773,9 +3776,12 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t
+       attr.static_rate = id->route.path_rec->rate;
+       attr.port_num  = id->port_num;
+ 
++      printf("%s getting slock \n",__func__);
+       fastlock_acquire(&rs->slock);
++      printf("%s why am I not here? \n",__func__);
+       dest->qpn = qpn;
+       dest->ah = ibv_create_ah(dest->qp->cm_id->pd, &attr);
++      printf("%s ibv_create_ah %p %s\n",__func__, dest->ah, strerror(errno));
+       fastlock_release(&rs->slock);
+ out:
+       rdma_destroy_id(id);
+@@ -3825,7 +3831,7 @@ static void rs_svc_forward(struct rsocket *rs, void *buf, size_t len,
+       memcpy((void *) msg + hdr.length, buf, len);
+       sge.addr = (uintptr_t) msg;
+       sge.length = hdr.length + len;
+-      sge.lkey = rs->smr->lkey;
++      sge.lkey = rs->conn_dest->qp->smr->lkey;
+       offset = (uint8_t *) msg - rs->sbuf;
+ 
+       ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length));
+@@ -3872,7 +3878,7 @@ static void rs_svc_process_rs(struct rsocket *rs)
+ 
+       rs->conn_dest = dest;
+       printf("%s sending resp\n",__func__);
+-      ds_send_udp(rs, svc_buf + udp_hdr->length, len, 0, RS_OP_CTRL);
++      ds_send_udp(rs, NULL, 0, 0, RS_OP_CTRL);
+       rs->conn_dest = cur_dest;
+       fastlock_release(&rs->slock);
+ }