diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-02-23 22:48:11 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-03-08 17:46:07 +0900 |
| commit | e85bffc32473968b2e3736ad712f5e0d6e9aebc9 (patch) | |
| tree | 140ad95036c8a16672522f1a63b7160b105c9004 | |
| parent | b7d4dcf3a6a741ba85119b45a786a55e70bb910e (diff) | |
Increment global variables atomically
| -rw-r--r-- | win32/win32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/win32.c b/win32/win32.c index e2d4cceeb3..940a85a4de 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2346,7 +2346,7 @@ ruby_direct_conv(const WCHAR *file, const WCHAR *alt, struct direct *entry, cons static struct direct * readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, const WCHAR *, struct direct *, const void *), const void *enc) { - static int dummy = 0; + static long dummy_ino = 0; if (dirp->curr) { @@ -2364,7 +2364,7 @@ readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, const WCHAR *, struct di // // Fake inode // - dirp->dirstr.d_ino = dummy++; + dirp->dirstr.d_ino = (ino_t)(InterlockedIncrement(&dummy_ino) - 1); // // Attributes @@ -6497,7 +6497,7 @@ rb_w32_fclose(FILE *fp) int rb_w32_pipe(int fds[2]) { - static DWORD serial = 0; + static long serial = 0; static const char prefix[] = "\\\\.\\pipe\\ruby"; enum { width_of_prefix = (int)sizeof(prefix) - 1, @@ -6513,7 +6513,7 @@ rb_w32_pipe(int fds[2]) memcpy(name, prefix, width_of_prefix); snprintf(name + width_of_prefix, width_of_ids, "%.*"PRI_PIDT_PREFIX"x-%.*lx", - width_of_pid, rb_w32_getpid(), width_of_serial, serial++); + width_of_pid, rb_w32_getpid(), width_of_serial, InterlockedIncrement(&serial)-1); sec.nLength = sizeof(sec); sec.lpSecurityDescriptor = NULL; |