From 0584684a8202dbdfc2861a32bee3e73d0161a537 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Fri, 3 Sep 2021 21:14:26 -0700 Subject: [PATCH] Improve logger API (#262) This breaking change improves naming consistency. - Rename LOGF to INFOF - Rename recently introduced ANYF to LOGF - Remove V* log calls, as they are not being used --- dsp/mpeg/mpeg1.c | 38 ++++----- libc/log/log.h | 90 +------------------- libc/log/vflogf.c | 5 +- net/https/sslcache.c | 2 +- third_party/mbedtls/ssl_srv.c | 2 +- tool/build/blinkenlights.c | 46 +++++----- tool/build/lib/op101.c | 4 +- tool/build/package.c | 8 +- tool/build/runitd.c | 10 +-- tool/net/echoserver.c | 18 ++-- tool/net/redbean.c | 36 ++++---- tool/viz/lib/ycbcr2rgb3.c | 20 ++--- tool/viz/printvideo.c | 156 +++++++++++++++++----------------- 13 files changed, 174 insertions(+), 261 deletions(-) diff --git a/dsp/mpeg/mpeg1.c b/dsp/mpeg/mpeg1.c index 4ddadb7be..6a8471088 100644 --- a/dsp/mpeg/mpeg1.c +++ b/dsp/mpeg/mpeg1.c @@ -591,24 +591,24 @@ void plm_video_decode_sequence_header(plm_video_t *self) { self->has_sequence_header = true; - LOGF("%s:\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15f;\n" - "\t%-20s = %15f;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;\n" - "\t%-20s = %15d;", - "New MPEG Sequence", "width", self->width, "height", self->height, - "framerate", self->framerate, "pixel_aspect_ratio", - self->pixel_aspect_ratio, "mb_size", self->mb_size, "mb_width", - self->mb_width, "mb_height", self->mb_height, "luma_width", - self->luma_width, "luma_height", self->luma_height, "chroma_width", - self->chroma_width, "chroma_height", self->chroma_height); + INFOF("%s:\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15f;\n" + "\t%-20s = %15f;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;\n" + "\t%-20s = %15d;", + "New MPEG Sequence", "width", self->width, "height", self->height, + "framerate", self->framerate, "pixel_aspect_ratio", + self->pixel_aspect_ratio, "mb_size", self->mb_size, "mb_width", + self->mb_width, "mb_height", self->mb_height, "luma_width", + self->luma_width, "luma_height", self->luma_height, "chroma_width", + self->chroma_width, "chroma_height", self->chroma_height); } static void plm_video_copy_macroblock(plm_video_t *self, int motion_h, @@ -1082,7 +1082,7 @@ static plm_frame_t *plm_video_decode_impl(plm_video_t *self) { plm_frame_t *plm_video_decode(plm_video_t *self) { long double tsc; plm_frame_t *res; - LOGF("plm_video_decode"); + INFOF("plm_video_decode"); tsc = nowl(); res = plm_video_decode_impl(self); plmpegdecode_latency_ = lroundl((nowl() - tsc) * 1e6l); diff --git a/libc/log/log.h b/libc/log/log.h index c19223515..77bd6a6ef 100644 --- a/libc/log/log.h +++ b/libc/log/log.h @@ -73,7 +73,7 @@ extern unsigned __log_level; /* log level for runtime check */ (LEVEL) <= __log_level) // log a message with the specified log level (not checking if LOGGABLE) -#define ANYF(LEVEL, FMT, ...) \ +#define LOGF(LEVEL, FMT, ...) \ do { \ ++ftrace; \ flogf(LEVEL, __FILE__, __LINE__, NULL, FMT, ##__VA_ARGS__); \ @@ -114,7 +114,7 @@ extern unsigned __log_level; /* log level for runtime check */ } \ } while (0) -#define LOGF(FMT, ...) \ +#define INFOF(FMT, ...) \ do { \ if (LOGGABLE(kLogInfo)) { \ ++ftrace; \ @@ -150,15 +150,6 @@ extern unsigned __log_level; /* log level for runtime check */ } \ } while (0) -#define VFLOG(FMT, VA) \ - do { \ - if (LOGGABLE(kLogInfo)) { \ - ++ftrace; \ - vflogf(kLogInfo, __FILE__, __LINE__, NULL, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - #define FLOGF(F, FMT, ...) \ do { \ if (LOGGABLE(kLogInfo)) { \ @@ -168,24 +159,6 @@ extern unsigned __log_level; /* log level for runtime check */ } \ } while (0) -#define VFLOGF(F, FMT, VA) \ - do { \ - if (LOGGABLE(kLogInfo)) { \ - ++ftrace; \ - vflogf(kLogInfo, __FILE__, __LINE__, F, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - -#define VWARNF(FMT, VA) \ - do { \ - if (LOGGABLE(kLogWarn)) { \ - ++ftrace; \ - vflogf(kLogWarn, __FILE__, __LINE__, NULL, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - #define FWARNF(F, FMT, ...) \ do { \ if (LOGGABLE(kLogWarn)) { \ @@ -195,22 +168,6 @@ extern unsigned __log_level; /* log level for runtime check */ } \ } while (0) -#define VFWARNF(F, FMT, VA) \ - do { \ - if (LOGGABLE(kLogWarn)) { \ - ++ftrace; \ - vflogf(kLogWarn, __FILE__, __LINE__, F, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - -#define VFATALF(FMT, VA) \ - do { \ - ++ftrace; \ - vffatalf(kLogFatal, __FILE__, __LINE__, NULL, FMT, VA); \ - unreachable; \ - } while (0) - #define FFATALF(F, FMT, ...) \ do { \ ++ftrace; \ @@ -218,22 +175,6 @@ extern unsigned __log_level; /* log level for runtime check */ unreachable; \ } while (0) -#define VFFATALF(F, FMT, VA) \ - do { \ - ++ftrace; \ - vffatalf(kLogFatal, __FILE__, __LINE__, F, FMT, VA); \ - unreachable; \ - } while (0) - -#define VDEBUGF(FMT, VA) \ - do { \ - if (UNLIKELY(LOGGABLE(kLogDebug))) { \ - ++ftrace; \ - vfdebugf(kLogDebug, __FILE__, __LINE__, NULL, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - #define FDEBUGF(F, FMT, ...) \ do { \ if (UNLIKELY(LOGGABLE(kLogDebug))) { \ @@ -243,33 +184,6 @@ extern unsigned __log_level; /* log level for runtime check */ } \ } while (0) -#define VFVERBOSEF(F, FMT, VA) \ - do { \ - if (LOGGABLE(kLogVerbose)) { \ - ++ftrace; \ - vfverbosef(kLogVerbose, __FILE__, __LINE__, F, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - -#define VFDEBUGF(F, FMT, VA) \ - do { \ - if (LOGGABLE(kLogDebug)) { \ - ++ftrace; \ - vfdebugf(kLogDebug, __FILE__, __LINE__, F, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - -#define VNOISEF(FMT, VA) \ - do { \ - if (UNLIKELY(LOGGABLE(kLogNoise))) { \ - ++ftrace; \ - vfnoisef(kLogNoise, __FILE__, __LINE__, NULL, FMT, VA); \ - --ftrace; \ - } \ - } while (0) - #define FNOISEF(F, FMT, ...) \ do { \ if (UNLIKELY(LOGGABLE(kLogNoise))) { \ diff --git a/libc/log/vflogf.c b/libc/log/vflogf.c index 7bdc25ee5..5e3d6685c 100644 --- a/libc/log/vflogf.c +++ b/libc/log/vflogf.c @@ -65,9 +65,9 @@ void vflogf_onfail(FILE *f) { * will display microseconsd as a delta elapsed time. This is useful if * you do something like: * - * LOGF("connecting to foo"); + * INFOF("connecting to foo"); * connect(...) - * LOGF("connected to foo"); + * INFOF("connected to foo"); * * In that case, the second log entry will always display the amount of * time that it took to connect. This is great in forking applications. @@ -101,7 +101,6 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f, vflogf_onfail(f); } (vfprintf)(f, fmt, va); - va_end(va); fputs("\n", f); if (bufmode == _IOLBF) { f->bufmode = _IOLBF; diff --git a/net/https/sslcache.c b/net/https/sslcache.c index acbcdc817..0d48c8ae3 100644 --- a/net/https/sslcache.c +++ b/net/https/sslcache.c @@ -109,7 +109,7 @@ int UncacheSslSession(void *data, mbedtls_ssl_session *session) { mbedtls_x509_crt *cert; struct SslCacheEntry *e; uint32_t i, hash, ticketlen; - LOGF("uncache"); + INFOF("uncache"); cache = data; hash = HashSslSession(session); i = hash & cache->mask; diff --git a/third_party/mbedtls/ssl_srv.c b/third_party/mbedtls/ssl_srv.c index d98613a72..a04ca2b50 100644 --- a/third_party/mbedtls/ssl_srv.c +++ b/third_party/mbedtls/ssl_srv.c @@ -4473,7 +4473,7 @@ int mbedtls_ssl_handshake_server_step( mbedtls_ssl_context *ssl ) return( ret ); } #endif /* MBEDTLS_SSL_PROTO_DTLS */ - /* LOGF("handshake step %s", GetSslStateName(ssl->state)); */ + /* INFOF("handshake step %s", GetSslStateName(ssl->state)); */ switch( ssl->state ) { case MBEDTLS_SSL_HELLO_REQUEST: diff --git a/tool/build/blinkenlights.c b/tool/build/blinkenlights.c index 43d842e6c..f498c9e66 100644 --- a/tool/build/blinkenlights.c +++ b/tool/build/blinkenlights.c @@ -581,7 +581,7 @@ static void TuiRejuvinate(void) { } static void OnQ(void) { - LOGF("OnQ"); + INFOF("OnQ"); action |= EXIT; } @@ -716,7 +716,7 @@ void TuiSetup(void) { static bool once; report = false; if (!once) { - LOGF("loaded program %s\n%s", codepath, gc(FormatPml4t(m))); + INFOF("loaded program %s\n%s", codepath, gc(FormatPml4t(m))); CommonSetup(); ioctl(ttyout, TCGETS, &oldterm); xsigaction(SIGINT, OnSigInt, 0, 0, oldsig + 3); @@ -1504,15 +1504,15 @@ static void CheckFramePointerImpl(void) { sp = Read64(m->sp); while (bp) { if (!(r = FindReal(m, Read64(m->ss) + bp))) { - LOGF("corrupt frame: %012lx", bp & 0x0000ffffffffffff); + INFOF("corrupt frame: %012lx", bp & 0x0000ffffffffffff); ThrowProtectionFault(m); } sp = bp; bp = Read64(r + 0) - 0; rp = Read64(r + 8) - 1; if (!bp && !(m->bofram[0] <= rp && rp <= m->bofram[1])) { - LOGF("bad frame !(%012lx <= %012lx <= %012lx)", m->bofram[0], rp, - m->bofram[1]); + INFOF("bad frame !(%012lx <= %012lx <= %012lx)", m->bofram[0], rp, + m->bofram[1]); ThrowProtectionFault(m); } } @@ -1620,7 +1620,7 @@ static void Redraw(void) { DrawStatus(&pan.status); PreventBufferbloat(); if (PrintPanels(ttyout, ARRAYLEN(pan.p), pan.p, tyn, txn) == -1) { - LOGF("PrintPanels Interrupted"); + INFOF("PrintPanels Interrupted"); CHECK_EQ(EINTR, errno); } last_opcount = opcount; @@ -1815,7 +1815,7 @@ static const struct MachineFdCb kMachineFdCbPty = { }; static void LaunchDebuggerReactively(void) { - LOGF("%s", systemfailure); + INFOF("%s", systemfailure); if (tuimode) { action |= FAILURE; } else { @@ -2099,7 +2099,7 @@ static void OnApmService(void) { } else if (Read16(m->ax) == 0x5301 && Read16(m->bx) == 0x0000) { SetCarry(false); } else if (Read16(m->ax) == 0x5307 && m->bx[0] == 1 && m->cx[0] == 3) { - LOGF("APM SHUTDOWN"); + INFOF("APM SHUTDOWN"); exit(0); } else { SetCarry(true); @@ -2193,7 +2193,7 @@ static void OnBinbase(struct Machine *m) { unsigned i; int64_t skew; skew = m->xedd->op.disp * 512; - LOGF("skew binbase %,ld @ %012lx", skew, GetIp() & 0x0000ffffffffffff); + INFOF("skew binbase %,ld @ %012lx", skew, GetIp() & 0x0000ffffffffffff); for (i = 0; i < dis->syms.i; ++i) dis->syms.p[i].addr += skew; for (i = 0; i < dis->loads.i; ++i) dis->loads.p[i].addr += skew; for (i = 0; i < breakpoints.i; ++i) breakpoints.p[i].addr += skew; @@ -2460,7 +2460,7 @@ static void ReadKeyboard(void) { dialog = NULL; if (readansi(ttyin, buf, sizeof(buf)) == -1) { if (errno == EINTR) { - LOGF("ReadKeyboard interrupted"); + INFOF("ReadKeyboard interrupted"); return; } FATALF("ReadKeyboard failed: %s", strerror(errno)); @@ -2566,7 +2566,7 @@ static void Exec(void) { if (!(interrupt = setjmp(m->onhalt))) { if (!(action & CONTINUE) && (bp = IsAtBreakpoint(&breakpoints, GetIp())) != -1) { - LOGF("BREAK1 %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); + INFOF("BREAK1 %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); tuimode = true; LoadInstruction(m); ExecuteInstruction(m); @@ -2577,7 +2577,7 @@ static void Exec(void) { for (;;) { LoadInstruction(m); if ((bp = IsAtBreakpoint(&breakpoints, GetIp())) != -1) { - LOGF("BREAK2 %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); + INFOF("BREAK2 %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); action &= ~(FINISH | NEXT | CONTINUE); tuimode = true; break; @@ -2592,13 +2592,13 @@ static void Exec(void) { action &= ~ALARM; } if (action & EXIT) { - LOGF("EXEC EXIT"); + INFOF("EXEC EXIT"); break; } if (action & INT) { - LOGF("EXEC INT"); + INFOF("EXEC INT"); if (react) { - LOGF("REACT"); + INFOF("REACT"); action &= ~(INT | STEP | FINISH | NEXT); tuimode = true; } @@ -2618,7 +2618,7 @@ static void Tui(void) { ssize_t bp; int interrupt; bool interactive; - LOGF("TUI"); + INFOF("TUI"); TuiSetup(); SetupDraw(); ScrollOp(&pan.disassembly, GetDisIndex()); @@ -2629,7 +2629,7 @@ static void Tui(void) { if ((action & (FINISH | NEXT | CONTINUE)) && (bp = IsAtBreakpoint(&breakpoints, GetIp())) != -1) { action &= ~(FINISH | NEXT | CONTINUE); - LOGF("BREAK %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); + INFOF("BREAK %012lx", breakpoints.p[bp].addr & 0x0000ffffffffffff); } } else { m->xedd = (struct XedDecodedInst *)m->icache[0]; @@ -2659,11 +2659,11 @@ static void Tui(void) { PrintMessageBox(ttyout, dialog, tyn, txn); } if (action & FAILURE) { - LOGF("TUI FAILURE"); + INFOF("TUI FAILURE"); PrintMessageBox(ttyout, systemfailure, tyn, txn); ReadKeyboard(); if (action & INT) { - LOGF("TUI INT"); + INFOF("TUI INT"); LeaveScreen(); exit(1); } @@ -2673,7 +2673,7 @@ static void Tui(void) { ReadKeyboard(); } if (action & INT) { - LOGF("TUI INT"); + INFOF("TUI INT"); action &= ~INT; if (action & (CONTINUE | NEXT | FINISH)) { action &= ~(CONTINUE | NEXT | FINISH); @@ -2683,17 +2683,17 @@ static void Tui(void) { } } if (action & EXIT) { - LOGF("TUI EXIT"); + INFOF("TUI EXIT"); break; } if (action & QUIT) { - LOGF("TUI QUIT"); + INFOF("TUI QUIT"); action &= ~QUIT; raise(SIGQUIT); continue; } if (action & RESTART) { - LOGF("TUI RESTART"); + INFOF("TUI RESTART"); break; } if (IsExecuting()) { diff --git a/tool/build/lib/op101.c b/tool/build/lib/op101.c index efb008fe8..ff5b009c3 100644 --- a/tool/build/lib/op101.c +++ b/tool/build/lib/op101.c @@ -79,7 +79,7 @@ static void SgdtMs(struct Machine *m, uint32_t rde) { static void LgdtMs(struct Machine *m, uint32_t rde) { LoadDescriptorTable(m, rde, &m->gdt_limit, &m->gdt_base); - LOGF("set gdt %p lim %,d", m->gdt_base, m->gdt_limit); + INFOF("set gdt %p lim %,d", m->gdt_base, m->gdt_limit); } static void SidtMs(struct Machine *m, uint32_t rde) { @@ -88,7 +88,7 @@ static void SidtMs(struct Machine *m, uint32_t rde) { static void LidtMs(struct Machine *m, uint32_t rde) { LoadDescriptorTable(m, rde, &m->idt_limit, &m->idt_base); - LOGF("set idt %p lim %,d", m->idt_base, m->idt_limit); + INFOF("set idt %p lim %,d", m->idt_base, m->idt_limit); } static void Monitor(struct Machine *m, uint32_t rde) { diff --git a/tool/build/package.c b/tool/build/package.c index 8a925dc5c..ba693e620 100644 --- a/tool/build/package.c +++ b/tool/build/package.c @@ -622,10 +622,10 @@ void CompressLowEntropyReadOnlyDataSections(struct Package *pkg, ".rodata") && rlencode(&rle, p, shdr->sh_size) != -1) { isprofitable = rle.i * sizeof(rle.p[0]) <= shdr->sh_size / 2; - LOGF("%s(%s): rlencode()%s on %s is%s profitable (%,zu โ†’ %,zu bytes)", - &pkg->strings.p[pkg->path], &pkg->strings.p[obj->path], - haverldecode ? "" : " [NOT LINKED]", name, - isprofitable ? "" : " NOT", shdr->sh_size, rle.i * sizeof(rle.p[0])); + INFOF("%s(%s): rlencode()%s on %s is%s profitable (%,zu โ†’ %,zu bytes)", + &pkg->strings.p[pkg->path], &pkg->strings.p[obj->path], + haverldecode ? "" : " [NOT LINKED]", name, + isprofitable ? "" : " NOT", shdr->sh_size, rle.i * sizeof(rle.p[0])); } } free(rle.p); diff --git a/tool/build/runitd.c b/tool/build/runitd.c index 364dad6dd..b5590cc72 100644 --- a/tool/build/runitd.c +++ b/tool/build/runitd.c @@ -204,7 +204,7 @@ void StartTcpServer(void) { CHECK_NE(-1, listen(g_servfd, 10)); asize = sizeof(g_servaddr); CHECK_NE(-1, getsockname(g_servfd, &g_servaddr, &asize)); - LOGF("%s:%s", "listening on tcp", gc(DescribeAddress(&g_servaddr))); + INFOF("%s:%s", "listening on tcp", gc(DescribeAddress(&g_servaddr))); if (g_sendready) { printf("ready %hu\n", ntohs(g_servaddr.sin_port)); fflush(stdout); @@ -306,8 +306,8 @@ void HandleClient(void) { exename = gc(calloc(1, namesize + 1)); Recv(exename, namesize); g_exepath = gc(xasprintf("o/%d.%s", getpid(), basename(exename))); - LOGF("%s asked we run %`'s (%,u bytes @ %`'s)", addrstr, exename, filesize, - g_exepath); + INFOF("%s asked we run %`'s (%,u bytes @ %`'s)", addrstr, exename, filesize, + g_exepath); exe = malloc(filesize); Recv(exe, filesize); @@ -428,9 +428,9 @@ int Serve(void) { } close(g_servfd); if (!g_timeout) { - LOGF("timeout expired, shutting down"); + INFOF("timeout expired, shutting down"); } else { - LOGF("got ctrl-c, shutting down"); + INFOF("got ctrl-c, shutting down"); } return 0; } diff --git a/tool/net/echoserver.c b/tool/net/echoserver.c index 919e8b50f..6e42b6bc3 100644 --- a/tool/net/echoserver.c +++ b/tool/net/echoserver.c @@ -130,7 +130,7 @@ void AddSocket(const struct Socket *s) { void RemoveSocket(size_t i) { DCHECK_LT(i, g_sockets.i); - LOGF("removing: %s", gc(DescribeSocket(&g_sockets.p[i]))); + INFOF("removing: %s", gc(DescribeSocket(&g_sockets.p[i]))); CHECK_NE(-1, close(g_sockets.p[i].fd)); while (g_sockets.p[i].egress.i) { free(g_sockets.p[i].egress.p[g_sockets.p[i].egress.i - 1].data.iov_base); @@ -189,7 +189,7 @@ void BeginListeningForIncomingTraffic(void) { } uint32_t addrsize = sizeof(s->addr); CHECK_NE(-1, getsockname(s->fd, &s->addr, &addrsize)); - LOGF("listening on %s", gc(DescribeSocket(s))); + INFOF("listening on %s", gc(DescribeSocket(s))); } } @@ -202,8 +202,8 @@ void AcceptConnection(size_t i) { client.protocol = server->protocol; uint32_t addrsize = sizeof(client.addr); CHECK_NE(-1L, (client.fd = accept(server->fd, &client.addr, &addrsize))); - LOGF("%s accepted %s", gc(DescribeSocket(server)), - gc(DescribeSocket(&client))); + INFOF("%s accepted %s", gc(DescribeSocket(server)), + gc(DescribeSocket(&client))); AddSocket(&client); } @@ -219,8 +219,8 @@ bool ReceiveData(size_t i) { msg.data.iov_len, 0, isudp ? &msg.dest : NULL, isudp ? &msg.destsize : NULL))); if (0 < got && got <= msg.data.iov_len) { - LOGF("%s received %lu bytes from %s", gc(DescribeSocket(&g_sockets.p[i])), - got, gc(DescribeAddress(&msg.dest))); + INFOF("%s received %lu bytes from %s", gc(DescribeSocket(&g_sockets.p[i])), + got, gc(DescribeAddress(&msg.dest))); msg.data.iov_base = xrealloc(msg.data.iov_base, (msg.data.iov_len = got)); append(&g_sockets.p[i].egress, &msg); g_polls.p[i].events |= POLLOUT; @@ -241,8 +241,8 @@ void SendData(size_t i) { CHECK_NE(-1L, (sent = sendto(s->fd, msg->data.iov_base, msg->data.iov_len, 0, isudp ? &msg->dest : NULL, isudp ? msg->destsize : 0))); - LOGF("%s sent %lu bytes to %s", gc(DescribeSocket(s)), msg->data.iov_len, - gc(DescribeAddress(&msg->dest))); + INFOF("%s sent %lu bytes to %s", gc(DescribeSocket(s)), msg->data.iov_len, + gc(DescribeAddress(&msg->dest))); if (!(msg->data.iov_len -= min((size_t)sent, (size_t)msg->data.iov_len))) { free_s(&msg->data.iov_base); if (!--s->egress.i) { @@ -290,7 +290,7 @@ int main(int argc, char *argv[]) { memset(&icall, 0, sizeof(icall)); interruptiblecall(&icall, (void *)EchoServer, 0, 0, 0, 0); fputc('\r', stderr); - LOGF("%s", "shutting down..."); + INFOF("%s", "shutting down..."); size_t i; for (i = g_sockets.i; i; --i) RemoveSocket(i - 1); return 0; diff --git a/tool/net/redbean.c b/tool/net/redbean.c index 579c0aa6b..8d0d7bf98 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -1118,7 +1118,7 @@ static void ReportWorkerResources(int pid, struct rusage *ru) { AppendResourceReport(&b, ru, "\n"); if (b) { if ((s = IndentLines(b, appendz(b).i - 1, 0, 1))) { - ANYF(kLogDebug, "(stat) resource report for pid %d\n%s", pid, s); + LOGF(kLogDebug, "(stat) resource report for pid %d\n%s", pid, s); free(s); } free(b); @@ -3470,7 +3470,7 @@ static void LogMessage(const char *d, const char *s, size_t n) { while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n; if ((s2 = DecodeLatin1(s, n, &n2))) { if ((s3 = IndentLines(s2, n2, &n3, 1))) { - LOGF("(stat) %s %,ld byte message\n%.*s", d, n, n3, s3); + INFOF("(stat) %s %,ld byte message\n%.*s", d, n, n3, s3); free(s3); } free(s2); @@ -3485,7 +3485,7 @@ static void LogBody(const char *d, const char *s, size_t n) { while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n; if ((s2 = VisualizeControlCodes(s, n, &n2))) { if ((s3 = IndentLines(s2, n2, &n3, 1))) { - LOGF("(stat) %s %,ld byte payload\n%.*s", d, n, n3, s3); + INFOF("(stat) %s %,ld byte payload\n%.*s", d, n, n3, s3); free(s3); } free(s2); @@ -5373,8 +5373,8 @@ static const char *DescribeClose(void) { static void LogClose(const char *reason) { if (amtread || meltdown || killed) { LockInc(&shared->c.fumbles); - LOGF("(stat) %s %s with %,ld unprocessed and %,d handled (%,d workers)", - DescribeClient(), reason, amtread, messageshandled, shared->workers); + INFOF("(stat) %s %s with %,ld unprocessed and %,d handled (%,d workers)", + DescribeClient(), reason, amtread, messageshandled, shared->workers); } else { DEBUGF("(stat) %s %s with %,d requests handled", DescribeClient(), reason, messageshandled); @@ -5513,7 +5513,7 @@ static char *HandlePayloadReadError(void) { return ServeFailure(408, "Request Timeout"); } else { LockInc(&shared->c.readerrors); - LOGF("(clnt) %s payload read error %s", DescribeClient(), strerror(errno)); + INFOF("(clnt) %s payload read error %s", DescribeClient(), strerror(errno)); return ServeFailure(500, "Internal Server Error"); } } @@ -5775,11 +5775,11 @@ static char *HandleRequest(void) { LockInc(&shared->c.urisrefused); return ServeFailure(400, "Bad URI"); } - LOGF("(req) received %s HTTP%02d %.*s %s %`'.*s %`'.*s", DescribeClient(), - msg.version, msg.xmethod.b - msg.xmethod.a, inbuf.p + msg.xmethod.a, - FreeLater(EncodeUrl(&url, 0)), HeaderLength(kHttpReferer), - HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent), - HeaderData(kHttpUserAgent)); + INFOF("(req) received %s HTTP%02d %.*s %s %`'.*s %`'.*s", DescribeClient(), + msg.version, msg.xmethod.b - msg.xmethod.a, inbuf.p + msg.xmethod.a, + FreeLater(EncodeUrl(&url, 0)), HeaderLength(kHttpReferer), + HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent), + HeaderData(kHttpUserAgent)); if (HasHeader(kHttpContentType) && IsMimeType(HeaderData(kHttpContentType), HeaderLength(kHttpContentType), "application/x-www-form-urlencoded")) { @@ -6094,7 +6094,7 @@ static bool HandleMessageAcutal(void) { LockInc(&shared->c.badmessages); connectionclose = true; if ((p = DumpHexc(inbuf.p, MIN(amtread, 256), 0))) { - LOGF("(clnt) %s sent garbage %s", DescribeClient(), p); + INFOF("(clnt) %s sent garbage %s", DescribeClient(), p); } return true; } @@ -6122,7 +6122,7 @@ static bool HandleMessageAcutal(void) { LockInc(&shared->c.messageshandled); ++messageshandled; if (loglatency || LOGGABLE(kLogDebug)) { - ANYF(kLogDebug, "(stat) %`'.*s latency %,ldยตs", msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, + LOGF(kLogDebug, "(stat) %`'.*s latency %,ldยตs", msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, (long)((nowl() - startrequest) * 1e6L)); } if (!generator) { @@ -6473,8 +6473,8 @@ static void Listen(void) { port = ntohs(servers.p[n].addr.sin_port); ip = ntohl(servers.p[n].addr.sin_addr.s_addr); if (ip == INADDR_ANY) ip = INADDR_LOOPBACK; - LOGF("(srvr) listen http://%hhu.%hhu.%hhu.%hhu:%d", ip >> 24, ip >> 16, ip >> 8, - ip, port); + INFOF("(srvr) listen http://%hhu.%hhu.%hhu.%hhu:%d", ip >> 24, ip >> 16, ip >> 8, + ip, port); if (printport && !ports.p[j]) { printf("%d\n", port); fflush(stdout); @@ -6493,9 +6493,9 @@ static void Listen(void) { static void HandleShutdown(void) { CloseServerFds(); if (keyboardinterrupt) { - LOGF("(srvr) received keyboard interrupt"); + INFOF("(srvr) received keyboard interrupt"); } else { - LOGF("(srvr) received term signal"); + INFOF("(srvr) received term signal"); if (!killed) { terminated = false; } @@ -6688,7 +6688,7 @@ void RedBean(int argc, char *argv[]) { TlsDestroy(); MemDestroy(); } - LOGF("(srvr) shutdown complete"); + INFOF("(srvr) shutdown complete"); } int main(int argc, char *argv[]) { diff --git a/tool/viz/lib/ycbcr2rgb3.c b/tool/viz/lib/ycbcr2rgb3.c index d98707410..806d8824b 100644 --- a/tool/viz/lib/ycbcr2rgb3.c +++ b/tool/viz/lib/ycbcr2rgb3.c @@ -192,7 +192,7 @@ void YCbCrComputeSamplingSolution(struct YCbCrSamplingSolution *scale, long dyn, fabs(scale->rx - rx) > .001 || fabs(scale->oy - oy) > .001 || fabs(scale->ox - ox) > .001 || fabs(scale->py - py) > .001 || fabs(scale->px - px) > .001) { - LOGF("recomputing sampling solution"); + INFOF("recomputing sampling solution"); FreeSamplingSolution(scale->cy), scale->cy = NULL; FreeSamplingSolution(scale->cx), scale->cx = NULL; scale->cy = ComputeSamplingSolution(dyn, syn, ry, oy, py); @@ -297,13 +297,13 @@ void YCbCr2RgbScaler(struct YCbCr *me, long dyn, long dxn, yox = sxn / scxn / 2 - prx * .5; coy = syn / scyn / 2 - pry * .5; cox = sxn / scxn / 2 - prx * .5; - LOGF("gyarados pry=%.3f prx=%.3f syn=%.3f sxn=%.3f dyn=%ld dxn=%ld " - "yyn=%ld " - "yxn=%ld cyn=%ld cxn=%ld yry=%.3f yrx=%.3f cry=%.3f crx=%.3f " - "yoy=%.3f " - "yox=%.3f coy=%.3f cox=%.3f", - pry, prx, syn, sxn, dyn, dxn, yyn, yxn, cyn, cxn, yry, yrx, cry, crx, - yoy, yox, coy, cox); + INFOF("gyarados pry=%.3f prx=%.3f syn=%.3f sxn=%.3f dyn=%ld dxn=%ld " + "yyn=%ld " + "yxn=%ld cyn=%ld cxn=%ld yry=%.3f yrx=%.3f cry=%.3f crx=%.3f " + "yoy=%.3f " + "yox=%.3f coy=%.3f cox=%.3f", + pry, prx, syn, sxn, dyn, dxn, yyn, yxn, cyn, cxn, yry, yrx, cry, crx, + yoy, yox, coy, cox); YCbCrComputeSamplingSolution(&me->luma, dyn, dxn, syn, sxn, yry, yrx, yoy, yox, pry, prx); YCbCrComputeSamplingSolution(&me->chroma, dyn, dxn, scyn, scxn, cry, crx, @@ -318,7 +318,7 @@ void YCbCr2RgbScaler(struct YCbCr *me, long dyn, long dxn, me->chroma.cy, me->chroma.cx, false); gyarados_latency_ = lround((nowl() - ts) * 1e6l); YCbCrConvert(me, dyn, dxn, RGB, yys, yxs, Y, cys, cxs, Cb, Cr); - LOGF("done"); + INFOF("done"); } } @@ -370,7 +370,7 @@ void *YCbCr2RgbScale(long dyn, long dxn, CHECK_LE(yxn, yxs); CHECK_LE(cyn, cys); CHECK_LE(cxn, cxs); - LOGF("magikarp2x"); + INFOF("magikarp2x"); magikarp_start_ = nowl(); minyys = MAX(ceil(syn), MAX(yyn, ceil(dyn * pry))); minyxs = MAX(ceil(sxn), MAX(yxn, ceil(dxn * prx))); diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c index b899349c6..721f1594a 100644 --- a/tool/viz/printvideo.c +++ b/tool/viz/printvideo.c @@ -171,7 +171,7 @@ mode.\n\ #define BALLOC(B, A, N, NAME) \ ({ \ - LOGF("balloc/%s %,zu bytes", NAME, N); \ + INFOF("balloc/%s %,zu bytes", NAME, N); \ balloc(B, A, N); \ }) @@ -347,7 +347,7 @@ static bool CloseSpeaker(void) { int rc, wstatus; rc = 0; sched_yield(); - LOGF("CloseSpeaker"); + INFOF("CloseSpeaker"); if (playfd_) { rc |= close(playfd_); playfd_ = -1; @@ -443,7 +443,7 @@ static void DimensionDisplay(void) { yn = ROUNDDOWN(yn, 2); xn = ROUNDDOWN(xn, 2); g2_ = resizegraphic(&graphic_[1], yn, xn); - LOGF("%s ๐‘‘(%huร—%hu)ร—(%d,%d): ๐‘”โ‚(%zuร—%zu,r=%f) โ†’ ๐‘”โ‚‚(%zuร—%zu)", + INFOF("%s ๐‘‘(%huร—%hu)ร—(%d,%d): ๐‘”โ‚(%zuร—%zu,r=%f) โ†’ ๐‘”โ‚‚(%zuร—%zu)", "DimensionDisplay", wsize_.ws_row, wsize_.ws_col, g1_->yn, g1_->xn, ratio, yn, xn); BALLOC(&xtcodes_, 64, ((g2_->yn) * g2_->xn + 8) * sizeof(struct TtyRgb), @@ -818,15 +818,15 @@ static void TranscodeVideo(plm_frame_t *pf) { TIMEIT(t4, RenderIt()); } - LOGF("๐‘“%zu(%uร—%u) %,zub (%f BPP) " - "ycbcr=%,zuns " - "scale=%,zuns " - "lace=%,zuns " - "fx=%,zuns " - "quantize=%,zuns " - "render=%,zuns", - framecount_++, g2_->yn, g2_->xn, f2_->n, - (f1_->n / (double)(g2_->yn * g2_->xn)), t1, t2, t8, t6, t3, t4); + INFOF("๐‘“%zu(%uร—%u) %,zub (%f BPP) " + "ycbcr=%,zuns " + "scale=%,zuns " + "lace=%,zuns " + "fx=%,zuns " + "quantize=%,zuns " + "render=%,zuns", + framecount_++, g2_->yn, g2_->xn, f2_->n, + (f1_->n / (double)(g2_->yn * g2_->xn)), t1, t2, t8, t6, t3, t4); } static void OnVideo(plm_t *mpeg, plm_frame_t *pf, void *user) { @@ -847,7 +847,7 @@ static void OnVideo(plm_t *mpeg, plm_frame_t *pf, void *user) { static void OpenVideo(void) { size_t yn, xn; playfd_ = -1; - LOGF("%s(%`'s)", "OpenVideo", patharg_); + INFOF("%s(%`'s)", "OpenVideo", patharg_); CHECK_NOTNULL((plm_ = plm_create_with_filename(patharg_))); swing_ = 219; xn = plm_get_width(plm_); @@ -1304,7 +1304,7 @@ static void HandleSignals(void) { static void PrintVideo(void) { long double decode_last, decode_end, next_tick, lag; dura_ = MIN(MAX_FRAMERATE, 1 / plm_get_framerate(plm_)); - LOGF("framerate=%f dura=%f", plm_get_framerate(plm_), dura_); + INFOF("framerate=%f dura=%f", plm_get_framerate(plm_), dura_); next_tick = deadline_ = decode_last = nowl(); next_tick += dura_; deadline_ += dura_; @@ -1319,8 +1319,8 @@ static void PrintVideo(void) { deadline_ = next_tick - lag; if (gotvideo_ || !plm_get_video_enabled(plm_)) { gotvideo_ = false; - LOGF("entering printvideo event loop (lag=%,ldns, grace=%,ldns)", - AsNanoseconds(lag), AsNanoseconds(GetGraceTime())); + INFOF("entering printvideo event loop (lag=%,ldns, grace=%,ldns)", + AsNanoseconds(lag), AsNanoseconds(GetGraceTime())); } do { if (!setjmp(jbi_)) { @@ -1452,68 +1452,68 @@ static void TryToOpenFrameBuffer(void) { } if ((fb0_.fd = open(fb0_.path, O_RDWR)) != -1) { CHECK_NE(-1, (rc = ioctl(fb0_.fd, FBIOGET_FSCREENINFO, &fb0_.fscreen))); - LOGF("ioctl(%s) โ†’ %d", "FBIOGET_FSCREENINFO", rc); - LOGF("%s.%s=%.*s", "fb0_.fscreen", "id", sizeof(fb0_.fscreen.id), - fb0_.fscreen.id); - LOGF("%s.%s=%p", "fb0_.fscreen", "smem_start", fb0_.fscreen.smem_start); - LOGF("%s.%s=%u", "fb0_.fscreen", "smem_len", fb0_.fscreen.smem_len); - LOGF("%s.%s=%u", "fb0_.fscreen", "type", fb0_.fscreen.type); - LOGF("%s.%s=%u", "fb0_.fscreen", "type_aux", fb0_.fscreen.type_aux); - LOGF("%s.%s=%u", "fb0_.fscreen", "visual", fb0_.fscreen.visual); - LOGF("%s.%s=%hu", "fb0_.fscreen", "xpanstep", fb0_.fscreen.xpanstep); - LOGF("%s.%s=%hu", "fb0_.fscreen", "ypanstep", fb0_.fscreen.ypanstep); - LOGF("%s.%s=%hu", "fb0_.fscreen", "ywrapstep", fb0_.fscreen.ywrapstep); - LOGF("%s.%s=%u", "fb0_.fscreen", "line_length", fb0_.fscreen.line_length); - LOGF("%s.%s=%p", "fb0_.fscreen", "mmio_start", fb0_.fscreen.mmio_start); - LOGF("%s.%s=%u", "fb0_.fscreen", "mmio_len", fb0_.fscreen.mmio_len); - LOGF("%s.%s=%u", "fb0_.fscreen", "accel", fb0_.fscreen.accel); - LOGF("%s.%s=%#b", "fb0_.fscreen", "capabilities", - fb0_.fscreen.capabilities); + INFOF("ioctl(%s) โ†’ %d", "FBIOGET_FSCREENINFO", rc); + INFOF("%s.%s=%.*s", "fb0_.fscreen", "id", sizeof(fb0_.fscreen.id), + fb0_.fscreen.id); + INFOF("%s.%s=%p", "fb0_.fscreen", "smem_start", fb0_.fscreen.smem_start); + INFOF("%s.%s=%u", "fb0_.fscreen", "smem_len", fb0_.fscreen.smem_len); + INFOF("%s.%s=%u", "fb0_.fscreen", "type", fb0_.fscreen.type); + INFOF("%s.%s=%u", "fb0_.fscreen", "type_aux", fb0_.fscreen.type_aux); + INFOF("%s.%s=%u", "fb0_.fscreen", "visual", fb0_.fscreen.visual); + INFOF("%s.%s=%hu", "fb0_.fscreen", "xpanstep", fb0_.fscreen.xpanstep); + INFOF("%s.%s=%hu", "fb0_.fscreen", "ypanstep", fb0_.fscreen.ypanstep); + INFOF("%s.%s=%hu", "fb0_.fscreen", "ywrapstep", fb0_.fscreen.ywrapstep); + INFOF("%s.%s=%u", "fb0_.fscreen", "line_length", fb0_.fscreen.line_length); + INFOF("%s.%s=%p", "fb0_.fscreen", "mmio_start", fb0_.fscreen.mmio_start); + INFOF("%s.%s=%u", "fb0_.fscreen", "mmio_len", fb0_.fscreen.mmio_len); + INFOF("%s.%s=%u", "fb0_.fscreen", "accel", fb0_.fscreen.accel); + INFOF("%s.%s=%#b", "fb0_.fscreen", "capabilities", + fb0_.fscreen.capabilities); CHECK_NE(-1, (rc = ioctl(fb0_.fd, FBIOGET_VSCREENINFO, &fb0_.vscreen))); - LOGF("ioctl(%s) โ†’ %d", "FBIOGET_VSCREENINFO", rc); - LOGF("%s.%s=%u", "fb0_.vscreen", "xres", fb0_.vscreen.xres); - LOGF("%s.%s=%u", "fb0_.vscreen", "yres", fb0_.vscreen.yres); - LOGF("%s.%s=%u", "fb0_.vscreen", "xres_virtual", fb0_.vscreen.xres_virtual); - LOGF("%s.%s=%u", "fb0_.vscreen", "yres_virtual", fb0_.vscreen.yres_virtual); - LOGF("%s.%s=%u", "fb0_.vscreen", "xoffset", fb0_.vscreen.xoffset); - LOGF("%s.%s=%u", "fb0_.vscreen", "yoffset", fb0_.vscreen.yoffset); - LOGF("%s.%s=%u", "fb0_.vscreen", "bits_per_pixel", - fb0_.vscreen.bits_per_pixel); - LOGF("%s.%s=%u", "fb0_.vscreen", "grayscale", fb0_.vscreen.grayscale); - LOGF("%s.%s=%u", "fb0_.vscreen.red", "offset", fb0_.vscreen.red.offset); - LOGF("%s.%s=%u", "fb0_.vscreen.red", "length", fb0_.vscreen.red.length); - LOGF("%s.%s=%u", "fb0_.vscreen.red", "msb_right", - fb0_.vscreen.red.msb_right); - LOGF("%s.%s=%u", "fb0_.vscreen.green", "offset", fb0_.vscreen.green.offset); - LOGF("%s.%s=%u", "fb0_.vscreen.green", "length", fb0_.vscreen.green.length); - LOGF("%s.%s=%u", "fb0_.vscreen.green", "msb_right", - fb0_.vscreen.green.msb_right); - LOGF("%s.%s=%u", "fb0_.vscreen.blue", "offset", fb0_.vscreen.blue.offset); - LOGF("%s.%s=%u", "fb0_.vscreen.blue", "length", fb0_.vscreen.blue.length); - LOGF("%s.%s=%u", "fb0_.vscreen.blue", "msb_right", - fb0_.vscreen.blue.msb_right); - LOGF("%s.%s=%u", "fb0_.vscreen.transp", "offset", - fb0_.vscreen.transp.offset); - LOGF("%s.%s=%u", "fb0_.vscreen.transp", "length", - fb0_.vscreen.transp.length); - LOGF("%s.%s=%u", "fb0_.vscreen.transp", "msb_right", - fb0_.vscreen.transp.msb_right); - LOGF("%s.%s=%u", "fb0_.vscreen", "nonstd", fb0_.vscreen.nonstd); - LOGF("%s.%s=%u", "fb0_.vscreen", "activate", fb0_.vscreen.activate); - LOGF("%s.%s=%u", "fb0_.vscreen", "height", fb0_.vscreen.height); - LOGF("%s.%s=%u", "fb0_.vscreen", "width", fb0_.vscreen.width); - LOGF("%s.%s=%u", "fb0_.vscreen", "accel_flags", fb0_.vscreen.accel_flags); - LOGF("%s.%s=%u", "fb0_.vscreen", "pixclock", fb0_.vscreen.pixclock); - LOGF("%s.%s=%u", "fb0_.vscreen", "left_margin", fb0_.vscreen.left_margin); - LOGF("%s.%s=%u", "fb0_.vscreen", "right_margin", fb0_.vscreen.right_margin); - LOGF("%s.%s=%u", "fb0_.vscreen", "upper_margin", fb0_.vscreen.upper_margin); - LOGF("%s.%s=%u", "fb0_.vscreen", "lower_margin", fb0_.vscreen.lower_margin); - LOGF("%s.%s=%u", "fb0_.vscreen", "hsync_len", fb0_.vscreen.hsync_len); - LOGF("%s.%s=%u", "fb0_.vscreen", "vsync_len", fb0_.vscreen.vsync_len); - LOGF("%s.%s=%u", "fb0_.vscreen", "sync", fb0_.vscreen.sync); - LOGF("%s.%s=%u", "fb0_.vscreen", "vmode", fb0_.vscreen.vmode); - LOGF("%s.%s=%u", "fb0_.vscreen", "rotate", fb0_.vscreen.rotate); - LOGF("%s.%s=%u", "fb0_.vscreen", "colorspace", fb0_.vscreen.colorspace); + INFOF("ioctl(%s) โ†’ %d", "FBIOGET_VSCREENINFO", rc); + INFOF("%s.%s=%u", "fb0_.vscreen", "xres", fb0_.vscreen.xres); + INFOF("%s.%s=%u", "fb0_.vscreen", "yres", fb0_.vscreen.yres); + INFOF("%s.%s=%u", "fb0_.vscreen", "xres_virtual", fb0_.vscreen.xres_virtual); + INFOF("%s.%s=%u", "fb0_.vscreen", "yres_virtual", fb0_.vscreen.yres_virtual); + INFOF("%s.%s=%u", "fb0_.vscreen", "xoffset", fb0_.vscreen.xoffset); + INFOF("%s.%s=%u", "fb0_.vscreen", "yoffset", fb0_.vscreen.yoffset); + INFOF("%s.%s=%u", "fb0_.vscreen", "bits_per_pixel", + fb0_.vscreen.bits_per_pixel); + INFOF("%s.%s=%u", "fb0_.vscreen", "grayscale", fb0_.vscreen.grayscale); + INFOF("%s.%s=%u", "fb0_.vscreen.red", "offset", fb0_.vscreen.red.offset); + INFOF("%s.%s=%u", "fb0_.vscreen.red", "length", fb0_.vscreen.red.length); + INFOF("%s.%s=%u", "fb0_.vscreen.red", "msb_right", + fb0_.vscreen.red.msb_right); + INFOF("%s.%s=%u", "fb0_.vscreen.green", "offset", fb0_.vscreen.green.offset); + INFOF("%s.%s=%u", "fb0_.vscreen.green", "length", fb0_.vscreen.green.length); + INFOF("%s.%s=%u", "fb0_.vscreen.green", "msb_right", + fb0_.vscreen.green.msb_right); + INFOF("%s.%s=%u", "fb0_.vscreen.blue", "offset", fb0_.vscreen.blue.offset); + INFOF("%s.%s=%u", "fb0_.vscreen.blue", "length", fb0_.vscreen.blue.length); + INFOF("%s.%s=%u", "fb0_.vscreen.blue", "msb_right", + fb0_.vscreen.blue.msb_right); + INFOF("%s.%s=%u", "fb0_.vscreen.transp", "offset", + fb0_.vscreen.transp.offset); + INFOF("%s.%s=%u", "fb0_.vscreen.transp", "length", + fb0_.vscreen.transp.length); + INFOF("%s.%s=%u", "fb0_.vscreen.transp", "msb_right", + fb0_.vscreen.transp.msb_right); + INFOF("%s.%s=%u", "fb0_.vscreen", "nonstd", fb0_.vscreen.nonstd); + INFOF("%s.%s=%u", "fb0_.vscreen", "activate", fb0_.vscreen.activate); + INFOF("%s.%s=%u", "fb0_.vscreen", "height", fb0_.vscreen.height); + INFOF("%s.%s=%u", "fb0_.vscreen", "width", fb0_.vscreen.width); + INFOF("%s.%s=%u", "fb0_.vscreen", "accel_flags", fb0_.vscreen.accel_flags); + INFOF("%s.%s=%u", "fb0_.vscreen", "pixclock", fb0_.vscreen.pixclock); + INFOF("%s.%s=%u", "fb0_.vscreen", "left_margin", fb0_.vscreen.left_margin); + INFOF("%s.%s=%u", "fb0_.vscreen", "right_margin", fb0_.vscreen.right_margin); + INFOF("%s.%s=%u", "fb0_.vscreen", "upper_margin", fb0_.vscreen.upper_margin); + INFOF("%s.%s=%u", "fb0_.vscreen", "lower_margin", fb0_.vscreen.lower_margin); + INFOF("%s.%s=%u", "fb0_.vscreen", "hsync_len", fb0_.vscreen.hsync_len); + INFOF("%s.%s=%u", "fb0_.vscreen", "vsync_len", fb0_.vscreen.vsync_len); + INFOF("%s.%s=%u", "fb0_.vscreen", "sync", fb0_.vscreen.sync); + INFOF("%s.%s=%u", "fb0_.vscreen", "vmode", fb0_.vscreen.vmode); + INFOF("%s.%s=%u", "fb0_.vscreen", "rotate", fb0_.vscreen.rotate); + INFOF("%s.%s=%u", "fb0_.vscreen", "colorspace", fb0_.vscreen.colorspace); fb0_.size = fb0_.fscreen.smem_len; CHECK_NE(MAP_FAILED, (fb0_.map = mmap(NULL, fb0_.size, PROT_READ | PROT_WRITE, @@ -1565,6 +1565,6 @@ int main(int argc, char *argv[]) { starttime_ = nowl(); PrintVideo(); } - LOGF("jb_ triggered"); + INFOF("jb_ triggered"); return 0; }