refresh (create temporary patch)

diff --git a/meta b/meta
index 24075a571bb3aa72c4111c02b143358171fa5ff8..1ade10dd10668f0e6ddea5aaf884e97a0d2401d0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 5bfef81e31b93c8fca012d7e39ba093ee5a69e5f
-Head: 68cdbebde6c70f29cd1e274feb7dbc011293466a
+Previous: 05c630395632bd46ea6dfac27352c0be8faa4734
+Head: 66873592e4906411dba004ad6e3daf16b30207c4
 Applied:
   ts: 68cdbebde6c70f29cd1e274feb7dbc011293466a
+  refresh-temp: 66873592e4906411dba004ad6e3daf16b30207c4
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..ee18ef6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+Bottom: c13dc16049a1b3bc439e4486c1f1f7c0be30f94c
+Top:    a54b3e542a71776166e8d85e0c30256c37ccc268
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-11-11 17:57:25 -0800
+
+Refresh of ts
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 28721b2..6f77729 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -225,7 +225,7 @@ static void acm_write(int level, const char *format, ...)
+       gettimeofday(&tv, NULL);
+       va_start(args, format);
+       lock_acquire(&log_lock);
+-      fprintf(flog, "%u.%u: ", (unsigned) tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
++      fprintf(flog, "%u.%03u: ", (unsigned) tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
+       vfprintf(flog, format, args);
+       fflush(flog);
+       lock_release(&log_lock);
+@@ -236,11 +236,14 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+ {
+       struct ibv_path_record *path;
+       char ip_addr[ACM_MAX_ADDRESS];
++      struct timeval tv;
+ 
+       if (level > log_level)
+               return;
+ 
++      gettimeofday(&tv, NULL);
+       lock_acquire(&log_lock);
++      fprintf(flog, "%u.%03u: ", (unsigned) tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
+       fprintf(flog, msg);
+       switch (addr_type) {
+       case ACM_EP_INFO_NAME: