projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds writer test case for RCU
[folly.git]
/
folly
/
File.cpp
diff --git
a/folly/File.cpp
b/folly/File.cpp
index 3c53573355fc6a9d2dec13e50d36a323d83680e2..2fa8e2b77e93b0747b01226ca04e69a45cdde151 100644
(file)
--- a/
folly/File.cpp
+++ b/
folly/File.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
5
Facebook, Inc.
+ * Copyright 201
3-present
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,14
+16,14
@@
#include <folly/File.h>
#include <folly/File.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/file.h>
#include <folly/Exception.h>
#include <folly/FileUtil.h>
#include <folly/Format.h>
#include <folly/ScopeGuard.h>
#include <folly/Exception.h>
#include <folly/FileUtil.h>
#include <folly/Format.h>
#include <folly/ScopeGuard.h>
+#include <folly/portability/Fcntl.h>
+#include <folly/portability/SysFile.h>
+#include <folly/portability/Unistd.h>
#include <system_error>
#include <system_error>
@@
-31,14
+31,9
@@
namespace folly {
namespace folly {
-File::File()
- : fd_(-1)
- , ownsFd_(false)
-{}
+File::File() noexcept : fd_(-1), ownsFd_(false) {}
-File::File(int fd, bool ownsFd)
- : fd_(fd)
- , ownsFd_(ownsFd) {
+File::File(int fd, bool ownsFd) noexcept : fd_(fd), ownsFd_(ownsFd) {
CHECK_GE(fd, -1) << "fd must be -1 or non-negative";
CHECK(fd != -1 || !ownsFd) << "cannot own -1";
}
CHECK_GE(fd, -1) << "fd must be -1 or non-negative";
CHECK(fd != -1 || !ownsFd) << "cannot own -1";
}
@@
-143,7
+138,9
@@
void File::doLock(int op) {
bool File::doTryLock(int op) {
int r = flockNoInt(fd_, op | LOCK_NB);
// flock returns EWOULDBLOCK if already locked
bool File::doTryLock(int op) {
int r = flockNoInt(fd_, op | LOCK_NB);
// flock returns EWOULDBLOCK if already locked
- if (r == -1 && errno == EWOULDBLOCK) return false;
+ if (r == -1 && errno == EWOULDBLOCK) {
+ return false;
+ }
checkUnixError(r, "flock() failed (try_lock)");
return true;
}
checkUnixError(r, "flock() failed (try_lock)");
return true;
}
@@
-153,4
+150,4
@@
void File::unlock() {
}
void File::unlock_shared() { unlock(); }
}
void File::unlock_shared() { unlock(); }
-}
// namespace folly
+} // namespace folly