Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-06 02:29:31 +00:00
Code Issues Projects Releases Wiki Activity

mdev: improve logging

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-04-19 18:54:49 +02:00
parent 73327a048b
commit bd77e9d609
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util-linux/mdev.c
View File

@ -283,7 +283,7 @@ struct globals {
unsigned rule_idx; unsigned rule_idx;
#endif #endif
struct rule cur_rule; struct rule cur_rule;
char timestr[sizeof("60.123456")]; char timestr[sizeof("HH:MM:SS.123456")];
} FIX_ALIASING; } FIX_ALIASING;
#define G (*(struct globals*)&bb_common_bufsiz1) #define G (*(struct globals*)&bb_common_bufsiz1)
#define INIT_G() do { \ #define INIT_G() do { \
@ -923,7 +923,11 @@ static char *curtime(void)
{ {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
sprintf(G.timestr, "%u.%06u", (unsigned)tv.tv_sec % 60, (unsigned)tv.tv_usec); sprintf(
strftime_HHMMSS(G.timestr, sizeof(G.timestr), &tv.tv_sec),
".%06u",
(unsigned)tv.tv_usec
);
return G.timestr; return G.timestr;
} }
@ -984,7 +988,7 @@ wait_for_seqfile(const char *seq)
break; break;
} }
if (do_once) { if (do_once) {
dbg2("%s waiting for '%s'", curtime(), seqbuf); dbg2("%s mdev.seq='%s', need '%s'", curtime(), seqbuf, seq);
do_once = 0; do_once = 0;
} }
if (sigtimedwait(&set_CHLD, NULL, &ts) >= 0) { if (sigtimedwait(&set_CHLD, NULL, &ts) >= 0) {
@ -992,7 +996,7 @@ wait_for_seqfile(const char *seq)
continue; /* don't decrement timeout! */ continue; /* don't decrement timeout! */
} }
if (--timeout == 0) { if (--timeout == 0) {
dbg1("%s waiting for '%s'", "timed out", seqbuf); dbg1("%s mdev.seq='%s'", "timed out", seqbuf);
break; break;
} }
} }