summaryrefslogtreecommitdiff
path: root/win32/file.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-02-24 18:05:36 +0000
committerEric Wong <normal@ruby-lang.org>2023-02-26 20:39:41 +0000
commit35136e1e9c232ad7a03407b992b2e86b6df43f63 (patch)
tree2c60e2d5c9a10089badd41d0f696fe41e70f4a1a /win32/file.c
parent6e6992e5db49a238baf290d9b9b521f6b6be5a19 (diff)
reuse open(2) from rb_file_load_ok on POSIX-like system
When loading Ruby source files, we can save the result of successful opens as open(2)/openat(2) are a fairly expensive syscalls. This also avoids a time-of-check-to-time-of-use (TOCTTOU) problem. This reduces open(2) syscalls during `require'; but should be most apparent when users have a small $LOAD_PATH. Users with large $LOAD_PATH will benefit less since there'll be more open(2) failures due to ENOENT. With `strace -c -e openat ruby -e exit' under Linux, this results in a ~14% reduction of openat(2) syscalls (glibc uses openat(2) to implement open(2)). % time seconds usecs/call calls errors syscall ------ ----------- ----------- --------- --------- ---------------- 0.00 0.000000 0 296 110 openat 0.00 0.000000 0 254 110 openat Additionally, the introduction of `struct ruby_file_load_state' may make future optimizations more apparent. This change cannot benefit binary (.so) loading since the dlopen(3) API requires a filename and I'm not aware of an alternative that takes a pre-existing FD. In typical situations, Ruby source files outnumber the mount of .so files.
Diffstat (limited to 'win32/file.c')
-rw-r--r--win32/file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/file.c b/win32/file.c
index 31cc1aff6e..3132bf41a4 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -10,6 +10,7 @@
#include <wchar.h>
#include <shlwapi.h>
#include "win32/file.h"
+#include "internal/file.h"
#ifndef INVALID_FILE_ATTRIBUTES
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
@@ -592,8 +593,9 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
return result;
}
+/* TODO: using @fls is an exercise for a win32 hacker */
int
-rb_file_load_ok(const char *path)
+rb_file_load_ok(const char *path, struct ruby_file_load_state *fls)
{
DWORD attr;
int ret = 1;