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/debug.c b/src/debug.c
index 7f004df..53f98ce 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -320,7 +320,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
exit(code);
return 1;
}
@@ -333,7 +333,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
BUG_ON(one > zero);
return 1;
}
@@ -356,7 +356,7 @@
if (!fdtab[fd].owner)
return cli_msg(appctx, LOG_INFO, "File descriptor was already closed.\n");
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
fd_delete(fd);
return 1;
}
@@ -369,7 +369,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
usleep((long)delay * 1000);
return 1;
}
@@ -382,7 +382,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
chunk_reset(&trash);
for (arg = 3; *args[arg]; arg++) {
if (arg > 3)
@@ -403,7 +403,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
gettimeofday(&curr, NULL);
tv_ms_add(&deadline, &curr, loop);
@@ -419,7 +419,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
ha_panic();
return 1;
}
@@ -435,7 +435,7 @@
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
chunk_reset(&trash);
for (arg = 3; *args[arg]; arg++) {
if (arg > 3)
@@ -515,7 +515,7 @@
if (!start)
return cli_err(appctx, "Will not dump from NULL address.\n");
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
/* by default, dump ~128 till next block of 16 */
len = strtoul(args[4], NULL, 0);
@@ -546,7 +546,7 @@
if (*args[4])
sig = atoi(args[4]);
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
if (thr)
ha_tkill(thr - 1, sig);
else
@@ -566,7 +566,7 @@
if (len >= trash.size)
return cli_err(appctx, "Output too large, must be <tune.bufsize.\n");
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
chunk_reset(&trash);
trash.data = len;
@@ -612,7 +612,7 @@
);
}
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
for (arg = 3; *args[arg]; arg++) {
old = 0;
end = word = args[arg];
@@ -809,7 +809,7 @@
mode = strcmp(args[3], "task") == 0;
- _HA_ATOMIC_ADD(&debug_commands_issued, 1);
+ _HA_ATOMIC_INC(&debug_commands_issued);
for (arg = 4; *args[arg]; arg++) {
end = word = args[arg];
while (*end && *end != '=' && *end != '^' && *end != '+' && *end != '-')