Skip to content

Catch fd leaks in all tests #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haesbaert merged 3 commits into from
Apr 2, 2025
Merged

Catch fd leaks in all tests #142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb614ca
Catch fd leaks in all tests
haesbaert Apr 1, 2025
94488d5
Update quark-test.c
haesbaert Apr 2, 2025
445b5cc
Update quark-test.c
haesbaert Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 72 additions & 4 deletions quark-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <arpa/inet.h>

#include <assert.h>
#include <dirent.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
Expand Down Expand Up @@ -188,6 +189,59 @@ sproc_self_namespace(const char *path)
return (v);
}

static int
num_open_fd(void)
{
DIR *dirp;
struct dirent *d;
int n;

if ((dirp = opendir("/proc/self/fd")) == NULL)
err(1, "opendir");

for (n = 0; (d = readdir(dirp)) != NULL;) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
n++;
}
/* Has to be at least one, since opendir does open */
assert(n >= 1);
closedir(dirp);

/* Discount the FD from dirp */
return (n - 1);
}

static void
dump_open_fd(FILE *f)
{
int dfd;
DIR *dirp;
struct dirent *d;
ssize_t n;
char self[512], buf[512];

if ((dfd = open("/proc/self/fd", O_DIRECTORY)) == -1)
err(1, "open /proc/self/fd");
if ((dirp = fdopendir(dfd)) == NULL)
err(1, "fdopendir");

snprintf(self, sizeof(self), "/proc/%d/fd", getpid());
for (n = 0; (d = readdir(dirp)) != NULL;) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
n = qreadlinkat(dfd, d->d_name, buf, sizeof(buf));
if (n == -1)
err(1, "qreadlinkat");
if (!strcmp(buf, self))
continue;
fprintf(f, "%s -> %s\n", d->d_name, buf);
}

closedir(dirp); /* closes dfd */
fflush(f);
}

struct test {
char *name;
int (*func)(const struct test *, struct quark_queue_attr *);
Expand Down Expand Up @@ -887,8 +941,7 @@ static int
run_test(const struct test *t, struct quark_queue_attr *qa)
{
pid_t child;
int status, x, linepos;
int be;
int status, x, linepos, be, nfd, r;
int child_stderr[2];
FILE *child_stream;
char *child_buf;
Expand Down Expand Up @@ -934,7 +987,23 @@ run_test(const struct test *t, struct quark_queue_attr *qa)
dup2(child_stderr[1], STDERR_FILENO);
close(child_stderr[1]);
close(child_stderr[0]);
exit(t->func(t, qa));

/*
* Check for FD leaks
*/
nfd = num_open_fd();
assert(nfd == 3);
r = t->func(t, qa);
nfd = num_open_fd();
if (nfd != 3) {
fprintf(stderr,
"FDLEAK DETECTED! %d opened descriptors, expected 3\n",
nfd);
dump_open_fd(stderr);
if (r == 0)
r = 1;
}
exit(r);
}
close(child_stderr[1]);

Expand All @@ -953,7 +1022,6 @@ run_test(const struct test *t, struct quark_queue_attr *qa)
for (;;) {
fd_set rfds;
struct timeval tv;
int r;
char buf[4096];

spin();
Expand Down