version -> static if

trikko · Apr 30, 2024 · 889a350 · 889a350
1 parent f763ecf
commit 889a350
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 35 deletions.
diff --git a/source/serverino/common.d b/source/serverino/common.d
@@ -27,6 +27,28 @@ module serverino.common;
 
 import std.datetime : MonoTimeImpl, ClockType;
 
+// Serverino can be built using two different backends: select or epoll
+public enum BackendType
+{
+   select,
+   epoll
+}
+
+// The backend is selected using the version directive or by checking the OS
+version(use_select) { enum Backend = BackendType.select; }
+else version(use_epoll) { enum Backend = BackendType.epoll; }
+else {
+   version(linux) enum Backend = BackendType.epoll;
+   else enum Backend = BackendType.select;
+}
+
+static if(Backend == BackendType.epoll)
+{
+	version(linux) { }
+	else static assert(false, "epoll backend is only available on Linux");
+}
+
+// The time type used in the serverino library
 alias CoarseTime = MonoTimeImpl!(ClockType.coarse);
 
 // Serverino version

diff --git a/source/serverino/communicator.d b/source/serverino/communicator.d
@@ -25,13 +25,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 module serverino.communicator;
 
-version(use_select) { version=with_select; }
-else version(use_epoll) { version=with_epoll; }
-else {
-   version(linux) version=with_epoll;
-   else version=with_select;
-}
-
 import serverino.common;
 import serverino.databuffer;
 import serverino.daemon : WorkerInfo, now;
@@ -144,7 +137,7 @@ package class Communicator
       {
          import serverino.daemon : Daemon;
 
-         version(with_epoll)
+         static if (serverino.common.Backend == BackendType.epoll)
          {
             import core.sys.linux.epoll : EPOLLIN, EPOLLOUT;
             Daemon.epollRemoveSocket(clientSkt);
@@ -188,7 +181,7 @@ package class Communicator
          s.blocking = false;
          this.clientSkt = s;
 
-         version(with_epoll)
+         static if (serverino.common.Backend == BackendType.epoll)
          {
             import serverino.daemon : Daemon;
             import core.sys.linux.epoll : EPOLLIN, EPOLLOUT;

diff --git a/source/serverino/daemon.d b/source/serverino/daemon.d
@@ -25,13 +25,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 module serverino.daemon;
 
-version(use_select) { version=with_select; }
-else version(use_epoll) { version=with_epoll; }
-else {
-   version(linux) version=with_epoll;
-   else version=with_select;
-}
-
 import serverino.common;
 import serverino.communicator;
 import serverino.config;
@@ -46,7 +39,7 @@ import std.socket;
 import std.algorithm : filter;
 import std.datetime : SysTime, Clock, seconds;
 
-version(with_epoll) import core.sys.linux.epoll;
+static if (serverino.common.Backend == BackendType.epoll) import core.sys.linux.epoll;
 
 
 // The class WorkerInfo is used to keep track of the workers.
@@ -130,7 +123,7 @@ package class WorkerInfo
       ubyte[1] data;
       accepted.receive(data);
 
-      version(with_epoll)
+      static if (serverino.common.Backend == BackendType.epoll)
       {
          import serverino.daemon : Daemon;
          import core.sys.linux.epoll : EPOLLIN, EPOLLOUT;
@@ -153,7 +146,7 @@ package class WorkerInfo
 
       if (this.unixSocket)
       {
-         version(with_epoll)
+         static if (serverino.common.Backend == BackendType.epoll)
          {
             import serverino.daemon : Daemon;
             Daemon.epollRemoveSocket(unixSocket);
@@ -407,7 +400,7 @@ package:
 
       tryInit!Modules();
 
-      version(with_epoll) epoll = epoll_create1(0);
+      static if (serverino.common.Backend == BackendType.epoll) epoll = epoll_create1(0);
 
       // Starting all the listeners.
       foreach(ref listener; config.listeners)
@@ -442,7 +435,7 @@ package:
             exit(EXIT_FAILURE);
          }
 
-         version(with_epoll) epollAddSocket(listener.socket, EPOLLIN, cast(void*)listener);
+         static if (serverino.common.Backend == BackendType.epoll) epollAddSocket(listener.socket, EPOLLIN, cast(void*)listener);
       }
 
       // Create all workers and start the ones that are required.
@@ -457,7 +450,7 @@ package:
       foreach(idx; 0..512)
          new Communicator(config);
 
-      version(with_select)
+      static if (serverino.common.Backend == BackendType.select)
       {
          // We use a socketset to check for updates
          SocketSet ssRead = new SocketSet(config.listeners.length + WorkerInfo.instances.length);
@@ -470,7 +463,7 @@ package:
       {
 
          // We have to reset and fill the socketSet every time!
-         version(with_select)
+         static if (serverino.common.Backend == BackendType.select)
          {
             ssRead.reset();
             ssWrite.reset();
@@ -501,7 +494,7 @@ package:
                warning("Exception: ", se.msg);
             }
          }
-         else version(with_epoll)
+         else static if (serverino.common.Backend == BackendType.epoll)
          {
             enum MAX_EPOLL_EVENTS = 1500;
             epoll_event[MAX_EPOLL_EVENTS] events = void;
@@ -584,7 +577,7 @@ package:
          // Select version main loop
          // ------------------------
 
-         version(with_select)
+         static if (serverino.common.Backend == BackendType.select)
          {
             // Check the workers for updates
             foreach(ref worker; WorkerInfo.alive)
@@ -650,7 +643,7 @@ package:
          // epoll version main loop
          // ------------------------
 
-         else version(with_epoll)
+         else static if (serverino.common.Backend == BackendType.epoll)
          {
             foreach(ref epoll_event e; events[0..updates])
             {
@@ -752,7 +745,7 @@ package:
    }
 
 
-   version(with_epoll)
+   static if (serverino.common.Backend == BackendType.epoll)
    {
 
       void epollAddSocket(Socket s, int events, void* ptr)

diff --git a/source/serverino/versionlog.d b/source/serverino/versionlog.d
@@ -24,13 +24,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 // This module is used to check and display the version of the serverino library during compilation
-version(use_select) { version=with_select; }
-else version(use_epoll) { version=with_epoll; }
-else {
-   version(linux) version=with_epoll;
-   else version=with_select;
-}
+import serverino.common;
 
-version(with_select) pragma(msg, "    Building serverino using select/socketset backend.");
-else version(with_epoll) pragma(msg, "    Building serverino using epoll backend.");
+static if (serverino.common.Backend == BackendType.select) pragma(msg, "    Building serverino using select/socketset backend.");
+else static if (serverino.common.Backend == BackendType.epoll) pragma(msg, "    Building serverino using epoll backend.");
 else static assert(false, "No backend selected. Please, use -version=use_select or -version=use_epoll.");