Commit 50a21b1b authored by Orvid King's avatar Orvid King Committed by Facebook Github Bot

AsyncServerSocket::ConnectionEventCallback to NetworkSocket

Summary: Just do this atomically as there's only 2 places that use this.

Reviewed By: yfeldblum

Differential Revision: D13104245

fbshipit-source-id: ca3c5271deaade071e5e497bde5eeb15d5513e59
parent 6100907a
......@@ -85,13 +85,8 @@ class AsyncServerSocket : public DelayedDestruction, public AsyncSocketBase {
* is accepted using the system accept()/accept4() APIs.
*/
virtual void onConnectionAccepted(
const int socket,
const SocketAddress& addr) noexcept = 0;
void onConnectionAccepted(
const NetworkSocket socket,
const SocketAddress& addr) noexcept {
onConnectionAccepted(socket.toFd(), addr);
}
const SocketAddress& addr) noexcept = 0;
/**
* onConnectionAcceptError() is called when an error occurred accepting
......@@ -104,39 +99,24 @@ class AsyncServerSocket : public DelayedDestruction, public AsyncSocketBase {
* probably because of some error encountered.
*/
virtual void onConnectionDropped(
const int socket,
const SocketAddress& addr) noexcept = 0;
void onConnectionDropped(
const NetworkSocket socket,
const SocketAddress& addr) noexcept {
onConnectionDropped(socket.toFd(), addr);
}
const SocketAddress& addr) noexcept = 0;
/**
* onConnectionEnqueuedForAcceptorCallback() is called when the
* connection is successfully enqueued for an AcceptCallback to pick up.
*/
virtual void onConnectionEnqueuedForAcceptorCallback(
const int socket,
const SocketAddress& addr) noexcept = 0;
void onConnectionEnqueuedForAcceptorCallback(
const NetworkSocket socket,
const SocketAddress& addr) noexcept {
onConnectionEnqueuedForAcceptorCallback(socket.toFd(), addr);
}
const SocketAddress& addr) noexcept = 0;
/**
* onConnectionDequeuedByAcceptorCallback() is called when the
* connection is successfully dequeued by an AcceptCallback.
*/
virtual void onConnectionDequeuedByAcceptorCallback(
const int socket,
const SocketAddress& addr) noexcept = 0;
void onConnectionDequeuedByAcceptorCallback(
const NetworkSocket socket,
const SocketAddress& addr) noexcept {
onConnectionDequeuedByAcceptorCallback(socket.toFd(), addr);
}
const SocketAddress& addr) noexcept = 0;
/**
* onBackoffStarted is called when the socket has successfully started
......
......@@ -35,7 +35,7 @@ class TestConnectionEventCallback
: public AsyncServerSocket::ConnectionEventCallback {
public:
void onConnectionAccepted(
const int /* socket */,
const NetworkSocket /* socket */,
const SocketAddress& /* addr */) noexcept override {
folly::RWSpinLock::WriteHolder holder(spinLock_);
connectionAccepted_++;
......@@ -47,21 +47,21 @@ class TestConnectionEventCallback
}
void onConnectionDropped(
const int /* socket */,
const NetworkSocket /* socket */,
const SocketAddress& /* addr */) noexcept override {
folly::RWSpinLock::WriteHolder holder(spinLock_);
connectionDropped_++;
}
void onConnectionEnqueuedForAcceptorCallback(
const int /* socket */,
const NetworkSocket /* socket */,
const SocketAddress& /* addr */) noexcept override {
folly::RWSpinLock::WriteHolder holder(spinLock_);
connectionEnqueuedForAcceptCallback_++;
}
void onConnectionDequeuedByAcceptorCallback(
const int /* socket */,
const NetworkSocket /* socket */,
const SocketAddress& /* addr */) noexcept override {
folly::RWSpinLock::WriteHolder holder(spinLock_);
connectionDequeuedByAcceptCallback_++;
......
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