From bd4a465351e1df7e3301d4f9f6d01297ba7a97cd Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 30 Jun 2011 17:04:46 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 ++- patches/refresh-temp | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 5d9892b..2ba5739 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: 9ecb92817441c439c59f1b39e34638c3f5acd895 -Head: cf918b170663ed7fa1acdadecebcb3baf739dd04 +Previous: d353d23445825f9d575629981e6d83ee5eebbccd +Head: e10f77458776837044373d6f5efed9955ea4ed96 Applied: bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878 alias: cf8b034d082dbc168524cfadc86e231772254a64 counters: cf918b170663ed7fa1acdadecebcb3baf739dd04 + refresh-temp: e10f77458776837044373d6f5efed9955ea4ed96 Unapplied: acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..1f660d7 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,90 @@ +Bottom: 70fb93d64e9ecf38abaca2ab5496df0a03517a96 +Top: 18f2719edc4036be333ec659de94958283145b33 +Author: Sean Hefty +Date: 2011-06-30 17:04:46 -0700 + +Refresh of counters + +--- + +diff --git a/src/acme.c b/src/acme.c +index 3030991..9bb6791 100644 +--- a/src/acme.c ++++ b/src/acme.c +@@ -590,7 +590,7 @@ static int resolve(char *svc) + { + char **dest_list, **src_list; + struct ibv_path_record path; +- int ret, i = 0; ++ int ret, d = 0, s = 0; + char dest_type; + + dest_list = parse(dest_arg, NULL); +@@ -604,34 +604,41 @@ static int resolve(char *svc) + } + + printf("Service: %s\n", svc); +- for (dest_addr = get_dest(dest_list[i], &dest_type); dest_addr; +- dest_addr = get_dest(dest_list[++i], &dest_type)) { +- printf("Destination: %s\n", dest_addr); +- switch (dest_type) { +- case 'i': +- ret = resolve_ip(&path); +- break; +- case 'n': +- ret = resolve_name(&path); +- break; +- case 'l': +- memset(&path, 0, sizeof path); +- ret = resolve_lid(&path); +- break; +- case 'g': +- memset(&path, 0, sizeof path); +- ret = resolve_gid(&path); +- break; +- default: +- break; +- } ++ for (dest_addr = get_dest(dest_list[d], &dest_type); dest_addr; ++ dest_addr = get_dest(dest_list[++d], &dest_type)) { ++ s = 0; ++ src_addr = src_list ? src_list[s] : NULL; ++ do { ++ printf("Destination: %s\n", dest_addr); ++ switch (dest_type) { ++ case 'i': ++ ret = resolve_ip(&path); ++ break; ++ case 'n': ++ ret = resolve_name(&path); ++ break; ++ case 'l': ++ memset(&path, 0, sizeof path); ++ ret = resolve_lid(&path); ++ break; ++ case 'g': ++ memset(&path, 0, sizeof path); ++ ret = resolve_gid(&path); ++ break; ++ default: ++ break; ++ } ++ ++ if (!ret) ++ show_path(&path); + +- if (!ret) +- show_path(&path); ++ if (verify) ++ ret = verify_resolve(&path); ++ printf("\n"); + +- if (verify) +- ret = verify_resolve(&path); +- printf("\n"); ++ if (src_list) ++ src_addr = src_list[++s]; ++ } while (src_addr); + } + + free(dest_list); -- 2.41.0