Update scripts to use `increment` (#1905)
* Replace boilerplate for increment with a call to `increment`
from new tooling. Found cases to replace using `ripgrep`[1]:
```
$ rg '\(\*\w+\)\s*\+\+' -l | grep tools | grep -v old
```
[1]: https://github.com/BurntSushi/ripgrep
* Replace boilerplate for bigger than 1 increments with the new
`increment` call
from new tooling. Found cases to replace using `ripgrep`[1]:
```
$ rg '\(\*\w+\)\s*\+=' -l | grep tools | grep -v old
```
[1]: https://github.com/BurntSushi/ripgrep
* Update examples indicating the alternative increment call for hash tables
diff --git a/tools/tcptop.py b/tools/tcptop.py
index 43666fb..a90b267 100755
--- a/tools/tcptop.py
+++ b/tools/tcptop.py
@@ -104,7 +104,6 @@
u32 pid = bpf_get_current_pid_tgid();
FILTER
u16 dport = 0, family = sk->__sk_common.skc_family;
- u64 *val, zero = 0;
if (family == AF_INET) {
struct ipv4_key_t ipv4_key = {.pid = pid};
@@ -113,8 +112,7 @@
ipv4_key.lport = sk->__sk_common.skc_num;
dport = sk->__sk_common.skc_dport;
ipv4_key.dport = ntohs(dport);
- val = ipv4_send_bytes.lookup_or_init(&ipv4_key, &zero);
- (*val) += size;
+ ipv4_send_bytes.increment(ipv4_key, size);
} else if (family == AF_INET6) {
struct ipv6_key_t ipv6_key = {.pid = pid};
@@ -126,8 +124,8 @@
ipv6_key.lport = sk->__sk_common.skc_num;
dport = sk->__sk_common.skc_dport;
ipv6_key.dport = ntohs(dport);
- val = ipv6_send_bytes.lookup_or_init(&ipv6_key, &zero);
- (*val) += size;
+ ipv6_send_bytes.increment(ipv6_key, size);
+
}
// else drop
@@ -157,8 +155,8 @@
ipv4_key.lport = sk->__sk_common.skc_num;
dport = sk->__sk_common.skc_dport;
ipv4_key.dport = ntohs(dport);
- val = ipv4_recv_bytes.lookup_or_init(&ipv4_key, &zero);
- (*val) += copied;
+ ipv4_recv_bytes.increment(ipv4_key, copied);
+
} else if (family == AF_INET6) {
struct ipv6_key_t ipv6_key = {.pid = pid};
@@ -169,8 +167,7 @@
ipv6_key.lport = sk->__sk_common.skc_num;
dport = sk->__sk_common.skc_dport;
ipv6_key.dport = ntohs(dport);
- val = ipv6_recv_bytes.lookup_or_init(&ipv6_key, &zero);
- (*val) += copied;
+ ipv6_recv_bytes.increment(ipv6_key, copied);
}
// else drop