Get rid of AcceptOptions::etype

Author: masaori335

iocore/net/AcceptOptions.h

@@ -27,7 +27,6 @@
 #include "tscore/ink_inet.h"
 
 #include "I_Event.h"
-#include "I_Net.h"
 
 struct AcceptOptions {
   using self = AcceptOptions; ///< Self reference type.
@@ -44,13 +43,10 @@ struct AcceptOptions {
   int ip_family = AF_INET;
   /// Should we use accept threads? If so, how many?
   int accept_threads = -1;
-  /// Event type to generate on accept.
-  EventType etype = ET_NET;
   /** If @c true, the continuation is called back with
       @c NET_EVENT_ACCEPT_SUCCEED
       or @c NET_EVENT_ACCEPT_FAILED on success and failure resp.
   */
-
   bool localhost_only = false;
   /// Are frequent accepts expected?
   /// Default: @c false.

iocore/net/Connection.cc

@@ -145,7 +145,7 @@ Server::setup_fd_for_listen(bool non_blocking, const NetProcessor::AcceptOptions
 
   ink_assert(fd != NO_FD);
 
-  if (opt.etype == ET_NET && opt.defer_accept > 0) {
+  if (opt.defer_accept > 0) {
     http_accept_filter = true;
     add_http_filter(fd);
   }

iocore/net/QUICNetProcessor_quiche.cc

@@ -190,7 +190,7 @@ QUICNetProcessor::connect_re(Continuation *cont, sockaddr const *remote_addr, Ne
   vc->mutex       = cont->mutex;
   vc->action_     = cont;
 
-  if (t->is_event_type(opt.etype)) {
+  if (t->is_event_type(ET_NET)) {
     MUTEX_TRY_LOCK(lock, cont->mutex, t);
     if (lock.is_locked()) {
       MUTEX_TRY_LOCK(lock2, get_NetHandler(t)->mutex, t);
@@ -202,10 +202,10 @@ QUICNetProcessor::connect_re(Continuation *cont, sockaddr const *remote_addr, Ne
   }
 
   // Try to stay on the current thread if it is the right type
-  if (t->is_event_type(opt.etype)) {
+  if (t->is_event_type(ET_NET)) {
     t->schedule_imm(vc);
   } else { // Otherwise, pass along to another thread of the right type
-    eventProcessor.schedule_imm(vc, opt.etype);
+    eventProcessor.schedule_imm(vc, ET_NET);
   }
 
   return ACTION_RESULT_DONE;

iocore/net/UnixNetAccept.cc

@@ -103,7 +103,7 @@ net_accept(NetAccept *na, void *ep, bool blockable)
 
     EThread *t;
     NetHandler *h;
-    if (e->ethread->is_event_type(na->opt.etype)) {
+    if (e->ethread->is_event_type(ET_NET)) {
       t = e->ethread;
       h = get_NetHandler(t);
       // Assign NetHandler->mutex to NetVC
@@ -115,7 +115,7 @@ net_accept(NetAccept *na, void *ep, bool blockable)
         vc->handleEvent(EVENT_NONE, e);
       }
     } else {
-      t = eventProcessor.assign_thread(na->opt.etype);
+      t = eventProcessor.assign_thread(ET_NET);
       h = get_NetHandler(t);
       // Assign NetHandler->mutex to NetVC
       vc->mutex = h->mutex;
@@ -178,7 +178,7 @@ void
 NetAccept::init_accept(EThread *t)
 {
   if (!t) {
-    t = eventProcessor.assign_thread(opt.etype);
+    t = eventProcessor.assign_thread(ET_NET);
   }
 
   if (!action_->continuation->mutex) {
@@ -227,7 +227,6 @@ NetAccept::init_accept_per_thread()
   int i, n;
   int listen_per_thread = 0;
 
-  ink_assert(opt.etype >= 0);
   REC_ReadConfigInteger(listen_per_thread, "proxy.config.exec_thread.listen");
 
   if (listen_per_thread == 0) {
@@ -238,11 +237,11 @@ NetAccept::init_accept_per_thread()
   }
 
   SET_HANDLER(&NetAccept::accept_per_thread);
-  n = eventProcessor.thread_group[opt.etype]._count;
+  n = eventProcessor.thread_group[ET_NET]._count;
 
   for (i = 0; i < n; i++) {
     NetAccept *a = (i < n - 1) ? clone() : this;
-    EThread *t   = eventProcessor.thread_group[opt.etype]._thread[i];
+    EThread *t   = eventProcessor.thread_group[ET_NET]._thread[i];
     a->mutex     = get_NetHandler(t)->mutex;
     t->schedule_imm(a);
   }
@@ -364,7 +363,7 @@ NetAccept::do_blocking_accept(EThread *t)
 #endif
     SET_CONTINUATION_HANDLER(vc, &UnixNetVConnection::acceptEvent);
 
-    EThread *localt = eventProcessor.assign_thread(opt.etype);
+    EThread *localt = eventProcessor.assign_thread(ET_NET);
     NetHandler *h   = get_NetHandler(localt);
     // Assign NetHandler->mutex to NetVC
     vc->mutex = h->mutex;

src/traffic_quic/quic_client.cc

@@ -78,7 +78,6 @@ QUICClient::start(int, void *)
     NetVCOptions opt;
     opt.ip_proto            = NetVCOptions::USE_UDP;
     opt.ip_family           = info->ai_family;
-    opt.etype               = ET_NET;
     opt.socket_recv_bufsize = 1048576;
     opt.socket_send_bufsize = 1048576;
     opt.alpn_protos         = alpn_protos;