From 99ec14136316579363c20e28cffda03f53dd9f51 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 27 Sep 2012 10:38:05 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 388f31e..7ceefbe 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 2796c5a2f682e3ecd2cc69218f28cf9f8a35134f -Head: 259e7f992a5f53a659ed59a1e3153ee1ccb40405 +Previous: 15c17d57f114e153bdf4d973742837557fa019d2 +Head: c290d85bfc6b3da8d4eab1b802ad9935746d9a79 Applied: verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786 xrcd: 07cc711dd4091666de3c99545c64578ce6472da7 @@ -9,6 +9,7 @@ Applied: open_qp: 62f82b2b6f0a5e44b9051558844fb4e381eacad5 open_qp_man: 2128e1c4feee2dd0117962223034e39d2762ea9c xrc_sample: 259e7f992a5f53a659ed59a1e3153ee1ccb40405 + refresh-temp: c290d85bfc6b3da8d4eab1b802ad9935746d9a79 Unapplied: compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43 Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..ae8e7c7 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,50 @@ +Bottom: be7c92b8180cedfd84d9d95b285da5178d881461 +Top: 961c50f415ca97d3f6b8eafb3f691acfe00a8f93 +Author: Sean Hefty +Date: 2012-09-27 10:38:04 -0700 + +Refresh of xrc_sample + +--- + +diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c +index a1763d3..f6520fb 100644 +--- a/examples/xsrq_pingpong.c ++++ b/examples/xsrq_pingpong.c +@@ -143,7 +143,7 @@ static int create_qps(void) + init.comp_mask = IBV_QP_INIT_ATTR_XRCD; + init.xrcd = ctx.xrcd; + +- ctx.recv_qp[i] = ibv_create_qp_ex(ctx.pd, &init); ++ ctx.recv_qp[i] = ibv_create_qp_ex(ctx.context, &init); + if (!ctx.recv_qp[i]) { + fprintf(stderr, "Couldn't create recv QP[%d] errno %d\n", + i, errno); +@@ -164,11 +164,12 @@ static int create_qps(void) + + memset(&init, 0, sizeof init); + init.qp_type = IBV_QPT_XRC_SEND; ++ init.pd = ctx.pd; + init.send_cq = ctx.send_cq; + init.cap.max_send_wr = ctx.num_clients * ctx.num_tests; + init.cap.max_send_sge = 1; + +- ctx.send_qp[i] = ibv_create_qp_ex(ctx.pd, &init); ++ ctx.send_qp[i] = ibv_create_qp_ex(ctx, &init); + if (!ctx.send_qp[i]) { + fprintf(stderr, "Couldn't create send QP[%d] errno %d\n", + i, errno); +@@ -303,11 +304,11 @@ static int send_local_dest(int sockfd, int index) + + printf(ADDR_FORMAT, "local", ctx.lid, ctx.recv_qp[index]->qp_num, + ctx.send_qp[index]->qp_num, ctx.rem_dest[index].recv_psn, +- ctx.srq->srq_num); ++ ibv_get_srq_num(ctx.srq)); + + sprintf(msg, MSG_FORMAT, ctx.lid, ctx.recv_qp[index]->qp_num, + ctx.send_qp[index]->qp_num, ctx.rem_dest[index].recv_psn, +- ctx.srq->srq_num); ++ ibv_get_srq_num(ctx.srq)); + + if (write(sockfd, msg, MSG_SIZE) != MSG_SIZE) { + fprintf(stderr, "Couldn't send local address\n"); -- 2.46.0