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/dns.c b/src/dns.c
index 19915cc..5e991fe 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -298,7 +298,7 @@
*/
if (unlikely(ofs == ~0)) {
ofs = 0;
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
}
@@ -307,7 +307,7 @@
*/
ofs -= ring->ofs;
BUG_ON(ofs >= buf->size);
- HA_ATOMIC_SUB(b_peek(buf, ofs), 1);
+ HA_ATOMIC_DEC(b_peek(buf, ofs));
while (ofs + 1 < b_data(buf)) {
int ret;
@@ -348,7 +348,7 @@
out:
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
ns->dgram->ofs_req = ofs;
HA_RWLOCK_RDUNLOCK(DNS_LOCK, &ring->lock);
@@ -464,7 +464,7 @@
if (unlikely(ofs == ~0)) {
ofs = 0;
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
}
@@ -478,7 +478,7 @@
*/
ofs -= ring->ofs;
BUG_ON(ofs >= buf->size);
- HA_ATOMIC_SUB(b_peek(buf, ofs), 1);
+ HA_ATOMIC_DEC(b_peek(buf, ofs));
ret = 1;
while (ofs + 1 < b_data(buf)) {
@@ -604,7 +604,7 @@
ofs += cnt + msg_len;
}
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
ds->ofs = ofs;
}
@@ -1084,7 +1084,7 @@
*/
if (unlikely(ofs == ~0)) {
ofs = 0;
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
}
@@ -1093,7 +1093,7 @@
*/
ofs -= ring->ofs;
BUG_ON(ofs >= buf->size);
- HA_ATOMIC_SUB(b_peek(buf, ofs), 1);
+ HA_ATOMIC_DEC(b_peek(buf, ofs));
while (ofs + 1 < b_data(buf)) {
struct ist myist;
@@ -1179,7 +1179,7 @@
ofs += cnt + len;
}
- HA_ATOMIC_ADD(b_peek(buf, ofs), 1);
+ HA_ATOMIC_INC(b_peek(buf, ofs));
ofs += ring->ofs;
dss->ofs_req = ofs;
HA_RWLOCK_RDUNLOCK(DNS_LOCK, &ring->lock);