From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 29 Jun 2011 07:06:20 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7dd0db8715f39a201ba9955bca977615b95f3971;p=~shefty%2Fibacm.git

refresh
---

diff --git a/meta b/meta
index 4ae3048..672e096 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 9014a8e31f374e2856814e4ff54c51cf3d0790d9
-Head: ab9ae3744b56ad22fbabb9792fb429f168c8c59d
+Previous: ed0ba9b7dafc30a96685622f25ffdfa800257080
+Head: 77429e641ec865f9123f762fe4a2b38f958b7757
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
-  counters: 81878eb30604d7b25d0648329ca9e5f3eba591e1
-  refresh-temp: ab9ae3744b56ad22fbabb9792fb429f168c8c59d
+  counters: 77429e641ec865f9123f762fe4a2b38f958b7757
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/counters b/patches/counters
index 27f2315..8126842 100644
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top:    96d4b580e6b64a5b93647bf40210f2a5ee9a6839
+Top:    4e880c751ba52d99f201637395b7a42c35db7d72
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -296,7 +296,7 @@ index 8b01adb..1f9d2e8 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..733170f 100644
+index d42ba81..cf296c6 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -52,8 +52,6 @@ static char *src_addr;
@@ -326,7 +326,7 @@ index d42ba81..733170f 100644
  	if (ret) {
  		printf("Unable to contact ib_acm service\n");
  		return ret;
-@@ -631,7 +631,46 @@ static int resolve(char *program, char *dest_arg)
+@@ -631,7 +631,47 @@ static int resolve(char *program, char *dest_arg)
  	}
  
  	free(dest_list);
@@ -365,6 +365,7 @@ index d42ba81..733170f 100644
 +			for (i = 0; i < cnt; i++)
 +				printf("%llu,", counters[i]);
 +			printf("\n");
++			ib_acm_free_perf(counters);
 +		}
 +
 +		ib_acm_disconnect();
@@ -374,7 +375,7 @@ index d42ba81..733170f 100644
  	return ret;
  }
  
-@@ -650,12 +689,15 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -650,12 +690,15 @@ int CDECL_FUNC main(int argc, char **argv)
  {
  	char *dest_arg = NULL;
  	int op, ret;
@@ -391,7 +392,7 @@ index d42ba81..733170f 100644
  		switch (op) {
  		case 'f':
  			addr_type = optarg[0];
-@@ -685,6 +727,10 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -685,6 +728,10 @@ int CDECL_FUNC main(int argc, char **argv)
  		case 'D':
  			dest_dir = optarg;
  			break;
@@ -402,7 +403,7 @@ index d42ba81..733170f 100644
  		case 'V':
  			verbose = 1;
  			break;
-@@ -700,8 +746,12 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -700,8 +747,12 @@ int CDECL_FUNC main(int argc, char **argv)
  		exit(1);
  	}
  
@@ -417,7 +418,7 @@ index d42ba81..733170f 100644
  
  	if (!ret && make_addr)
  		ret = gen_addr();
-@@ -709,6 +759,7 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -709,6 +760,7 @@ int CDECL_FUNC main(int argc, char **argv)
  	if (!ret && make_opts)
  		ret = gen_opts();
  
@@ -426,7 +427,7 @@ index d42ba81..733170f 100644
  	if (verbose || !(make_addr || make_opts) || ret)
  		printf("return status 0x%x\n", ret);
 diff --git a/src/libacm.c b/src/libacm.c
-index 31014d1..f6dd452 100644
+index 31014d1..5a0332f 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -36,6 +36,8 @@
@@ -497,15 +498,17 @@ index 31014d1..f6dd452 100644
  	}
  }
  
-@@ -310,3 +313,42 @@ out:
+@@ -310,3 +313,44 @@ out:
  	lock_release(&lock);
  	return ret;
  }
 +
 +int ib_acm_query_perf(uint64_t **counters, int *count)
 +{
-+	struct acm_msg msg;
-+	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) &msg;
++	union {
++		struct acm_msg msg;
++		struct acm_perf_msg perf_msg;
++	};
 +	int ret;
 +
 +	lock_acquire(&lock);
@@ -533,7 +536,7 @@ index 31014d1..f6dd452 100644
 +		goto out;
 +	}
 +
-+	memcpy(*counters, perf_msg->data, msg.hdr.data[0]);
++	memcpy(*counters, perf_msg.data, msg.hdr.data[0]);
 +	*count = msg.hdr.data[0];
 +	ret = 0;
 +out:
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 862291e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,47 +0,0 @@
-Bottom: 96d4b580e6b64a5b93647bf40210f2a5ee9a6839
-Top:    4e880c751ba52d99f201637395b7a42c35db7d72
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-29 00:06:19 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 733170f..cf296c6 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -665,6 +665,7 @@ static int query_perf(char *program, char *dest_arg)
- 			for (i = 0; i < cnt; i++)
- 				printf("%llu,", counters[i]);
- 			printf("\n");
-+			ib_acm_free_perf(counters);
- 		}
- 
- 		ib_acm_disconnect();
-diff --git a/src/libacm.c b/src/libacm.c
-index f6dd452..5a0332f 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -316,8 +316,10 @@ out:
- 
- int ib_acm_query_perf(uint64_t **counters, int *count)
- {
--	struct acm_msg msg;
--	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) &msg;
-+	union {
-+		struct acm_msg msg;
-+		struct acm_perf_msg perf_msg;
-+	};
- 	int ret;
- 
- 	lock_acquire(&lock);
-@@ -345,7 +347,7 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
- 		goto out;
- 	}
- 
--	memcpy(*counters, perf_msg->data, msg.hdr.data[0]);
-+	memcpy(*counters, perf_msg.data, msg.hdr.data[0]);
- 	*count = msg.hdr.data[0];
- 	ret = 0;
- out: