From 84f7dc405f96549b9fbb1e63fae35b40ab200b90 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 31 Aug 2012 10:20:42 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/addrtype | 22 +++++++++++++++------- patches/refresh-temp | 44 -------------------------------------------- 3 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 08371318..b6a2780a 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: 142af9f0cb75d9e00111160d197dfc11c28db938 -Head: 77802259f0562bfd94dd74ca8f4da82630902620 +Previous: e60483d63b77647ee56f110b1f1a5845548cc258 +Head: b252c6e657aeafdaa842b34555ceb3a5d4626fe1 Applied: sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1 af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9 ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e addrinfo-af-ib: 314cddd485a8175f72ae6bc681398451af3bd4d5 - addrtype: 212fe0398537890fd8a7fd46f8b543c6ef6b4f9d - refresh-temp: 77802259f0562bfd94dd74ca8f4da82630902620 + addrtype: b252c6e657aeafdaa842b34555ceb3a5d4626fe1 Unapplied: dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a diff --git a/patches/addrtype b/patches/addrtype index 73ecba5d..60b8ec71 100644 --- a/patches/addrtype +++ b/patches/addrtype @@ -1,5 +1,5 @@ Bottom: b41f5d11d3f72c1bbe451336c858f7ebfb0a4da7 -Top: b06830efc3ecf71d460e71ce1f8d3080436b6b83 +Top: 6d90eae03c462c78e6bacc93c8eedddd5313d351 Author: Sean Hefty Date: 2012-08-29 15:02:54 -0700 @@ -15,9 +15,16 @@ Signed-off-by: Sean Hefty --- diff --git a/examples/cmatose.c b/examples/cmatose.c -index 94fc4cd..8ebc959 100644 +index 94fc4cd..c00d28f 100644 --- a/examples/cmatose.c +++ b/examples/cmatose.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005-2006,2011 Intel Corporation. All rights reserved. ++ * Copyright (c) 2005-2006,2011-2012 Intel Corporation. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU @@ -81,6 +81,7 @@ static uint8_t tos; static uint8_t migrate = 0; static char *dst_addr; @@ -58,16 +65,17 @@ index 94fc4cd..8ebc959 100644 ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai); if (ret) { perror("cmatose: getaddrinfo error"); -@@ -646,7 +640,7 @@ int main(int argc, char **argv) +@@ -646,7 +640,8 @@ int main(int argc, char **argv) { int op, ret; - while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:m")) != -1) { ++ hints.ai_port_space = RDMA_PS_TCP; + while ((op = getopt(argc, argv, "s:b:f:c:C:S:t:p:m")) != -1) { switch (op) { case 's': dst_addr = optarg; -@@ -654,6 +648,16 @@ int main(int argc, char **argv) +@@ -654,6 +649,17 @@ int main(int argc, char **argv) case 'b': src_addr = optarg; break; @@ -77,6 +85,7 @@ index 94fc4cd..8ebc959 100644 + } else if (!strncasecmp("gid", optarg, 3)) { + hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY; + hints.ai_family = AF_IB; ++ hints.ai_port_space = RDMA_PS_IB; + } else if (strncasecmp("name", optarg, 4)) { + fprintf(stderr, "Warning: unknown address format\n"); + } @@ -84,7 +93,7 @@ index 94fc4cd..8ebc959 100644 case 'c': connections = atoi(optarg); break; -@@ -677,6 +681,8 @@ int main(int argc, char **argv) +@@ -677,6 +683,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"); @@ -93,12 +102,11 @@ index 94fc4cd..8ebc959 100644 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) +@@ -699,10 +707,12 @@ 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 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 3eac124f..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,44 +0,0 @@ -Bottom: b06830efc3ecf71d460e71ce1f8d3080436b6b83 -Top: 6d90eae03c462c78e6bacc93c8eedddd5313d351 -Author: Sean Hefty -Date: 2012-08-31 10:20:42 -0700 - -Refresh of addrtype - ---- - -diff --git a/examples/cmatose.c b/examples/cmatose.c -index 8ebc959..c00d28f 100644 ---- a/examples/cmatose.c -+++ b/examples/cmatose.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005-2006,2011 Intel Corporation. All rights reserved. -+ * Copyright (c) 2005-2006,2011-2012 Intel Corporation. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU -@@ -640,6 +640,7 @@ int main(int argc, char **argv) - { - int op, ret; - -+ hints.ai_port_space = RDMA_PS_TCP; - while ((op = getopt(argc, argv, "s:b:f:c:C:S:t:p:m")) != -1) { - switch (op) { - case 's': -@@ -654,6 +655,7 @@ int main(int argc, char **argv) - } else if (!strncasecmp("gid", optarg, 3)) { - hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY; - hints.ai_family = AF_IB; -+ hints.ai_port_space = RDMA_PS_IB; - } else if (strncasecmp("name", optarg, 4)) { - fprintf(stderr, "Warning: unknown address format\n"); - } -@@ -705,7 +707,6 @@ int main(int argc, char **argv) - if (alloc_nodes()) - exit(1); - -- hints.ai_port_space = RDMA_PS_TCP; - if (dst_addr) { - ret = run_client(); - } else { -- 2.46.0