This repository has been archived by the owner on Apr 21, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create TcpServerThreadForTesting and re-factor FakeMemcacheServerThre…
…ad to use it.
- Loading branch information
Showing
5 changed files
with
211 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Copyright 2016 Google Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // Author: cheesy@google.com (cheesy@google.com) | ||
|
|
||
| #include "pagespeed/system/tcp_server_thread_for_testing.h" | ||
|
|
||
| #include <sys/socket.h> | ||
|
|
||
| #include "apr_network_io.h" | ||
| #include "base/logging.h" | ||
| #include "pagespeed/kernel/base/abstract_mutex.h" | ||
| #include "pagespeed/system/apr_thread_compatible_pool.h" | ||
|
|
||
| namespace net_instaweb { | ||
|
|
||
| TcpServerThreadForTesting::TcpServerThreadForTesting( | ||
| apr_port_t listen_port, StringPiece name, ThreadSystem* thread_system) | ||
| : Thread(thread_system, name, ThreadSystem::kJoinable), | ||
| mutex_(thread_system->NewMutex()), | ||
| ready_notify_(mutex_->NewCondvar()), | ||
| pool_(AprCreateThreadCompatiblePool(nullptr)), | ||
| requested_listen_port_(listen_port), | ||
| actual_listening_port_(0) { | ||
| } | ||
|
|
||
| TcpServerThreadForTesting::~TcpServerThreadForTesting() { | ||
| this->Join(); | ||
| if (pool_ != nullptr) { | ||
| apr_pool_destroy(pool_); | ||
| } | ||
| } | ||
|
|
||
| void TcpServerThreadForTesting::Run() { | ||
| apr_socket_t* listen_sock = CreateAndBindSocket(); | ||
| apr_socket_t* accepted_socket; | ||
| apr_status_t status = apr_socket_accept(&accepted_socket, listen_sock, pool_); | ||
| CHECK_EQ(status, APR_SUCCESS) | ||
| << "TcpServerThreadForTesting apr_socket_accept"; | ||
| HandleClientConnection(accepted_socket); | ||
| apr_socket_close(listen_sock); | ||
| } | ||
|
|
||
| apr_port_t TcpServerThreadForTesting::GetListeningPort() { | ||
| ScopedMutex lock(mutex_.get()); | ||
| while (actual_listening_port_ == 0) { | ||
| ready_notify_->Wait(); | ||
| } | ||
| return actual_listening_port_; | ||
| } | ||
|
|
||
| apr_socket_t* TcpServerThreadForTesting::CreateAndBindSocket() { | ||
| apr_socket_t* sock; | ||
| // Create TCP socket with SO_REUSEADDR. | ||
| apr_status_t status = | ||
| apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_PROTO_TCP, pool_); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_socket_create"; | ||
| status = apr_socket_opt_set(sock, APR_SO_REUSEADDR, 1); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_socket_opt_set"; | ||
|
|
||
| // requested_listen_port_ may be zero, in which case apr_socket_bind will | ||
| // pick a port for us. | ||
| apr_sockaddr_t* sa; | ||
| status = apr_sockaddr_info_get(&sa, "127.0.0.1", APR_INET, | ||
| requested_listen_port_, 0 /* flags */, pool_); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_sockaddr_info_get"; | ||
|
|
||
| // bind and listen. | ||
| status = apr_socket_bind(sock, sa); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_socket_bind"; | ||
| status = apr_socket_listen(sock, 1 /* backlog */); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_socket_listen"; | ||
|
|
||
| // Now the socket is bound and listening, find the local port we're actually | ||
| // using. If requested_listen_port_ is non-zero, they really should match. | ||
| apr_sockaddr_t* bound_sa; | ||
| status = apr_socket_addr_get(&bound_sa, APR_LOCAL, sock); | ||
| CHECK_EQ(status, APR_SUCCESS) << "CreateAndBindSocket apr_socket_addr_get"; | ||
| if (requested_listen_port_ != 0) { | ||
| CHECK_EQ(requested_listen_port_, bound_sa->port); | ||
| } | ||
|
|
||
| { | ||
| ScopedMutex lock(mutex_.get()); | ||
| actual_listening_port_ = bound_sa->port; | ||
| ready_notify_->Broadcast(); | ||
| } | ||
|
|
||
| return sock; | ||
| } | ||
|
|
||
| } // namespace net_instaweb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // Copyright 2016 Google Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // Author: cheesy@google.com (Steve Hill) | ||
|
|
||
| #ifndef PAGESPEED_KERNEL_BASE_TCP_SERVER_THREAD_FOR_TESTING_H_ | ||
| #define PAGESPEED_KERNEL_BASE_TCP_SERVER_THREAD_FOR_TESTING_H_ | ||
|
|
||
| #include "apr_pools.h" | ||
| #include "apr_network_io.h" | ||
| #include "pagespeed/kernel/base/condvar.h" | ||
| #include "pagespeed/kernel/base/scoped_ptr.h" | ||
| #include "pagespeed/kernel/base/string_util.h" | ||
| #include "pagespeed/kernel/base/thread.h" | ||
| #include "pagespeed/kernel/base/thread_annotations.h" | ||
| #include "pagespeed/kernel/base/thread_system.h" | ||
|
|
||
| namespace net_instaweb { | ||
|
|
||
| // Implementation of Thread that uses APR to listen on a TCP port and then | ||
| // delegates to a virtual function to handle single connection. This code is | ||
| // absolutely not suitable for use outside of tests. | ||
|
|
||
| class TcpServerThreadForTesting : public ThreadSystem::Thread { | ||
| public: | ||
| // listen_port may be 0, in which case the system will pick the port. | ||
| // The socket isn't actually created until the thread is Start()ed. | ||
| TcpServerThreadForTesting(apr_port_t listen_port, StringPiece thread_name, | ||
| ThreadSystem* thread_system); | ||
| // Calls this->Join() which will hang if a connection has not been handled. | ||
| virtual ~TcpServerThreadForTesting(); | ||
|
|
||
| // Wait for thread to successfully start listening and then return the actual | ||
| // bound port number, which will be bound to IPv4 localhost. | ||
| apr_port_t GetListeningPort(); | ||
|
|
||
| private: | ||
| // Called after a successful call to apr_accept. Implementor must close | ||
| // sock. | ||
| virtual void HandleClientConnection(apr_socket_t* sock) = 0; | ||
|
|
||
| // Returns a socket bound to requested_listen_port_ if non-zero, otherwise | ||
| // whatever the system picked. Updates actual_listening_port_. | ||
| apr_socket_t* CreateAndBindSocket(); | ||
|
|
||
| // Thread implementation. | ||
| void Run() override; | ||
|
|
||
| scoped_ptr<ThreadSystem::CondvarCapableMutex> mutex_; | ||
| scoped_ptr<ThreadSystem::Condvar> ready_notify_; | ||
| apr_pool_t* pool_; | ||
| const apr_port_t requested_listen_port_; | ||
| apr_port_t actual_listening_port_ GUARDED_BY(mutex_); | ||
| }; | ||
|
|
||
| } // namespace net_instaweb | ||
|
|
||
| #endif // PAGESPEED_KERNEL_BASE_TCP_SERVER_THREAD_FOR_TESTING_H_ |