Skip to content

Commit 0584684

Browse files
pkulchenkopkulchenko
authored
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
1 parent 50937be commit 0584684

File tree

13 files changed

+174
-261
lines changed

13 files changed

+174
-261
lines changed

‎dsp/mpeg/mpeg1.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -591,24 +591,24 @@ void plm_video_decode_sequence_header(plm_video_t *self) {
591591

592592
self->has_sequence_header = true;
593593

594-
LOGF("%s:\n"
595-
"\t%-20s = %15d;\n"
596-
"\t%-20s = %15d;\n"
597-
"\t%-20s = %15f;\n"
598-
"\t%-20s = %15f;\n"
599-
"\t%-20s = %15d;\n"
600-
"\t%-20s = %15d;\n"
601-
"\t%-20s = %15d;\n"
602-
"\t%-20s = %15d;\n"
603-
"\t%-20s = %15d;\n"
604-
"\t%-20s = %15d;\n"
605-
"\t%-20s = %15d;",
606-
"New MPEG Sequence", "width", self->width, "height", self->height,
607-
"framerate", self->framerate, "pixel_aspect_ratio",
608-
self->pixel_aspect_ratio, "mb_size", self->mb_size, "mb_width",
609-
self->mb_width, "mb_height", self->mb_height, "luma_width",
610-
self->luma_width, "luma_height", self->luma_height, "chroma_width",
611-
self->chroma_width, "chroma_height", self->chroma_height);
594+
INFOF("%s:\n"
595+
"\t%-20s = %15d;\n"
596+
"\t%-20s = %15d;\n"
597+
"\t%-20s = %15f;\n"
598+
"\t%-20s = %15f;\n"
599+
"\t%-20s = %15d;\n"
600+
"\t%-20s = %15d;\n"
601+
"\t%-20s = %15d;\n"
602+
"\t%-20s = %15d;\n"
603+
"\t%-20s = %15d;\n"
604+
"\t%-20s = %15d;\n"
605+
"\t%-20s = %15d;",
606+
"New MPEG Sequence", "width", self->width, "height", self->height,
607+
"framerate", self->framerate, "pixel_aspect_ratio",
608+
self->pixel_aspect_ratio, "mb_size", self->mb_size, "mb_width",
609+
self->mb_width, "mb_height", self->mb_height, "luma_width",
610+
self->luma_width, "luma_height", self->luma_height, "chroma_width",
611+
self->chroma_width, "chroma_height", self->chroma_height);
612612
}
613613

614614
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) {
10821082
plm_frame_t *plm_video_decode(plm_video_t *self) {
10831083
long double tsc;
10841084
plm_frame_t *res;
1085-
LOGF("plm_video_decode");
1085+
INFOF("plm_video_decode");
10861086
tsc = nowl();
10871087
res = plm_video_decode_impl(self);
10881088
plmpegdecode_latency_ = lroundl((nowl() - tsc) * 1e6l);

‎libc/log/log.h

Lines changed: 2 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ extern unsigned __log_level; /* log level for runtime check */
7373
(LEVEL) <= __log_level)
7474

7575
// log a message with the specified log level (not checking if LOGGABLE)
76-
#define ANYF(LEVEL, FMT, ...) \
76+
#define LOGF(LEVEL, FMT, ...) \
7777
do { \
7878
++ftrace; \
7979
flogf(LEVEL, __FILE__, __LINE__, NULL, FMT, ##__VA_ARGS__); \
@@ -114,7 +114,7 @@ extern unsigned __log_level; /* log level for runtime check */
114114
} \
115115
} while (0)
116116

117-
#define LOGF(FMT, ...) \
117+
#define INFOF(FMT, ...) \
118118
do { \
119119
if (LOGGABLE(kLogInfo)) { \
120120
++ftrace; \
@@ -150,15 +150,6 @@ extern unsigned __log_level; /* log level for runtime check */
150150
} \
151151
} while (0)
152152

153-
#define VFLOG(FMT, VA) \
154-
do { \
155-
if (LOGGABLE(kLogInfo)) { \
156-
++ftrace; \
157-
vflogf(kLogInfo, __FILE__, __LINE__, NULL, FMT, VA); \
158-
--ftrace; \
159-
} \
160-
} while (0)
161-
162153
#define FLOGF(F, FMT, ...) \
163154
do { \
164155
if (LOGGABLE(kLogInfo)) { \
@@ -168,24 +159,6 @@ extern unsigned __log_level; /* log level for runtime check */
168159
} \
169160
} while (0)
170161

171-
#define VFLOGF(F, FMT, VA) \
172-
do { \
173-
if (LOGGABLE(kLogInfo)) { \
174-
++ftrace; \
175-
vflogf(kLogInfo, __FILE__, __LINE__, F, FMT, VA); \
176-
--ftrace; \
177-
} \
178-
} while (0)
179-
180-
#define VWARNF(FMT, VA) \
181-
do { \
182-
if (LOGGABLE(kLogWarn)) { \
183-
++ftrace; \
184-
vflogf(kLogWarn, __FILE__, __LINE__, NULL, FMT, VA); \
185-
--ftrace; \
186-
} \
187-
} while (0)
188-
189162
#define FWARNF(F, FMT, ...) \
190163
do { \
191164
if (LOGGABLE(kLogWarn)) { \
@@ -195,45 +168,13 @@ extern unsigned __log_level; /* log level for runtime check */
195168
} \
196169
} while (0)
197170

198-
#define VFWARNF(F, FMT, VA) \
199-
do { \
200-
if (LOGGABLE(kLogWarn)) { \
201-
++ftrace; \
202-
vflogf(kLogWarn, __FILE__, __LINE__, F, FMT, VA); \
203-
--ftrace; \
204-
} \
205-
} while (0)
206-
207-
#define VFATALF(FMT, VA) \
208-
do { \
209-
++ftrace; \
210-
vffatalf(kLogFatal, __FILE__, __LINE__, NULL, FMT, VA); \
211-
unreachable; \
212-
} while (0)
213-
214171
#define FFATALF(F, FMT, ...) \
215172
do { \
216173
++ftrace; \
217174
ffatalf(kLogFatal, __FILE__, __LINE__, F, FMT, ##__VA_ARGS__); \
218175
unreachable; \
219176
} while (0)
220177

221-
#define VFFATALF(F, FMT, VA) \
222-
do { \
223-
++ftrace; \
224-
vffatalf(kLogFatal, __FILE__, __LINE__, F, FMT, VA); \
225-
unreachable; \
226-
} while (0)
227-
228-
#define VDEBUGF(FMT, VA) \
229-
do { \
230-
if (UNLIKELY(LOGGABLE(kLogDebug))) { \
231-
++ftrace; \
232-
vfdebugf(kLogDebug, __FILE__, __LINE__, NULL, FMT, VA); \
233-
--ftrace; \
234-
} \
235-
} while (0)
236-
237178
#define FDEBUGF(F, FMT, ...) \
238179
do { \
239180
if (UNLIKELY(LOGGABLE(kLogDebug))) { \
@@ -243,33 +184,6 @@ extern unsigned __log_level; /* log level for runtime check */
243184
} \
244185
} while (0)
245186

246-
#define VFVERBOSEF(F, FMT, VA) \
247-
do { \
248-
if (LOGGABLE(kLogVerbose)) { \
249-
++ftrace; \
250-
vfverbosef(kLogVerbose, __FILE__, __LINE__, F, FMT, VA); \
251-
--ftrace; \
252-
} \
253-
} while (0)
254-
255-
#define VFDEBUGF(F, FMT, VA) \
256-
do { \
257-
if (LOGGABLE(kLogDebug)) { \
258-
++ftrace; \
259-
vfdebugf(kLogDebug, __FILE__, __LINE__, F, FMT, VA); \
260-
--ftrace; \
261-
} \
262-
} while (0)
263-
264-
#define VNOISEF(FMT, VA) \
265-
do { \
266-
if (UNLIKELY(LOGGABLE(kLogNoise))) { \
267-
++ftrace; \
268-
vfnoisef(kLogNoise, __FILE__, __LINE__, NULL, FMT, VA); \
269-
--ftrace; \
270-
} \
271-
} while (0)
272-
273187
#define FNOISEF(F, FMT, ...) \
274188
do { \
275189
if (UNLIKELY(LOGGABLE(kLogNoise))) { \

‎libc/log/vflogf.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ void vflogf_onfail(FILE *f) {
6565
* will display microseconsd as a delta elapsed time. This is useful if
6666
* you do something like:
6767
*
68-
* LOGF("connecting to foo");
68+
* INFOF("connecting to foo");
6969
* connect(...)
70-
* LOGF("connected to foo");
70+
* INFOF("connected to foo");
7171
*
7272
* In that case, the second log entry will always display the amount of
7373
* 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,
101101
vflogf_onfail(f);
102102
}
103103
(vfprintf)(f, fmt, va);
104-
va_end(va);
105104
fputs("\n", f);
106105
if (bufmode == _IOLBF) {
107106
f->bufmode = _IOLBF;

‎net/https/sslcache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int UncacheSslSession(void *data, mbedtls_ssl_session *session) {
109109
mbedtls_x509_crt *cert;
110110
struct SslCacheEntry *e;
111111
uint32_t i, hash, ticketlen;
112-
LOGF("uncache");
112+
INFOF("uncache");
113113
cache = data;
114114
hash = HashSslSession(session);
115115
i = hash & cache->mask;

‎third_party/mbedtls/ssl_srv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4473,7 +4473,7 @@ int mbedtls_ssl_handshake_server_step( mbedtls_ssl_context *ssl )
44734473
return( ret );
44744474
}
44754475
#endif /* MBEDTLS_SSL_PROTO_DTLS */
4476-
/* LOGF("handshake step %s", GetSslStateName(ssl->state)); */
4476+
/* INFOF("handshake step %s", GetSslStateName(ssl->state)); */
44774477
switch( ssl->state )
44784478
{
44794479
case MBEDTLS_SSL_HELLO_REQUEST:

0 commit comments

Comments
 (0)