refresh

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

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

diff --git a/patches/ts b/patches/ts
index 4b60a88225c7896fb16bb43c5eed7efd0ca5dc76..757d76850c6a7a5ef5622b2baf3a019994a9d16c 100644 (file)
--- a/patches/ts
+++ b/patches/ts
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    c13dc16049a1b3bc439e4486c1f1f7c0be30f94c
+Top:    a54b3e542a71776166e8d85e0c30256c37ccc268
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..28721b2 100644
+index 820365c..6f77729 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -38,7 +38,22 @@ index 820365c..28721b2 100644
 +      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);
+@@ -232,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: