refresh (create temporary patch)

diff --git a/meta b/meta
index 87c2247e1b00107889c6c7b45111469624eef4e9..482af9a3da77ba180d6268ee22c6bf3596d2149d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,13 @@
 Version: 1
-Previous: c248ce1670d3b715c55b5ec828372d91e1ac7648
-Head: 2824d686d4c16d85eb66cc764c3141f82d86fb3a
+Previous: aad805aa768be40bf294d2ec04f53734286b3369
+Head: 6fc594432c9bfbdf6dd7a9a72c17ad7c678fee19
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: 8144447746737dda4f5fdb158083a62647bbd544
   addrtype: 2824d686d4c16d85eb66cc764c3141f82d86fb3a
+  refresh-temp: 6fc594432c9bfbdf6dd7a9a72c17ad7c678fee19
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c593aa9
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,108 @@
+Bottom: a286739cf5a9cb2c62140f9cb9ea5cea10a48b56
+Top:    b8b00f29ed93af183367d1e6b73324002c8fe6e8
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-29 15:17:39 -0700
+
+Refresh of addrtype
+
+---
+
+diff --git a/examples/cmatose.c b/examples/cmatose.c
+index 94fc4cd..1ff87d6 100644
+--- a/examples/cmatose.c
++++ b/examples/cmatose.c
+@@ -81,6 +81,7 @@ static uint8_t tos;
+ static uint8_t migrate = 0;
+ static char *dst_addr;
+ static char *src_addr;
++static struct rdma_addrinfo hints;
+ 
+ static int create_message(struct cmatest_node *node)
+ {
+@@ -501,7 +502,6 @@ static int migrate_channel(struct rdma_cm_id *listen_id)
+ static int run_server(void)
+ {
+       struct rdma_cm_id *listen_id;
+-      struct rdma_addrinfo hints;
+       int i, ret;
+ 
+       printf("cmatose: starting server\n");
+@@ -511,9 +511,6 @@ static int run_server(void)
+               return ret;
+       }
+ 
+-      memset(&hints, 0, sizeof hints);
+-      hints.ai_flags = RAI_PASSIVE;
+-      hints.ai_port_space = RDMA_PS_TCP;
+       ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai);
+       if (ret) {
+               perror("cmatose: getrdmaaddr error");
+@@ -583,13 +580,10 @@ out:
+ 
+ static int run_client(void)
+ {
+-      struct rdma_addrinfo hints;
+       int i, ret, ret2;
+ 
+       printf("cmatose: starting client\n");
+ 
+-      memset(&hints, 0, sizeof hints);
+-      hints.ai_port_space = RDMA_PS_TCP;
+       ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai);
+       if (ret) {
+               perror("cmatose: getaddrinfo error");
+@@ -654,6 +648,16 @@ int main(int argc, char **argv)
+               case 'b':
+                       src_addr = optarg;
+                       break;
++              case 'f':
++                      if (!strncasecmp("ip", optarg, 2)) {
++                              hints.ai_flags = RAI_NUMERICHOST;
++                      } else if (!strncasecmp("gid", optarg, 3)) {
++                              hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY;
++                              hints.ai_family = AF_IB;
++                      } else if (strncasecmp("name", optarg, 4)) {
++                              fprintf(stderr, "Warning: unknown address format\n");
++                      }
++                      break;
+               case 'c':
+                       connections = atoi(optarg);
+                       break;
+@@ -677,6 +681,8 @@ int main(int argc, char **argv)
+                       printf("usage: %s\n", argv[0]);
+                       printf("\t[-s server_address]\n");
+                       printf("\t[-b bind_address]\n");
++                      printf("\t[-f address_format]\n")
++                      printf("\t    name, ip, ipv6, or gid\n")
+                       printf("\t[-c connections]\n");
+                       printf("\t[-C message_count]\n");
+                       printf("\t[-S message_size]\n");
+@@ -699,10 +705,13 @@ int main(int argc, char **argv)
+       if (alloc_nodes())
+               exit(1);
+ 
+-      if (dst_addr)
++      hints.ai_port_space = RDMA_PS_TCP;
++      if (dst_addr) {
+               ret = run_client();
+-      else
++      } else {
++              hints.ai_flags |= RAI_PASSIVE;
+               ret = run_server();
++      }
+ 
+       printf("test complete\n");
+       destroy_nodes();
+diff --git a/examples/common.c b/examples/common.c
+index 3eeb1e9..eeee046 100644
+--- a/examples/common.c
++++ b/examples/common.c
+@@ -56,7 +56,7 @@ int get_rdma_addr(char *src, char *dst, char *port,
+ 
+       rai_hints = *hints;
+       if (src) {
+-              rai_hints.ai_flags = RAI_PASSIVE;
++              rai_hints.ai_flags |= RAI_PASSIVE;
+               ret = rdma_getaddrinfo(src, NULL, &rai_hints, &res);
+               if (ret)
+                       return ret;