o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libventi: add %+T

Browse source
This commit is contained in:
Russ Cox 2008-12-23 12:32:08 -08:00
parent 7e0b686233
commit ece9d931eb
2 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libventi/log.c
View file

@ -162,18 +162,6 @@ vtlogremove(char *name)
qunlock(&vl.lk); qunlock(&vl.lk);
} }
static int
timefmt(Fmt *fmt)
{
static uvlong t0;
uvlong t;
if(t0 == 0)
t0 = nsec();
t = nsec()-t0;
return fmtprint(fmt, "T+%d.%04d", (uint)(t/1000000000), (uint)(t%1000000000)/100000);
}
void void
vtlogvprint(VtLog *l, char *fmt, va_list arg) vtlogvprint(VtLog *l, char *fmt, va_list arg)
{ {
@ -184,13 +172,7 @@ vtlogvprint(VtLog *l, char *fmt, va_list arg)
if(l == nil) if(l == nil)
return; return;
if(first){
fmtinstall('T', timefmt);
first = 0;
}
qlock(&l->lk); qlock(&l->lk);
c = l->w; c = l->w;
n = c->ep - c->wp; n = c->ep - c->wp;

9
src/libventi/time.c
View file

@ -8,15 +8,18 @@ vttimefmt(Fmt *fmt)
vlong ns; vlong ns;
Tm tm; Tm tm;
if(fmt->flags&FmtLong){ if(fmt->flags&FmtSign){
ns = va_arg(fmt->args, long);
ns *= 1000000000;
} else
ns = nsec(); ns = nsec();
tm = *localtime(ns/1000000000); tm = *localtime(ns/1000000000);
if(fmt->flags&FmtLong){
return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d.%03d", return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d.%03d",
tm.year+1900, tm.mon+1, tm.mday, tm.year+1900, tm.mon+1, tm.mday,
tm.hour, tm.min, tm.sec, tm.hour, tm.min, tm.sec,
(int)(ns%1000000000)/1000000); (int)(ns%1000000000)/1000000);
}else{ }else{
tm = *localtime(time(0));
return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d", return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d",
tm.year+1900, tm.mon+1, tm.mday, tm.year+1900, tm.mon+1, tm.mday,
tm.hour, tm.min, tm.sec); tm.hour, tm.min, tm.sec);