wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark all opened files as close-on-exec.

This commit is contained in:
Alex Miller 2019-05-13 16:05:09 -10:00
parent 19165dc873
commit 1f02cd30e2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbrpc/AsyncFileEIO.actor.h
View File

@ -239,7 +239,7 @@ private:
}
static int openFlags(int flags) {
int oflags = 0;
int oflags = O_CLOEXEC;
ASSERT( bool(flags & OPEN_READONLY) != bool(flags & OPEN_READWRITE) ); // readonly xor readwrite
if( flags & OPEN_EXCLUSIVE ) oflags |= O_EXCL;
if( flags & OPEN_CREATE ) oflags |= O_CREAT;

6
fdbrpc/AsyncFileKAIO.actor.h
View File

@ -108,13 +108,13 @@ public:
open_filename = filename + ".part";
}
int fd = ::open( open_filename.c_str(), openFlags(flags) | O_DIRECT, mode );
int fd = ::open( open_filename.c_str(), openFlags(flags), mode );
if (fd<0) {
Error e = errno==ENOENT ? file_not_found() : io_error();
int ecode = errno; // Save errno in case it is modified before it is used below
TraceEvent ev("AsyncFileKAIOOpenFailed");
ev.error(e).detail("Filename", filename).detailf("Flags", "%x", flags)
.detailf("OSFlags", "%x", openFlags(flags) | O_DIRECT).detailf("Mode", "0%o", mode).GetLastError();
.detailf("OSFlags", "%x", openFlags(flags)).detailf("Mode", "0%o", mode).GetLastError();
if(ecode == EINVAL)
ev.detail("Description", "Invalid argument - Does the target filesystem support KAIO?");
return e;
@ -635,7 +635,7 @@ private:
}
static int openFlags(int flags) {
int oflags = 0;
int oflags = O_DIRECT | O_CLOEXEC;
ASSERT( bool(flags & OPEN_READONLY) != bool(flags & OPEN_READWRITE) ); // readonly xor readwrite
if( flags & OPEN_EXCLUSIVE ) oflags |= O_EXCL;
if( flags & OPEN_CREATE ) oflags |= O_CREAT;

2
flow/FileTraceLogWriter.cpp
View File

@ -28,7 +28,7 @@
#define __write ::write
#define __close ::close
#define __fsync ::fsync
#define TRACEFILE_FLAGS O_WRONLY | O_CREAT | O_EXCL
#define TRACEFILE_FLAGS O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC
#define TRACEFILE_MODE 0664
#elif defined(_WIN32)
#include <windows.h>