mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-16 18:09:58 -04:00
Put the process's OS handle count on the sizes line and add a handle census by kind behind NX2NAVI_HANDLE_CENSUS.
A session of 2026-11-13 grew from 683 to 1095 OS handles in 11 minutes, rising at every area load and never falling,
while the guest's own handles stayed at 116-122 and the threads flat; the VMA block count fell back while the handle
count did not. The log could not show it: the 600-frame "mem: sizes" line had only the guest's handles, and nothing
told which kind of handle grows.
kernel.c kern_sizes now adds "process handles" (plat_handle_count, one system call every 600 frames under trace=perf)
beside the guest's "handles". platform.h gets plat_handle_census: on Windows the system's extended handle table
filtered by our process id, with the type names from NtQueryObject's ObjectTypesInformation; on Linux the
/proc/self/fd links grouped by kind. It never opens, duplicates or names a handle (a name query can block on a pipe).
With NX2NAVI_HANDLE_CENSUS=1 (default 0, read at start) and trace=perf, perf.c starts one long-lived thread that the
600-frame report wakes; when the count grew by 16 or more since its last census it logs "mem: handles frame N: T in
all (+D since the last census): Event a (+x), ...". The census reads a few MiB of the system's table in 2-5 ms, off
the drawing threads; one thread for the run keeps a new thread's own handle out of what it counts. New cfg rows:
HANDLE_CENSUS in known[], sections[] (diagnostics) and metas[] ("0", "0|1", restart), and an nx2navi.ini.example
entry.
New tests/handle_census_check.py builds the platform layer alone: 20 events and 5 sections show as Event +20 and
Section +5, the total stays within 2 of GetProcessHandleCount, the figures return once they are closed, and kinds
past the room given go into the last entry; docs/building.md describes it. Not reproduced before the change (the
growth needs a game run). handle_census_check, sync_wake_check and the cfg row check pass; every runtime file compiles
with the dev flags, and perf.c, kernel.c, win32.c and cfg.c add no -Wall -Wextra warnings.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2257,6 +2257,47 @@ uint32_t plat_handle_count(void) {
|
||||
return n ? n - 1 : 0; // less the descriptor of this walk
|
||||
}
|
||||
|
||||
// plat_handle_census: each descriptor's link, by kind: "socket:[N]" and "pipe:[N]" by their prefix, an anonymous
|
||||
// inode by its kind ("anon_inode:[eventfd]" is eventfd), a device by its /dev folder, any other path as file.
|
||||
int plat_handle_census(PlatHandleKind *out, int max) {
|
||||
DIR *d = max > 0 ? opendir("/proc/self/fd") : NULL;
|
||||
if (!d) return -1;
|
||||
int n = 0, self = dirfd(d);
|
||||
for (struct dirent *e; (e = readdir(d));) {
|
||||
if (e->d_name[0] == '.' || atoi(e->d_name) == self) continue;
|
||||
char link[64], target[256], kind[32];
|
||||
snprintf(link, sizeof link, "/proc/self/fd/%s", e->d_name);
|
||||
ssize_t len = readlink(link, target, sizeof target - 1);
|
||||
if (len < 0) continue; // closed meanwhile
|
||||
target[len] = 0;
|
||||
if (!strncmp(target, "/dev/", 5)) {
|
||||
size_t k = strcspn(target + 5, "/");
|
||||
snprintf(kind, sizeof kind, "/dev/%.*s", (int)(k < 20 ? k : 20), target + 5);
|
||||
} else if (target[0] == '/') {
|
||||
snprintf(kind, sizeof kind, "%s", "file");
|
||||
} else if (!strncmp(target, "anon_inode:", 11)) {
|
||||
const char *k = target + 11 + (target[11] == '[');
|
||||
snprintf(kind, sizeof kind, "%.*s", (int)strcspn(k, "]"), k);
|
||||
} else {
|
||||
snprintf(kind, sizeof kind, "%.*s", (int)strcspn(target, ":"), target);
|
||||
}
|
||||
int i = 0;
|
||||
while (i < n && strcmp(out[i].name, kind)) i++;
|
||||
if (i == n) {
|
||||
if (n == max) { // no room: the last entry takes the rest
|
||||
i = max - 1;
|
||||
snprintf(out[i].name, sizeof out[i].name, "%s", "(more kinds)");
|
||||
} else {
|
||||
snprintf(out[n].name, sizeof out[n].name, "%s", kind);
|
||||
out[n++].n = 0;
|
||||
}
|
||||
}
|
||||
out[i].n++;
|
||||
}
|
||||
closedir(d);
|
||||
return n;
|
||||
}
|
||||
|
||||
// glibc's mallinfo2 (2.33 and later) sums every arena: arena is what the arenas took with brk and mmap, hblkhd the
|
||||
// blocks mmapped one by one, uordblks what the arenas handed out. Other C libraries leave the figures unknown.
|
||||
void plat_heap_info(PlatHeapInfo *h) {
|
||||
|
||||
Reference in New Issue
Block a user