From 15181522ce75489176c4e39a497233e6d5651fc5 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 30 Jun 2011 19:38:59 -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 af7e7ac..fe74ca5 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 52bab1ddaf12bc6c05914f3320e122eecbbd6912
-Head: e1b0fba3f12a5fd5d8c5e452a3db13258a5f5492
+Previous: b207f843e74b9115803a2df0f99528c004b6f827
+Head: d46788381a7c3e18011906be28f756e74e7c9b3a
 Applied:
   bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878
   alias: cf8b034d082dbc168524cfadc86e231772254a64
   counters: e1b0fba3f12a5fd5d8c5e452a3db13258a5f5492
+  refresh-temp: d46788381a7c3e18011906be28f756e74e7c9b3a
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..f8e5b1c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,90 @@
+Bottom: 0653de5313cba06c32bc24739dde481b5c68f185
+Top:    e66767603b9a260f60d8ce2c7417cafa9d5b39a1
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-30 19:38:59 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index 6e4c32c..48e06d4 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -77,7 +77,7 @@ static void show_usage(char *program)
+ 	printf("   [-v]             - verify ACM response against SA query response\n");
+ 	printf("   [-c]             - read ACM cached data only\n");
+ 	printf("   [-P]             - query performance data from destination service");
+-	printf("   [-S svc_addr]    - address of ACM service, default: local service")
++	printf("   [-S svc_addr]    - address of ACM service, default: local service");
+ 	printf("usage 2: %s\n", program);
+ 	printf("Generate default ib_acm service configuration and option files\n");
+ 	printf("   -A [addr_file]   - generate local address configuration file\n");
+@@ -449,7 +449,7 @@ static int resolve_ip(struct ibv_path_record *path)
+ 		ret = inet_pton(AF_INET, src_addr, &src.sin_addr);
+ 		if (ret <= 0) {
+ 			printf("inet_pton error on source address (%s): 0x%x\n", src_addr, ret);
+-			return ret;
++			return -1;
+ 		}
+ 		saddr = (struct sockaddr *) &src;
+ 	} else {
+@@ -460,7 +460,7 @@ static int resolve_ip(struct ibv_path_record *path)
+ 	ret = inet_pton(AF_INET, dest_addr, &dest.sin_addr);
+ 	if (ret <= 0) {
+ 		printf("inet_pton error on destination address (%s): 0x%x\n", dest_addr, ret);
+-		return ret;
++		return -1;
+ 	}
+ 
+ 	ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
+@@ -581,7 +581,7 @@ static char *get_dest(char *arg, char *format)
+ 		*format = 'i';
+ 		return addr;
+ 	} else {
+-		*format = 'u';
++		*format = 'n';
+ 		return arg;
+ 	}
+ }
+@@ -596,12 +596,10 @@ static int resolve(char *svc)
+ 	dest_list = parse(dest_arg, NULL);
+ 	if (!dest_list) {
+ 		printf("Unable to parse destination argument\n");
+-		return;
++		return -1;
+ 	}
+ 
+-	if (src_arg) {
+-		src_list = parse(src_arg, NULL);
+-	}
++	src_list = src_arg ? parse(src_arg, NULL) : NULL;
+ 
+ 	printf("Service: %s\n", svc);
+ 	for (dest_addr = get_dest(dest_list[d], &dest_type); dest_addr;
+@@ -645,7 +643,7 @@ static int resolve(char *svc)
+ 	return ret;
+ }
+ 
+-static void query_perf(static char *svc)
++static void query_perf(char *svc)
+ {
+ 	int ret, cnt, i;
+ 	uint64_t *counters;
+@@ -656,6 +654,7 @@ static void query_perf(static char *svc)
+ 		return;
+ 	}
+ 
++	printf("%s,", svc);
+ 	for (i = 0; i < cnt; i++)
+ 		printf("%llu,", (unsigned long long) counters[i]);
+ 	printf("\n");
+@@ -722,7 +721,7 @@ int CDECL_FUNC main(int argc, char **argv)
+ 	if (ret)
+ 		goto out;
+ 
+-	while ((op = getopt(argc, argv, "f:s:d:vcA::O::D:PV")) != -1) {
++	while ((op = getopt(argc, argv, "f:s:d:vcA::O::D:PS:V")) != -1) {
+ 		switch (op) {
+ 		case 'f':
+ 			addr_type = optarg[0];
-- 
2.46.0