nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Turn log loop into a for loop, and "Does this lf want this" into a fn

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-10 22:39:55 -04:00
parent 15a318b49a
commit de114587f0
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/log.c
View File

@ -354,6 +354,26 @@ pending_log_message_free(pending_log_message_t *msg)
tor_free(msg);
}
/** Return true iff <b>lf</b> would like to receive a message with the specified
* <b>severity</b> in the specified <b>domain</b>.
*/
static INLINE int
logfile_wants_message(const logfile_t *lf, int severity,
log_domain_mask_t domain)
{
if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) {
return 0;
}
if (! (lf->fd >= 0 || lf->is_syslog || lf->callback)) {
return 0;
}
if (lf->seems_dead) {
return 0;
}
return 1;
}
/** Helper: sends a message to the appropriate logfiles, at loglevel
* <b>severity</b>. If provided, <b>funcname</b> is prepended to the
* message. The actual message is derived as from tor_snprintf(format,ap).
@ -379,20 +399,9 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages))
flush_pending_log_callbacks();
lf = logfiles;
while (lf) {
if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) {
lf = lf->next;
for (lf = logfiles; lf; lf = lf->next) {
if (! logfile_wants_message(lf, severity, domain))
continue;
}
if (! (lf->fd >= 0 || lf->is_syslog || lf->callback)) {
lf = lf->next;
continue;
}
if (lf->seems_dead) {
lf = lf->next;
continue;
}
if (!formatted) {
end_of_prefix =
@ -421,7 +430,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
}
#endif
#endif
lf = lf->next;
continue;
} else if (lf->callback) {
if (domain & LD_NOCB) {
@ -433,7 +441,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
} else {
lf->callback(severity, domain, end_of_prefix);
}
lf = lf->next;
continue;
}
if (write_all(lf->fd, buf, msg_len, 0) < 0) { /* error */
@ -441,7 +448,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
* continue. */
lf->seems_dead = 1;
}
lf = lf->next;
}
UNLOCK_LOGS();
}