From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 1 Jul 2011 03:03:48 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7b2cf6c960112de74685b94b86865fde3539693a;p=~shefty%2Fibacm.git

refresh
---

diff --git a/meta b/meta
index 438e2aa..904fc47 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: c8f3fe1e72bf4dced6e009f5c7550f600bb47fcb
-Head: 9c0680ae5d22ac71542285f7bc2c0bcff5417da8
+Previous: 4f7de21d936328c17bfbce6169e8e5c0d0e7bfc6
+Head: 891e048afff45c39b17c62261dd1f2fbb3774148
 Applied:
   bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878
   alias: cf8b034d082dbc168524cfadc86e231772254a64
-  counters: a554fc9b94e9c3faffc9473c6efbf55ad4a52d3e
-  refresh-temp: 9c0680ae5d22ac71542285f7bc2c0bcff5417da8
+  counters: 891e048afff45c39b17c62261dd1f2fbb3774148
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/counters b/patches/counters
index 10a2c33..5275f9c 100644
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: c1a3265ecb373be6114f838a6a7b82453aafd16e
-Top:    e66767603b9a260f60d8ce2c7417cafa9d5b39a1
+Top:    ecfa4880e2ee351de7a1f30d0bafb1df221402dc
 Author: Sean Hefty <sean.hefty@intel.com>
 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..48e06d4 100644
+index d42ba81..05d093d 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..48e06d4 100644
  	}
  
  	ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
-@@ -575,63 +581,122 @@ static char *get_dest(char *arg, char *format)
+@@ -575,63 +581,125 @@ static char *get_dest(char *arg, char *format)
  		*format = 'i';
  		return addr;
  	} else {
@@ -423,6 +423,8 @@ index d42ba81..48e06d4 100644
 +		src_addr = src_list ? src_list[s] : NULL;
 +		do {
 +			printf("Destination: %s\n", dest_addr);
++			if (src_addr)
++				printf("Source: %s\n", src_addr);
 +			switch (dest_type) {
 +			case 'i':
 +				ret = resolve_ip(&path);
@@ -501,7 +503,8 @@ index d42ba81..48e06d4 100644
 +	for (i = 0; svc_list[i]; i++) {
 +		ret = ib_acm_connect(svc_list[i]);
 +		if (ret) {
-+			printf("%s: Unable to contact ib_acm service\n", svc_list[i]);
++			printf("%s, unable to contact service %s\n",
++				svc_list[i], strerror(errno));
 +			continue;
 +		}
 +
@@ -521,7 +524,7 @@ index d42ba81..48e06d4 100644
  	return ret;
  }
  
-@@ -648,20 +713,24 @@ char *opt_arg(int argc, char **argv)
+@@ -648,20 +716,24 @@ char *opt_arg(int argc, char **argv)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
@@ -549,7 +552,7 @@ index d42ba81..48e06d4 100644
  			break;
  		case 'd':
  			dest_arg = optarg;
-@@ -685,23 +754,26 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -685,23 +757,26 @@ int CDECL_FUNC main(int argc, char **argv)
  		case 'D':
  			dest_dir = optarg;
  			break;
@@ -585,7 +588,7 @@ index d42ba81..48e06d4 100644
  
  	if (!ret && make_addr)
  		ret = gen_addr();
-@@ -709,8 +781,13 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -709,8 +784,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 46fcd5b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: e66767603b9a260f60d8ce2c7417cafa9d5b39a1
-Top:    ecfa4880e2ee351de7a1f30d0bafb1df221402dc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 20:03:48 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 48e06d4..05d093d 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -608,6 +608,8 @@ static int resolve(char *svc)
- 		src_addr = src_list ? src_list[s] : NULL;
- 		do {
- 			printf("Destination: %s\n", dest_addr);
-+			if (src_addr)
-+				printf("Source: %s\n", src_addr);
- 			switch (dest_type) {
- 			case 'i':
- 				ret = resolve_ip(&path);
-@@ -680,7 +682,8 @@ 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 ib_acm service\n", svc_list[i]);
-+			printf("%s, unable to contact service %s\n",
-+				svc_list[i], strerror(errno));
- 			continue;
- 		}