Examine C++ module support for IOUring

CMakeLists.txt

@@ -44,6 +44,7 @@ set(CMAKE_CXX_STANDARD
 )
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE -DATS_BUILD)

include/iocore/eventsystem/EThread.h

@@ -34,6 +34,8 @@
 #include "iocore/eventsystem/ProtectedQueue.h"
 #include "tsutil/Histogram.h"
 
+import tscore;
+
 #if TS_USE_HWLOC
 struct hwloc_obj;
 using hwloc_obj_t = hwloc_obj *;

include/iocore/eventsystem/Event.h

@@ -26,6 +26,8 @@
 
 #include "iocore/eventsystem/Action.h"
 
+import tscore;
+
 //
 //  Defines
 //

include/iocore/eventsystem/EventProcessor.h

@@ -28,6 +28,8 @@
 #include "iocore/eventsystem/Event.h"
 #include <atomic>
 
+import tscore;
+
 #ifdef TS_MAX_THREADS_IN_EACH_THREAD_TYPE
 constexpr int MAX_THREADS_IN_EACH_TYPE = TS_MAX_THREADS_IN_EACH_THREAD_TYPE;
 #else

include/iocore/eventsystem/Freer.h

@@ -27,6 +27,8 @@
 #include "tscore/ink_platform.h"
 #include "iocore/eventsystem/Tasks.h"
 
+import tscore;
+
 // Note that these should not be used for memory that wishes to retain
 // NUMA socket affinity. We'll potentially return these on an arbitrarily
 // selected processor/socket.

include/iocore/eventsystem/Lock.h

@@ -27,6 +27,8 @@
 #include "tscore/Diags.h"
 #include "iocore/eventsystem/Thread.h"
 
+import tscore;
+
 #define MAX_LOCK_TIME               HRTIME_MSECONDS(200)
 #define THREAD_MUTEX_THREAD_HOLDING (-1024 * 1024)
 

include/iocore/eventsystem/PriorityEventQueue.h

@@ -26,6 +26,8 @@
 #include "tscore/ink_platform.h"
 #include "iocore/eventsystem/Event.h"
 
+import tscore;
+
 // <5ms, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120
 #define N_PQ_LIST          10
 #define PQ_BUCKET_TIME(_i) (HRTIME_MSECONDS(5) << (_i))
@@ -115,7 +117,7 @@ struct PriorityEventQueue {
         return last_check_time + (PQ_BUCKET_TIME(i) / 2);
       }
     }
-    return last_check_time + HRTIME_FOREVER;
+    return last_check_time + HRTIME_FOREVERS(1);
   }
 
   PriorityEventQueue();

include/iocore/eventsystem/ProtectedQueue.h

@@ -36,6 +36,9 @@
 
 #include "tscore/ink_platform.h"
 #include "iocore/eventsystem/Event.h"
+
+import tscore;
+
 struct ProtectedQueue {
   void   enqueue(Event *e);
   void   signal();

include/iocore/io_uring/IO_URING.h

@@ -24,73 +24,9 @@ Linux io_uring helper library
 #pragma once
 
 #include <liburing.h>
-#include <utility>
-#include "tscore/ink_hrtime.h"
-
-struct IOUringConfig {
-  int queue_entries = 32;
-  int sq_poll_ms    = 0;
-  int attach_wq     = 0;
-  int wq_bounded    = 0;
-  int wq_unbounded  = 0;
-};
 
 class IOUringCompletionHandler
 {
 public:
   virtual void handle_complete(io_uring_cqe *) = 0;
 };
-
-class IOUringContext
-{
-public:
-  IOUringContext();
-  ~IOUringContext();
-
-  IOUringContext(const IOUringContext &) = delete;
-
-  io_uring_sqe *
-  next_sqe(IOUringCompletionHandler *handler)
-  {
-    io_uring_sqe *result = io_uring_get_sqe(&ring);
-    if (result == nullptr) {
-      submit();
-      result = io_uring_get_sqe(&ring);
-    }
-    if (result != nullptr) {
-      io_uring_sqe_set_data(result, handler);
-    }
-    return result;
-  }
-
-  bool supports_op(int op) const;
-
-  int                 set_wq_max_workers(unsigned int bounded, unsigned int unbounded);
-  std::pair<int, int> get_wq_max_workers();
-
-  void submit();
-  void service();
-  void submit_and_wait(ink_hrtime ms);
-
-  int register_eventfd();
-
-  // assigns the global iouring config
-  static void            set_config(const IOUringConfig &);
-  static IOUringContext *local_context();
-  static void            set_main_queue(IOUringContext *);
-  static int             get_main_queue_fd();
-
-  bool
-  valid()
-  {
-    return ring.ring_fd > 0;
-  }
-
-private:
-  io_uring        ring  = {};
-  io_uring_probe *probe = nullptr;
-  int             evfd  = -1;
-
-  void                 handle_cqe(io_uring_cqe *);
-  static IOUringConfig config;
-};

include/iocore/net/NetTimeout.h

@@ -24,10 +24,11 @@
 #pragma once
 
 #include "tscore/List.h"
-#include "tscore/ink_hrtime.h"
 
 #include "iocore/eventsystem/EventSystem.h"
 
+import tscore;
+
 /**
   NetTimeout - handle active & inactive timeout
  */

include/iocore/net/TLSBasicSupport.h

@@ -28,9 +28,10 @@
 
 #include <openssl/ssl.h>
 
-#include "tscore/ink_hrtime.h"
 #include "iocore/net/SSLTypes.h"
 
+import tscore;
+
 using TLSHandle = SSL *;
 
 class TLSBasicSupport

include/iocore/net/quic/QUICTypes.h

@@ -24,7 +24,6 @@
 #pragma once
 
 #include "iocore/net/NetVConnection.h"
-#include "tscore/ink_hrtime.h"
 #include "tscore/ink_inet.h"
 
 #include <openssl/evp.h>
@@ -35,6 +34,8 @@
 #include <string>
 #include <unordered_map>
 
+import tscore;
+
 using QUICPacketNumber = uint64_t;
 using QUICVersion      = uint32_t;
 using QUICStreamId     = uint64_t;

include/proxy/CacheControl.h

@@ -38,11 +38,11 @@ struct RequestData;
 
 const int CC_UNSET_TIME = -1;
 
-#define CACHE_CONTROL_TIMEOUT (HRTIME_HOUR * 1)
+#define CACHE_CONTROL_TIMEOUT (HRTIME_HOURS(1))
 
 //   Use 10 second time for purify testing under low
 //     load to verify memory allocation
-// #define CACHE_CONTROL_TIMEOUT            (HRTIME_SECOND*10)
+// #define CACHE_CONTROL_TIMEOUT            (HRTIME_SECONDS(10))
 
 enum class CacheControlType {
   INVALID = 0,

include/proxy/Milestones.h

@@ -24,10 +24,11 @@
 #pragma once
 
 #include "ts/apidefs.h"
-#include "tscore/ink_hrtime.h"
 
 #include <array>
 
+import tscore;
+
 template <class T, size_t entries> class Milestones
 {
 public:

include/proxy/PluginVC.h

@@ -39,6 +39,8 @@
 #include "iocore/net/NetVConnection.h"
 #include "tscore/ink_atomic.h"
 
+import tscore;
+
 class PluginVCCore;
 
 struct PluginVCState {

include/proxy/ProxySession.h

@@ -33,6 +33,8 @@
 #include "proxy/IPAllow.h"
 #include "tscore/SnowflakeID.h"
 
+import tscore;
+
 // Emit a debug message conditional on whether this particular client session
 // has debugging enabled. This should only be called from within a client session
 // member function.

include/proxy/ProxyTransaction.h

@@ -26,6 +26,8 @@
 #include "proxy/ProxySession.h"
 #include <string_view>
 
+import tscore;
+
 class HttpSM;
 
 // Abstract Class for any transaction with-in the HttpSM

include/proxy/http/HttpCacheSM.h

@@ -38,6 +38,8 @@
 #include "proxy/hdrs/HTTP.h"
 #include "proxy/http/HttpConfig.h"
 
+import tscore;
+
 class HttpSM;
 class HttpCacheSM;
 

include/proxy/http/HttpSM.h

@@ -53,6 +53,8 @@
 #include "tscore/History.h"
 #include "tscore/PendingAction.h"
 
+import tscore;
+
 #define HTTP_API_CONTINUE (INK_API_EVENT_EVENTS_START + 0)
 #define HTTP_API_ERROR    (INK_API_EVENT_EVENTS_START + 1)
 

include/proxy/http/HttpTransact.h

@@ -51,6 +51,8 @@
 #include <string>
 #include <string_view>
 
+import tscore;
+
 #define HTTP_OUR_VIA_MAX_LENGTH 1024 // 512-bytes for hostname+via string, 512-bytes for the debug info
 
 #define HTTP_RELEASE_ASSERT(X) ink_release_assert(X)

include/proxy/http/HttpTunnel.h

@@ -34,6 +34,8 @@
 
 #include "iocore/eventsystem/EventSystem.h"
 
+import tscore;
+
 // Get rid of any previous definition first... /leif
 #ifdef MAX_PRODUCERS
 #undef MAX_PRODUCERS

include/proxy/http/PreWarmManager.h

@@ -43,7 +43,6 @@ using ts::Metrics;
 
 // tscore
 #include "tscore/CryptoHash.h"
-#include "tscore/ink_hrtime.h"
 
 #include <array>
 #include <cstddef>
@@ -54,6 +53,8 @@ using ts::Metrics;
 #include <string>
 #include <unordered_map>
 
+import tscore;
+
 // PreWarm::Dst and PreWarm::SPtrConstDst are defined in iocore.
 namespace PreWarm
 {

include/proxy/http2/Http2CommonSession.h

@@ -30,6 +30,8 @@
 #include "proxy/http2/Http2ConnectionState.h"
 #include "proxy/http2/Http2Frame.h"
 
+import tscore;
+
 // Name                       Edata                 Description
 // HTTP2_SESSION_EVENT_INIT   Http2CommonSession *  HTTP/2 session is born
 // HTTP2_SESSION_EVENT_FINI   Http2CommonSession *  HTTP/2 session is ended

include/proxy/http2/Http2ConnectionState.h

@@ -32,7 +32,8 @@
 #include "proxy/http2/HPACK.h"
 #include "proxy/http2/Http2Stream.h"
 #include "proxy/http2/Http2DependencyTree.h"
-#include "tscore/FrequencyCounter.h"
+
+import tscore;
 
 class Http2CommonSession;
 class Http2Frame;

include/proxy/http2/Http2Stream.h

@@ -32,6 +32,8 @@
 #include "tscore/History.h"
 #include "proxy/Milestones.h"
 
+import tscore;
+
 class Http2Stream;
 class Http2ConnectionState;
 

include/proxy/http3/Http3Transaction.h

@@ -29,6 +29,8 @@
 #include "proxy/http3/Http3FrameDispatcher.h"
 #include "proxy/http3/Http3FrameCollector.h"
 
+import tscore;
+
 class QUICStreamIO;
 class HQSession;
 class Http09Session;