From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 12 Nov 2010 01:18:43 +0000 (-0800)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e54a06449b4acfcb771ca3655d6cd287c5f17441;p=~shefty%2Fibacm.git

refresh
---

diff --git a/meta b/meta
index 057ed0a..6e75bc2 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 837ac9fbcc371460ef47adc22d92e85574a5836f
-Head: 982da98744cb06b5b8e2ff19e85d9bb535d7b66f
+Previous: 70d166ca43b4c2a91909cc326ad2af08f82f5b82
+Head: 43e862052519485c77819c59d9b5ce9a84b92917
 Applied:
-  ts: f0ed69a739ae92a64402ace218b632d9e8a4a400
-  refresh-temp: 982da98744cb06b5b8e2ff19e85d9bb535d7b66f
+  ts: 43e862052519485c77819c59d9b5ce9a84b92917
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 1a87cbf..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    20158584e2cf3c24412af849b75519e2a4ebc216
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-11 17:18:43 -0800
-
-Refresh of ts
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 820365c..24f8150 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -37,6 +37,7 @@
- #include <osd.h>
- #include <arpa/inet.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
- #include <infiniband/acm.h>
- #include <infiniband/umad.h>
- #include <infiniband/verbs.h>
-@@ -216,12 +217,15 @@ static uint8_t min_rate = IBV_RATE_10_GBPS;
- static void acm_write(int level, const char *format, ...)
- {
- 	va_list args;
-+	struct timeval tv;
- 
- 	if (level > log_level)
- 		return;
- 
-+	gettimeofday(&tv, NULL);
- 	va_start(args, format);
- 	lock_acquire(&log_lock);
-+	vfprintf(flog, "%u.%u" tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
- 	vfprintf(flog, format, args);
- 	fflush(flog);
- 	lock_release(&log_lock);
diff --git a/patches/ts b/patches/ts
index c068df2..ee0dee1 100644
--- a/patches/ts
+++ b/patches/ts
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    30326a5093b7b177c8d7612eba401d4999793f71
+Top:    20158584e2cf3c24412af849b75519e2a4ebc216
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -14,4 +14,31 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 820365c..24f8150 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -37,6 +37,7 @@
+ #include <osd.h>
+ #include <arpa/inet.h>
+ #include <sys/stat.h>
++#include <sys/time.h>
+ #include <infiniband/acm.h>
+ #include <infiniband/umad.h>
+ #include <infiniband/verbs.h>
+@@ -216,12 +217,15 @@ static uint8_t min_rate = IBV_RATE_10_GBPS;
+ static void acm_write(int level, const char *format, ...)
+ {
+ 	va_list args;
++	struct timeval tv;
+ 
+ 	if (level > log_level)
+ 		return;
+ 
++	gettimeofday(&tv, NULL);
+ 	va_start(args, format);
+ 	lock_acquire(&log_lock);
++	vfprintf(flog, "%u.%u" tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
+ 	vfprintf(flog, format, args);
+ 	fflush(flog);
+ 	lock_release(&log_lock);