Skip to content

Close FD gap in [1024, 32768) #20

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

Closed
minhsun-c wants to merge 1 commit into from
+19 −12
Closed

Close FD gap in [1024, 32768) #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/fd-table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ struct kbox_sysnrs; /* forward declaration */

#define KBOX_FD_BASE 32768
#define KBOX_FD_TABLE_MAX 4096
/* redirect slots for FDs 0..1023 (dup2 targets) */
#define KBOX_LOW_FD_MAX 1024
/* redirect slots for FDs 0..32767 (dup2 targets) */
#define KBOX_LOW_FD_MAX 32768
#define KBOX_FD_TABLE_CAPACITY (KBOX_FD_TABLE_MAX + KBOX_LOW_FD_MAX)

struct kbox_fd_entry {
Expand Down
27 changes: 17 additions & 10 deletions tests/unit/test-fd-table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ static void test_fd_table_out_of_range(void)
{
struct kbox_fd_table t;
kbox_fd_table_init(&t);
/* Gap between low_fds and high range */
ASSERT_EQ(kbox_fd_table_get_lkl(&t, KBOX_LOW_FD_MAX), -1);
ASSERT_EQ(kbox_fd_table_get_lkl(&t, KBOX_FD_BASE - 1), -1);
/* Under range */
ASSERT_EQ(kbox_fd_table_get_lkl(&t, -1), -1);
/* Above range */
ASSERT_EQ(kbox_fd_table_get_lkl(&t, KBOX_FD_BASE + KBOX_FD_TABLE_MAX), -1);
}
Expand All @@ -116,15 +115,23 @@ static void test_fd_table_insert_at_low_range(void)
ASSERT_EQ(rc, 0);
ASSERT_EQ(kbox_fd_table_get_lkl(&t, 100), 55);

/* Boundary: FD 1023 (last valid low slot) */
rc = kbox_fd_table_insert_at(&t, KBOX_LOW_FD_MAX - 1, 77, 1);
/* Mid-range: FD 1023 */
rc = kbox_fd_table_insert_at(&t, 1023, 77, 1);
ASSERT_EQ(rc, 0);
ASSERT_EQ(kbox_fd_table_get_lkl(&t, KBOX_LOW_FD_MAX - 1), 77);
ASSERT_TRUE(kbox_fd_table_mirror_tty(&t, KBOX_LOW_FD_MAX - 1));
ASSERT_EQ(kbox_fd_table_get_lkl(&t, 1023), 77);
ASSERT_TRUE(kbox_fd_table_mirror_tty(&t, 1023));

/* Gap: FD 1024 should fail */
rc = kbox_fd_table_insert_at(&t, KBOX_LOW_FD_MAX, 66, 0);
ASSERT_EQ(rc, -1);
/* Mid-range: FD 10000 */
rc = kbox_fd_table_insert_at(&t, 10000, 33, 1);
ASSERT_EQ(rc, 0);
ASSERT_EQ(kbox_fd_table_get_lkl(&t, 10000), 33);
ASSERT_TRUE(kbox_fd_table_mirror_tty(&t, 10000));

/* Boundary: FD 32767 (the last low-range slot) */
rc = kbox_fd_table_insert_at(&t, KBOX_LOW_FD_MAX - 1, 66, 0);
ASSERT_EQ(rc, 0);
ASSERT_EQ(kbox_fd_table_get_lkl(&t, KBOX_LOW_FD_MAX - 1), 66);
ASSERT_TRUE(!kbox_fd_table_mirror_tty(&t, KBOX_LOW_FD_MAX - 1));

/* Low-range remove */
long old = kbox_fd_table_remove(&t, 100);
Expand Down
Loading