From 36e216d24aed1f9098b037b555c8999977eb2222 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 1 Feb 2015 18:12:57 +0900 Subject: [PATCH] src: Delete unused source files --- src/shrpx_thread_event_receiver.cc | 130 ----------------------------- src/shrpx_thread_event_receiver.h | 80 ------------------ 2 files changed, 210 deletions(-) delete mode 100644 src/shrpx_thread_event_receiver.cc delete mode 100644 src/shrpx_thread_event_receiver.h diff --git a/src/shrpx_thread_event_receiver.cc b/src/shrpx_thread_event_receiver.cc deleted file mode 100644 index 162ac0ea..00000000 --- a/src/shrpx_thread_event_receiver.cc +++ /dev/null @@ -1,130 +0,0 @@ -/* - * nghttp2 - HTTP/2 C Library - * - * Copyright (c) 2012 Tatsuhiro Tsujikawa - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -#include "shrpx_thread_event_receiver.h" - -#include - -#include "shrpx_ssl.h" -#include "shrpx_log.h" -#include "shrpx_client_handler.h" -#include "shrpx_http2_session.h" -#include "shrpx_worker.h" -#include "shrpx_worker_config.h" -#include "util.h" - -using namespace nghttp2; - -namespace shrpx { - -ThreadEventReceiver::ThreadEventReceiver(SSL_CTX *ssl_ctx, - Http2Session *http2session, - ConnectBlocker *http1_connect_blocker) - : ssl_ctx_(ssl_ctx), http2session_(http2session), - http1_connect_blocker_(http1_connect_blocker), - worker_stat_(util::make_unique()) {} - -ThreadEventReceiver::~ThreadEventReceiver() {} - -void ThreadEventReceiver::on_read() { - // auto input = bufferevent_get_input(bev); - // while (evbuffer_get_length(input) >= sizeof(WorkerEvent)) { - // WorkerEvent wev; - // int nread = evbuffer_remove(input, &wev, sizeof(wev)); - // if (nread == -1) { - // TLOG(FATAL, this) << "evbuffer_remove() failed"; - // continue; - // } - // if (nread != sizeof(wev)) { - // TLOG(FATAL, this) << "evbuffer_remove() removed fewer bytes. Expected:" - // << sizeof(wev) << " Actual:" << nread; - // continue; - // } - - // if (wev.type == REOPEN_LOG) { - // if (LOG_ENABLED(INFO)) { - // LOG(INFO) << "Reopening log files: worker_info(" << worker_config - // << ")"; - // } - - // reopen_log_files(); - - // continue; - // } - - // if (wev.type == GRACEFUL_SHUTDOWN) { - // LOG(NOTICE) << "Graceful shutdown commencing"; - - // worker_config->graceful_shutdown = true; - - // if (worker_stat_->num_connections == 0) { - // event_base_loopbreak(evbase_); - - // break; - // } - - // continue; - // } - - // if (LOG_ENABLED(INFO)) { - // TLOG(INFO, this) << "WorkerEvent: client_fd=" << wev.client_fd - // << ", addrlen=" << wev.client_addrlen; - // } - - // if (worker_stat_->num_connections >= - // get_config()->worker_frontend_connections) { - - // if (LOG_ENABLED(INFO)) { - // TLOG(INFO, this) << "Too many connections >= " - // << get_config()->worker_frontend_connections; - // } - - // close(wev.client_fd); - - // continue; - // } - - // auto evbase = bufferevent_get_base(bev); - // auto client_handler = ssl::accept_connection( - // evbase, rate_limit_group_, ssl_ctx_, wev.client_fd, - // &wev.client_addr.sa, - // wev.client_addrlen, worker_stat_.get(), &dconn_pool_); - // if (client_handler) { - // client_handler->set_http2_session(http2session_); - // client_handler->set_http1_connect_blocker(http1_connect_blocker_); - - // if (LOG_ENABLED(INFO)) { - // TLOG(INFO, this) << "CLIENT_HANDLER:" << client_handler << " - // created"; - // } - // } else { - // if (LOG_ENABLED(INFO)) { - // TLOG(ERROR, this) << "ClientHandler creation failed"; - // } - // close(wev.client_fd); - // } - // } -} - -} // namespace shrpx diff --git a/src/shrpx_thread_event_receiver.h b/src/shrpx_thread_event_receiver.h deleted file mode 100644 index 710dbf0e..00000000 --- a/src/shrpx_thread_event_receiver.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * nghttp2 - HTTP/2 C Library - * - * Copyright (c) 2012 Tatsuhiro Tsujikawa - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -#ifndef SHRPX_THREAD_EVENT_RECEIVER_H -#define SHRPX_THREAD_EVENT_RECEIVER_H - -#include "shrpx.h" - -#include - -#include - -#include "shrpx_config.h" -#include "shrpx_downstream_connection_pool.h" - -namespace shrpx { - -class Http2Session; -class ConnectBlocker; -struct WorkerStat; - -enum WorkerEventType { - NEW_CONNECTION = 0x01, - REOPEN_LOG = 0x02, - GRACEFUL_SHUTDOWN = 0x03, -}; - -struct WorkerEvent { - WorkerEventType type; - union { - struct { - sockaddr_union client_addr; - size_t client_addrlen; - int client_fd; - }; - }; -}; - -class ThreadEventReceiver { -public: - ThreadEventReceiver(SSL_CTX *ssl_ctx, Http2Session *http2session, - ConnectBlocker *http1_connect_blocker); - ~ThreadEventReceiver(); - void on_read(); - -private: - DownstreamConnectionPool dconn_pool_; - // event_base *evbase_; - SSL_CTX *ssl_ctx_; - // Shared HTTP2 session for each thread. NULL if not client - // mode. Not deleted by this object. - Http2Session *http2session_; - ConnectBlocker *http1_connect_blocker_; - std::unique_ptr worker_stat_; -}; - -} // namespace shrpx - -#endif // SHRPX_THREAD_EVENT_RECEIVER_H