From: Sean Hefty Date: Fri, 12 Nov 2010 01:18:43 +0000 (-0800) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=da43d4971d287622e9dbc4d48fd8d6a076ee8408;p=~shefty%2Fibacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index b4355c4..057ed0a 100644 --- 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 index 0000000..1a87cbf --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,37 @@ +Bottom: 30326a5093b7b177c8d7612eba401d4999793f71 +Top: 20158584e2cf3c24412af849b75519e2a4ebc216 +Author: Sean Hefty +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 + #include + #include ++#include + #include + #include + #include +@@ -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);