nghttpx: Remove --accept-delay and --num-accept options

src/shrpx.cc

@@ -426,10 +426,6 @@ void graceful_shutdown_signal_cb(struct ev_loop *loop, ev_signal *w,
   // After disabling accepting new connection, disptach incoming
   // connection in backlog.
 
-  // Make num_accept unlimited so that we can accept all connections
-  // waiting in listen queue.
-  mod_config()->num_accept = 0;
-
   conn_handler->accept_pending_connection();
 
   conn_handler->graceful_shutdown_worker();
@@ -769,8 +765,6 @@ void fill_default_config() {
   mod_config()->tls_ctx_per_worker = false;
   mod_config()->downstream_request_buffer_size = 16 * 1024;
   mod_config()->downstream_response_buffer_size = 16 * 1024;
-  mod_config()->num_accept = 16;
-  mod_config()->accept_delay = 0.01;
 }
 } // namespace
 
@@ -911,16 +905,6 @@ Performance:
               Default: )"
       << util::utos_with_unit(get_config()->downstream_response_buffer_size)
       << R"(
-  --num-accept=<N>
-              The number  of connections acceptor can  accept at once.
-              0 means unlimited.
-              Default: )" << get_config()->num_accept << R"(
-  --accept-delay=<T>
-              Acceptors  get idle  in <T>  amount of  time after  they
-              accepted at  most N connections,  where N is  defined in
-              --num-accept option.
-              Default: )" << util::duration_str(get_config()->accept_delay)
-      << R"(
 
 Timeout:
   --frontend-http2-read-timeout=<T>
@@ -1338,8 +1322,6 @@ int main(int argc, char **argv) {
         {"tls-ctx-per-worker", no_argument, &flag, 70},
         {"backend-response-buffer", required_argument, &flag, 71},
         {"backend-request-buffer", required_argument, &flag, 72},
-        {"num-accept", required_argument, &flag, 73},
-        {"accept-delay", required_argument, &flag, 74},
         {nullptr, 0, nullptr, 0}};
 
     int option_index = 0;
@@ -1669,14 +1651,6 @@ int main(int argc, char **argv) {
         // --backend-request-buffer
         cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_REQUEST_BUFFER, optarg);
         break;
-      case 73:
-        // --num-accept
-        cmdcfgs.emplace_back(SHRPX_OPT_NUM_ACCEPT, optarg);
-        break;
-      case 74:
-        // --accept-delay
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCEPT_DELAY, optarg);
-        break;
       default:
         break;
       }

src/shrpx_accept_handler.cc

@@ -56,7 +56,6 @@ AcceptHandler::~AcceptHandler() {
 }
 
 void AcceptHandler::accept_connection() {
-  size_t n = 0;
   for (;;) {
     sockaddr_union sockaddr;
     socklen_t addrlen = sizeof(sockaddr);
@@ -95,12 +94,7 @@ void AcceptHandler::accept_connection() {
     util::make_socket_nodelay(cfd);
 
     conn_hnr_->handle_connection(cfd, &sockaddr.sa, addrlen);
-    ++n;
-    if (n == get_config()->num_accept) {
-      break;
-    }
   }
-  conn_hnr_->disable_acceptor_temporary(get_config()->accept_delay);
 }
 
 void AcceptHandler::enable() { ev_io_start(conn_hnr_->get_loop(), &wev_); }

src/shrpx_config.cc

@@ -143,8 +143,6 @@ const char SHRPX_OPT_RLIMIT_NOFILE[] = "rlimit-nofile";
 const char SHRPX_OPT_TLS_CTX_PER_WORKER[] = "tls-ctx-per-worker";
 const char SHRPX_OPT_BACKEND_REQUEST_BUFFER[] = "backend-request-buffer";
 const char SHRPX_OPT_BACKEND_RESPONSE_BUFFER[] = "backend-response-buffer";
-const char SHRPX_OPT_NUM_ACCEPT[] = "num-accept";
-const char SHRPX_OPT_ACCEPT_DELAY[] = "accept-delay";
 
 namespace {
 Config *config = nullptr;
@@ -1159,21 +1157,6 @@ int parse_config(const char *opt, const char *optarg) {
     return 0;
   }
 
-  if (util::strieq(opt, SHRPX_OPT_NUM_ACCEPT)) {
-    size_t n;
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    mod_config()->num_accept = n;
-
-    return 0;
-  }
-
-  if (util::strieq(opt, SHRPX_OPT_ACCEPT_DELAY)) {
-    return parse_duration(&mod_config()->accept_delay, opt, optarg);
-  }
-
   if (util::strieq(opt, "conf")) {
     LOG(WARN) << "conf: ignored";
 

src/shrpx_config.h

@@ -131,8 +131,6 @@ extern const char SHRPX_OPT_RLIMIT_NOFILE[];
 extern const char SHRPX_OPT_TLS_CTX_PER_WORKER[];
 extern const char SHRPX_OPT_BACKEND_REQUEST_BUFFER[];
 extern const char SHRPX_OPT_BACKEND_RESPONSE_BUFFER[];
-extern const char SHRPX_OPT_NUM_ACCEPT[];
-extern const char SHRPX_OPT_ACCEPT_DELAY[];
 
 union sockaddr_union {
   sockaddr_storage storage;
@@ -199,7 +197,6 @@ struct Config {
   ev_tstamp stream_write_timeout;
   ev_tstamp downstream_idle_read_timeout;
   ev_tstamp listener_disable_timeout;
-  ev_tstamp accept_delay;
   std::unique_ptr<char[]> host;
   std::unique_ptr<char[]> private_key_file;
   std::unique_ptr<char[]> private_key_passwd;
@@ -263,7 +260,6 @@ struct Config {
   size_t rlimit_nofile;
   size_t downstream_request_buffer_size;
   size_t downstream_response_buffer_size;
-  size_t num_accept;
   // Bit mask to disable SSL/TLS protocol versions.  This will be
   // passed to SSL_CTX_set_options().
   long int tls_proto_mask;