From: Sean Hefty Date: Fri, 1 Jul 2011 03:40:09 +0000 (-0700) Subject: refresh X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2a065b26f643e9e4ace6ea0b840c8391b8050277;p=~shefty%2Fibacm.git refresh --- diff --git a/meta b/meta index ccdfbab..101b1cf 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 946023e1314b4a484c5a0c617e37d1dd52d65fc5 -Head: 0941c8148b9a65d9e00d867c38e00bcabe593ae2 +Previous: 39468bbf8c5ea09f64d6eb0960537177ee7f9388 +Head: 9d3ba5d9bd6ae5738af3b680fba82ccc1e7ae820 Applied: bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878 alias: cf8b034d082dbc168524cfadc86e231772254a64 - counters: 891e048afff45c39b17c62261dd1f2fbb3774148 - refresh-temp: 0941c8148b9a65d9e00d867c38e00bcabe593ae2 + counters: 9d3ba5d9bd6ae5738af3b680fba82ccc1e7ae820 Unapplied: acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/counters b/patches/counters index 5275f9c..ef336ef 100644 --- a/patches/counters +++ b/patches/counters @@ -1,5 +1,5 @@ Bottom: c1a3265ecb373be6114f838a6a7b82453aafd16e -Top: ecfa4880e2ee351de7a1f30d0bafb1df221402dc +Top: 131a3de8a72737d956e57cbdeed00328b22d8209 Author: Sean Hefty Date: 2011-06-27 10:29:36 -0700 @@ -302,7 +302,7 @@ index 1c643f3..fed0440 100644 if (acm_open_devices()) { acm_log(0, "ERROR - unable to open any devices\n"); diff --git a/src/acme.c b/src/acme.c -index d42ba81..05d093d 100644 +index d42ba81..f3faa68 100644 --- a/src/acme.c +++ b/src/acme.c @@ -49,11 +49,13 @@ static char *opts_file = ACM_OPTS_FILE; @@ -360,7 +360,7 @@ index d42ba81..05d093d 100644 } ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest, -@@ -575,63 +581,125 @@ static char *get_dest(char *arg, char *format) +@@ -575,63 +581,121 @@ static char *get_dest(char *arg, char *format) *format = 'i'; return addr; } else { @@ -371,7 +371,7 @@ index d42ba81..05d093d 100644 } -static int resolve(char *program, char *dest_arg) -+static int resolve(char *svc) ++static void resolve(char *svc) { - char **dest_list; + char **dest_list, **src_list; @@ -389,31 +389,9 @@ index d42ba81..05d093d 100644 dest_list = parse(dest_arg, NULL); if (!dest_list) { printf("Unable to parse destination argument\n"); - return -1; - } - -- 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: -- show_usage(program); -- exit(1); -- } ++ return; ++ } ++ + src_list = src_arg ? parse(src_arg, NULL) : NULL; + + printf("Service: %s\n", svc); @@ -446,24 +424,17 @@ index d42ba81..05d093d 100644 + + 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); -- libacm_cleanup(); -+ return ret; ++ } ++ ++ free(dest_list); +} + +static void query_perf(char *svc) @@ -492,9 +463,30 @@ index d42ba81..05d093d 100644 + svc_list = parse(svc_arg, NULL); + if (!svc_list) { + printf("Unable to parse service list argument\n"); -+ return -1; -+ } -+ + return -1; + } + +- 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: +- show_usage(program); +- exit(1); + if (perf_query) { + printf("Destination,Error Count,Resolve Count,No Data,Addr Query Count," + "Addr Cache Count,Route Query Count,Route Cache Count\n"); @@ -503,28 +495,32 @@ index d42ba81..05d093d 100644 + for (i = 0; svc_list[i]; i++) { + ret = ib_acm_connect(svc_list[i]); + if (ret) { -+ printf("%s, unable to contact service %s\n", ++ printf("%s,unable to contact service: %s\n", + svc_list[i], strerror(errno)); + continue; -+ } -+ -+ if (dest_arg) { -+ ret = resolve(svc_list[i]); -+ if (ret) -+ break; -+ } -+ + } + +- if (!ret) +- show_path(&path); ++ if (dest_arg) ++ resolve(svc_list[i]); + +- if (verify) +- ret = verify_resolve(&path); +- printf("\n"); + if (perf_query) + query_perf(svc_list[i]); + + ib_acm_disconnect(); -+ } -+ + } + +- free(dest_list); +- libacm_cleanup(); + free(svc_list); return ret; } -@@ -648,20 +716,24 @@ char *opt_arg(int argc, char **argv) +@@ -648,20 +712,24 @@ char *opt_arg(int argc, char **argv) int CDECL_FUNC main(int argc, char **argv) { @@ -552,7 +548,7 @@ index d42ba81..05d093d 100644 break; case 'd': dest_arg = optarg; -@@ -685,23 +757,26 @@ int CDECL_FUNC main(int argc, char **argv) +@@ -685,23 +753,26 @@ int CDECL_FUNC main(int argc, char **argv) case 'D': dest_dir = optarg; break; @@ -588,7 +584,7 @@ index d42ba81..05d093d 100644 if (!ret && make_addr) ret = gen_addr(); -@@ -709,8 +784,13 @@ int CDECL_FUNC main(int argc, char **argv) +@@ -709,8 +780,13 @@ int CDECL_FUNC main(int argc, char **argv) if (!ret && make_opts) ret = gen_opts(); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index a30c2eb..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,59 +0,0 @@ -Bottom: ecfa4880e2ee351de7a1f30d0bafb1df221402dc -Top: 131a3de8a72737d956e57cbdeed00328b22d8209 -Author: Sean Hefty -Date: 2011-06-30 20:40:09 -0700 - -Refresh of counters - ---- - -diff --git a/src/acme.c b/src/acme.c -index 05d093d..f3faa68 100644 ---- a/src/acme.c -+++ b/src/acme.c -@@ -586,7 +586,7 @@ static char *get_dest(char *arg, char *format) - } - } - --static int resolve(char *svc) -+static void resolve(char *svc) - { - char **dest_list, **src_list; - struct ibv_path_record path; -@@ -596,7 +596,7 @@ static int resolve(char *svc) - dest_list = parse(dest_arg, NULL); - if (!dest_list) { - printf("Unable to parse destination argument\n"); -- return -1; -+ return; - } - - src_list = src_arg ? parse(src_arg, NULL) : NULL; -@@ -642,7 +642,6 @@ static int resolve(char *svc) - } - - free(dest_list); -- return ret; - } - - static void query_perf(char *svc) -@@ -682,16 +681,13 @@ static int query_svcs(void) - for (i = 0; svc_list[i]; i++) { - ret = ib_acm_connect(svc_list[i]); - if (ret) { -- printf("%s, unable to contact service %s\n", -+ printf("%s,unable to contact service: %s\n", - svc_list[i], strerror(errno)); - continue; - } - -- if (dest_arg) { -- ret = resolve(svc_list[i]); -- if (ret) -- break; -- } -+ if (dest_arg) -+ resolve(svc_list[i]); - - if (perf_query) - query_perf(svc_list[i]);