CLEANUP: atomic/tree-wide: replace single increments/decrements with inc/dec
This patch replaces roughly all occurrences of an HA_ATOMIC_ADD(&foo, 1)
or HA_ATOMIC_SUB(&foo, 1) with the equivalent HA_ATOMIC_INC(&foo) and
HA_ATOMIC_DEC(&foo) respectively. These are 507 changes over 45 files.
diff --git a/src/log.c b/src/log.c
index 3db78bd..2931ee9 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1918,7 +1918,7 @@
static char once;
if (errno == EAGAIN)
- _HA_ATOMIC_ADD(&dropped_logs, 1);
+ _HA_ATOMIC_INC(&dropped_logs);
else if (!once) {
once = 1; /* note: no need for atomic ops here */
ha_alert("sendmsg()/writev() failed in logger #%d: %s (errno=%d)\n",
@@ -3276,7 +3276,7 @@
size = build_logline(s, logline, global.max_syslog_len, &sess->fe->logformat);
if (size > 0) {
- _HA_ATOMIC_ADD(&sess->fe->log_count, 1);
+ _HA_ATOMIC_INC(&sess->fe->log_count);
__send_log(&sess->fe->logsrvs, &sess->fe->log_tag, level,
logline, size + 1, logline_rfc5424, sd_size);
s->logs.logwait = 0;
@@ -3315,7 +3315,7 @@
size = sess_build_logline(sess, NULL, logline, global.max_syslog_len, &sess->fe->logformat);
if (size > 0) {
- _HA_ATOMIC_ADD(&sess->fe->log_count, 1);
+ _HA_ATOMIC_INC(&sess->fe->log_count);
__send_log(&sess->fe->logsrvs, &sess->fe->log_tag, level,
logline, size + 1, logline_rfc5424, sd_size);
}
@@ -3704,7 +3704,7 @@
buf->data = ret;
/* update counters */
- _HA_ATOMIC_ADD(&cum_log_messages, 1);
+ _HA_ATOMIC_INC(&cum_log_messages);
proxy_inc_fe_req_ctr(l, l->bind_conf->frontend);
parse_log_message(buf->area, buf->data, &level, &facility, metadata, &message, &size);
@@ -3811,7 +3811,7 @@
co_skip(si_oc(si), to_skip);
/* update counters */
- _HA_ATOMIC_ADD(&cum_log_messages, 1);
+ _HA_ATOMIC_INC(&cum_log_messages);
proxy_inc_fe_req_ctr(l, frontend);
parse_log_message(buf->area, buf->data, &level, &facility, metadata, &message, &size);
@@ -3834,15 +3834,15 @@
parse_error:
if (l->counters)
- _HA_ATOMIC_ADD(&l->counters->failed_req, 1);
- _HA_ATOMIC_ADD(&frontend->fe_counters.failed_req, 1);
+ _HA_ATOMIC_INC(&l->counters->failed_req);
+ _HA_ATOMIC_INC(&frontend->fe_counters.failed_req);
goto close;
cli_abort:
if (l->counters)
- _HA_ATOMIC_ADD(&l->counters->cli_aborts, 1);
- _HA_ATOMIC_ADD(&frontend->fe_counters.cli_aborts, 1);
+ _HA_ATOMIC_INC(&l->counters->cli_aborts);
+ _HA_ATOMIC_INC(&frontend->fe_counters.cli_aborts);
close:
si_shutw(si);