mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-28 15:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve logger API (#262)

Browse source 
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
This commit is contained in:
Paul Kulchenko 2021-09-03 21:14:26 -07:00 • committed by GitHub
parent 50937be752
commit 0584684a82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 174 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

90
libc/log/log.h
View file

@ -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))) { \

5
libc/log/vflogf.c
View file

@ -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;