refresh (create temporary patch)

diff --git a/meta b/meta
index b4355c46341f99cd13513bd0e1b231d0a434a33b..057ed0a7aef67e1ad0b786d9e4b5747b3d2e0bf3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: c026f8d0d41ab0d7c6b08456e6539a228be95447
-Head: f0ed69a739ae92a64402ace218b632d9e8a4a400
+Previous: 837ac9fbcc371460ef47adc22d92e85574a5836f
+Head: 982da98744cb06b5b8e2ff19e85d9bb535d7b66f
 Applied:
   ts: f0ed69a739ae92a64402ace218b632d9e8a4a400
+  refresh-temp: 982da98744cb06b5b8e2ff19e85d9bb535d7b66f
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..1a87cbf
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+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);