Commit 5bcb4a7a authored by Orvid King's avatar Orvid King Committed by Facebook Github Bot

Remove AsyncSocket.getFd

Summary: It's dead now.

Reviewed By: yfeldblum

Differential Revision: D13629451

fbshipit-source-id: f4a79919ba20a13b6afd59b5e4605bf8faa3c6ad
parent 44b142c4
...@@ -337,10 +337,10 @@ class AsyncSocket : virtual public AsyncTransportWrapper { ...@@ -337,10 +337,10 @@ class AsyncSocket : virtual public AsyncTransportWrapper {
} }
/** /**
* Get the file descriptor used by the AsyncSocket. * Get the network socket used by the AsyncSocket.
*/ */
virtual int getFd() const { virtual int getFd(int /*breakAllTheThings*/) const {
return getNetworkSocket().toFd(); return -1;
} }
virtual NetworkSocket getNetworkSocket() const { virtual NetworkSocket getNetworkSocket() const {
......
...@@ -212,13 +212,11 @@ class WriteCheckTimestampCallback : public WriteCallbackBase { ...@@ -212,13 +212,11 @@ class WriteCheckTimestampCallback : public WriteCallbackBase {
void setSocket(const std::shared_ptr<AsyncSSLSocket>& socket) override { void setSocket(const std::shared_ptr<AsyncSSLSocket>& socket) override {
WriteCallbackBase::setSocket(socket); WriteCallbackBase::setSocket(socket);
EXPECT_NE(socket_->getFd(), 0); EXPECT_NE(socket_->getNetworkSocket(), NetworkSocket());
int flags = SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_OPT_TSONLY | int flags = SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_OPT_TSONLY |
SOF_TIMESTAMPING_SOFTWARE; SOF_TIMESTAMPING_SOFTWARE;
AsyncSocket::OptionKey tstampingOpt = {SOL_SOCKET, SO_TIMESTAMPING}; AsyncSocket::OptionKey tstampingOpt = {SOL_SOCKET, SO_TIMESTAMPING};
int ret = tstampingOpt.apply( int ret = tstampingOpt.apply(socket_->getNetworkSocket(), flags);
folly::NetworkSocket::fromFd(socket_->getNetworkSocket().toFd()),
flags);
EXPECT_EQ(ret, 0); EXPECT_EQ(ret, 0);
} }
......
...@@ -3101,14 +3101,12 @@ TEST(AsyncSocketTest, ErrMessageCallback) { ...@@ -3101,14 +3101,12 @@ TEST(AsyncSocketTest, ErrMessageCallback) {
errMsgCB.resetAfter_ = 3; errMsgCB.resetAfter_ = 3;
// Enable timestamp notifications // Enable timestamp notifications
ASSERT_GT(socket->getFd(), 0); ASSERT_NE(socket->getNetworkSocket(), NetworkSocket());
int flags = SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_OPT_TSONLY | int flags = SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_OPT_TSONLY |
SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_OPT_CMSG | SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_OPT_CMSG |
SOF_TIMESTAMPING_TX_SCHED; SOF_TIMESTAMPING_TX_SCHED;
AsyncSocket::OptionKey tstampingOpt = {SOL_SOCKET, SO_TIMESTAMPING}; AsyncSocket::OptionKey tstampingOpt = {SOL_SOCKET, SO_TIMESTAMPING};
EXPECT_EQ( EXPECT_EQ(tstampingOpt.apply(socket->getNetworkSocket(), flags), 0);
tstampingOpt.apply(folly::NetworkSocket::fromFd(socket->getFd()), flags),
0);
// write() // write()
std::vector<uint8_t> wbuf(128, 'a'); std::vector<uint8_t> wbuf(128, 'a');
......
...@@ -48,7 +48,7 @@ class MockAsyncSocket : public AsyncSocket { ...@@ -48,7 +48,7 @@ class MockAsyncSocket : public AsyncSocket {
MOCK_CONST_METHOD1(getPeerAddress, void(folly::SocketAddress*)); MOCK_CONST_METHOD1(getPeerAddress, void(folly::SocketAddress*));
MOCK_METHOD0(detachFd, int()); MOCK_METHOD0(detachFd, int());
MOCK_CONST_METHOD0(getFd, int()); MOCK_CONST_METHOD0(getNetworkSocket, NetworkSocket());
MOCK_METHOD0(closeNow, void()); MOCK_METHOD0(closeNow, void());
MOCK_CONST_METHOD0(good, bool()); MOCK_CONST_METHOD0(good, bool());
MOCK_CONST_METHOD0(readable, bool()); MOCK_CONST_METHOD0(readable, bool());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment