From baf281aa618bbb9d1de0b9d2b4cb9e28a3cadedc Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 28 Mar 2023 16:44:54 -0400
Subject: [PATCH] strace: Fix names of hardcoded syscall lists.

Before this commit, specifying %memory or %network just crashed strace.
I guess this was never tested?
---
 src/bin/debug/strace/strace.cpp | 72 ++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/bin/debug/strace/strace.cpp b/src/bin/debug/strace/strace.cpp
index 446b003495..20367c80bb 100644
--- a/src/bin/debug/strace/strace.cpp
+++ b/src/bin/debug/strace/strace.cpp
@@ -695,43 +695,43 @@ main(int argc, const char *const *argv)
 							tok++;
 							// the following should be metadata in kernel/syscalls.h
 							if (strcmp(tok, "memory") == 0) {
-								sSyscallMap["clone_area"]->EnableTracing(true);
-								sSyscallMap["create_area"]->EnableTracing(true);
-								sSyscallMap["delete_area"]->EnableTracing(true);
-								sSyscallMap["find_area"]->EnableTracing(true);
-								sSyscallMap["resize_area"]->EnableTracing(true);
-								sSyscallMap["transfer_area"]->EnableTracing(true);
-								sSyscallMap["mlock"]->EnableTracing(true);
-								sSyscallMap["munlock"]->EnableTracing(true);
-								sSyscallMap["set_memory_protection"]->EnableTracing(true);
-								sSyscallMap["get_memory_properties"]->EnableTracing(true);
-								sSyscallMap["sync_memory"]->EnableTracing(true);
-								sSyscallMap["unmap_memory"]->EnableTracing(true);
-								sSyscallMap["memory_advice"]->EnableTracing(true);
-								sSyscallMap["reserve_address_range"]->EnableTracing(true);
-								sSyscallMap["unreserve_address_range"]->EnableTracing(true);
-								sSyscallMap["set_area_protection"]->EnableTracing(true);
-								sSyscallMap["map_file"]->EnableTracing(true);
+								sSyscallMap["_kern_clone_area"]->EnableTracing(true);
+								sSyscallMap["_kern_create_area"]->EnableTracing(true);
+								sSyscallMap["_kern_delete_area"]->EnableTracing(true);
+								sSyscallMap["_kern_find_area"]->EnableTracing(true);
+								sSyscallMap["_kern_resize_area"]->EnableTracing(true);
+								sSyscallMap["_kern_transfer_area"]->EnableTracing(true);
+								sSyscallMap["_kern_mlock"]->EnableTracing(true);
+								sSyscallMap["_kern_munlock"]->EnableTracing(true);
+								sSyscallMap["_kern_set_memory_protection"]->EnableTracing(true);
+								sSyscallMap["_kern_get_memory_properties"]->EnableTracing(true);
+								sSyscallMap["_kern_sync_memory"]->EnableTracing(true);
+								sSyscallMap["_kern_unmap_memory"]->EnableTracing(true);
+								sSyscallMap["_kern_memory_advice"]->EnableTracing(true);
+								sSyscallMap["_kern_reserve_address_range"]->EnableTracing(true);
+								sSyscallMap["_kern_unreserve_address_range"]->EnableTracing(true);
+								sSyscallMap["_kern_set_area_protection"]->EnableTracing(true);
+								sSyscallMap["_kern_map_file"]->EnableTracing(true);
 							} else if (strcmp(tok, "network") == 0 || strcmp(tok, "net") == 0) {
-								sSyscallMap["socket"]->EnableTracing(true);
-								sSyscallMap["bind"]->EnableTracing(true);
-								sSyscallMap["shutdown_socket"]->EnableTracing(true);
-								sSyscallMap["connect"]->EnableTracing(true);
-								sSyscallMap["listen"]->EnableTracing(true);
-								sSyscallMap["accept"]->EnableTracing(true);
-								sSyscallMap["recv"]->EnableTracing(true);
-								sSyscallMap["recvfrom"]->EnableTracing(true);
-								sSyscallMap["recvmsg"]->EnableTracing(true);
-								sSyscallMap["send"]->EnableTracing(true);
-								sSyscallMap["sendto"]->EnableTracing(true);
-								sSyscallMap["sendmsg"]->EnableTracing(true);
-								sSyscallMap["getsockopt"]->EnableTracing(true);
-								sSyscallMap["setsockopt"]->EnableTracing(true);
-								sSyscallMap["getpeername"]->EnableTracing(true);
-								sSyscallMap["getsockname"]->EnableTracing(true);
-								sSyscallMap["sockatmark"]->EnableTracing(true);
-								sSyscallMap["socketpair"]->EnableTracing(true);
-								sSyscallMap["get_next_socket_stat"]->EnableTracing(true);
+								sSyscallMap["_kern_socket"]->EnableTracing(true);
+								sSyscallMap["_kern_bind"]->EnableTracing(true);
+								sSyscallMap["_kern_shutdown_socket"]->EnableTracing(true);
+								sSyscallMap["_kern_connect"]->EnableTracing(true);
+								sSyscallMap["_kern_listen"]->EnableTracing(true);
+								sSyscallMap["_kern_accept"]->EnableTracing(true);
+								sSyscallMap["_kern_recv"]->EnableTracing(true);
+								sSyscallMap["_kern_recvfrom"]->EnableTracing(true);
+								sSyscallMap["_kern_recvmsg"]->EnableTracing(true);
+								sSyscallMap["_kern_send"]->EnableTracing(true);
+								sSyscallMap["_kern_sendto"]->EnableTracing(true);
+								sSyscallMap["_kern_sendmsg"]->EnableTracing(true);
+								sSyscallMap["_kern_getsockopt"]->EnableTracing(true);
+								sSyscallMap["_kern_setsockopt"]->EnableTracing(true);
+								sSyscallMap["_kern_getpeername"]->EnableTracing(true);
+								sSyscallMap["_kern_getsockname"]->EnableTracing(true);
+								sSyscallMap["_kern_sockatmark"]->EnableTracing(true);
+								sSyscallMap["_kern_socketpair"]->EnableTracing(true);
+								sSyscallMap["_kern_get_next_socket_stat"]->EnableTracing(true);
 							} else
 								print_usage_and_exit(true);
 						} else {