Skip to content
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.

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

File permission transfer #155

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ cmake_minimum_required(VERSION 3.2)
# There is no C per se in WDT but if you use CXX only here many checks fail
# Version is Major.Minor.YYMMDDX for up to 10 releases per day (X from 0 to 9)
# Minor currently is also the protocol version - has to match with Protocol.cpp
project("WDT" LANGUAGES C CXX VERSION 1.31.1703310)

project("WDT" LANGUAGES C CXX VERSION 1.31.1704270)

# On MacOS this requires the latest (master) CMake (and/or CMake 3.1.1/3.2)
# WDT itself works fine with C++11 (gcc 4.8 for instance) but more recent folly
Expand Down
2 changes: 1 addition & 1 deletion ErrorCodes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/ErrorCodes.h>
#include <folly/Conv.h>
#include <string.h>
#include <wdt/ErrorCodes.h>

DEFINE_int32(wdt_double_precision, 2, "Precision while printing double");

Expand Down
2 changes: 1 addition & 1 deletion ReceiverThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/ReceiverThread.h>
#include <folly/Bits.h>
#include <folly/Checksum.h>
#include <folly/Conv.h>
#include <folly/Memory.h>
#include <folly/ScopeGuard.h>
#include <folly/String.h>
#include <wdt/ReceiverThread.h>
#include <wdt/util/FileWriter.h>

namespace facebook {
Expand Down
2 changes: 1 addition & 1 deletion Reporting.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/Reporting.h>
#include <folly/String.h>
#include <wdt/Protocol.h>
#include <wdt/Reporting.h>
#include <wdt/WdtOptions.h>

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion SenderThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/SenderThread.h>
#include <folly/Bits.h>
#include <folly/Checksum.h>
#include <folly/Conv.h>
#include <folly/Memory.h>
#include <folly/String.h>
#include <sys/stat.h>
#include <wdt/Sender.h>
#include <wdt/SenderThread.h>
#include <wdt/util/ClientSocket.h>

namespace facebook {
Expand Down
2 changes: 1 addition & 1 deletion Throttler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/ErrorCodes.h>
#include <wdt/Throttler.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one too

#include <wdt/ErrorCodes.h>
#include <wdt/WdtOptions.h>

namespace facebook {
Expand Down
4 changes: 2 additions & 2 deletions WdtConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#define WDT_VERSION_MAJOR 1
#define WDT_VERSION_MINOR 31
#define WDT_VERSION_BUILD 1703310
#define WDT_VERSION_BUILD 1704270
// Add -fbcode to version str
#define WDT_VERSION_STR "1.31.1703310-fbcode"
#define WDT_VERSION_STR "1.31.1704270-fbcode"
// Tie minor and proto version
#define WDT_PROTOCOL_VERSION WDT_VERSION_MINOR

Expand Down
2 changes: 1 addition & 1 deletion WdtOptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <glog/logging.h>
#include <wdt/WdtOptions.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another

#include <glog/logging.h>

namespace facebook {
namespace wdt {
Expand Down
2 changes: 1 addition & 1 deletion WdtTransferRequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/WdtTransferRequest.h>
#include <folly/Conv.h>
#include <folly/Range.h>
#include <wdt/WdtTransferRequest.h>
#include <ctime>

using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion util/ClientSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/Reporting.h>
#include <wdt/util/ClientSocket.h>
#include <wdt/Reporting.h>

#include <fcntl.h>
#include <glog/logging.h>
Expand Down
2 changes: 1 addition & 1 deletion util/EncryptionUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/util/EncryptionUtils.h>
#include <folly/Conv.h>
#include <folly/SpinLock.h>
#include <folly/String.h> // for humanify
#include <wdt/WdtTransferRequest.h> // for to/fromHex utils
#include <wdt/util/EncryptionUtils.h>

#include <openssl/crypto.h>
#include <openssl/rand.h>
Expand Down
2 changes: 1 addition & 1 deletion util/FileCreator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/ErrorCodes.h>
#include <wdt/util/FileCreator.h>
#include <wdt/ErrorCodes.h>

#include <fcntl.h>
#include <folly/Conv.h>
Expand Down
2 changes: 1 addition & 1 deletion util/FileWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/util/CommonImpl.h>
#include <wdt/util/FileWriter.h>
#include <wdt/util/CommonImpl.h>

#include <fcntl.h>
#include <gflags/gflags.h>
Expand Down
2 changes: 1 addition & 1 deletion util/ServerSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/util/ServerSocket.h>
#include <fcntl.h>
#include <folly/Conv.h>
#include <glog/logging.h>
#include <poll.h>
#include <sys/socket.h>
#include <wdt/util/ServerSocket.h>
#include <algorithm>
namespace facebook {
namespace wdt {
Expand Down
2 changes: 1 addition & 1 deletion util/ThreadTransferHistory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/Sender.h>
#include <wdt/util/ThreadTransferHistory.h>
#include <wdt/Sender.h>

namespace facebook {
namespace wdt {
Expand Down
2 changes: 1 addition & 1 deletion util/ThreadsController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/WdtOptions.h>
#include <wdt/util/ThreadsController.h>
#include <wdt/WdtOptions.h>

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion util/WdtFlags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
#include <wdt/Protocol.h>
#include <wdt/util/WdtFlags.h>
#include <wdt/Protocol.h>

#include <gflags/gflags.h>
#include <glog/logging.h>
Expand Down
2 changes: 1 addition & 1 deletion util/WdtSocket.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <wdt/util/WdtSocket.h>
#include <folly/Bits.h>
#include <folly/String.h> // for humanify
#include <netdb.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <wdt/Protocol.h>
#include <wdt/util/WdtSocket.h>
#ifdef WDT_HAS_SOCKIOS_H
#include <linux/sockios.h>
#endif
Expand Down