[Pcsclite-cvs-commit] r5712 - /trunk/PCSC/src/debuglog.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Thu May 5 09:10:43 UTC 2011
Author: rousseau
Date: Thu May 5 09:10:34 2011
New Revision: 5712
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5712
Log:
log_line(): display the delta time between two log lines even if stdout
is not a tty (redirected to a file)
The information may be usefull to detect problems from a log file with
this time information.
Modified:
trunk/PCSC/src/debuglog.c
Modified: trunk/PCSC/src/debuglog.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/debuglog.c?rev=5712&op=diff
==============================================================================
--- trunk/PCSC/src/debuglog.c (original)
+++ trunk/PCSC/src/debuglog.c Thu May 5 09:10:34 2011
@@ -116,14 +116,31 @@
syslog(LOG_INFO, "%s", DebugBuffer);
else
{
+ static struct timeval last_time = { 0, 0 };
+ struct timeval new_time = { 0, 0 };
+ struct timeval tmp;
+ int delta;
+
+ gettimeofday(&new_time, NULL);
+ if (0 == last_time.tv_sec)
+ last_time = new_time;
+
+ tmp.tv_sec = new_time.tv_sec - last_time.tv_sec;
+ tmp.tv_usec = new_time.tv_usec - last_time.tv_usec;
+ if (tmp.tv_usec < 0)
+ {
+ tmp.tv_sec--;
+ tmp.tv_usec += 1000000;
+ }
+ if (tmp.tv_sec < 100)
+ delta = tmp.tv_sec * 1000000 + tmp.tv_usec;
+ else
+ delta = 99999999;
+
if (LogDoColor)
{
const char *color_pfx = "", *color_sfx = "\33[0m";
const char *time_pfx = "\33[36m", *time_sfx = color_sfx;
- static struct timeval last_time = { 0, 0 };
- struct timeval new_time = { 0, 0 };
- struct timeval tmp;
- int delta;
switch (priority)
{
@@ -144,29 +161,15 @@
color_sfx = "";
break;
}
-
- gettimeofday(&new_time, NULL);
- if (0 == last_time.tv_sec)
- last_time = new_time;
-
- tmp.tv_sec = new_time.tv_sec - last_time.tv_sec;
- tmp.tv_usec = new_time.tv_usec - last_time.tv_usec;
- if (tmp.tv_usec < 0)
- {
- tmp.tv_sec--;
- tmp.tv_usec += 1000000;
- }
- if (tmp.tv_sec < 100)
- delta = tmp.tv_sec * 1000000 + tmp.tv_usec;
- else
- delta = 99999999;
printf("%s%.8d%s %s%s%s\n", time_pfx, delta, time_sfx,
color_pfx, DebugBuffer, color_sfx);
last_time = new_time;
}
else
- puts(DebugBuffer);
+ {
+ printf("%.8d %s\n", delta, DebugBuffer);
+ }
}
} /* log_msg */
More information about the Pcsclite-cvs-commit
mailing list