opengris-scaler 1.12.7__cp312-cp312-manylinux_2_28_x86_64.whl → 1.12.9__cp312-cp312-manylinux_2_28_x86_64.whl

{opengris_scaler-1.12.7.dist-info → opengris_scaler-1.12.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opengris-scaler
-Version: 1.12.7
+Version: 1.12.9
 Summary: OpenGRIS Scaler Distribution Framework
 Author-Email: Citi <opensource@citi.com>
 License: Apache 2.0

{opengris_scaler-1.12.7.dist-info → opengris_scaler-1.12.9.dist-info}/RECORD

@@ -3,7 +3,7 @@ opengris_scaler.libs/libkj-1-094aa318.1.0.so,sha256=dRbFbTaca-2vf1SS5LDL3WNfPzoE
 scaler/CMakeLists.txt,sha256=60rkhpiwy0F-DSsRX_6nRrjYQvQ1Jp9mGp8fZsi006k,305
 scaler/__init__.py,sha256=nZU5QZ9oW2YIaGwm3-r-6dfmirTVzZpDPDNtX-ITCV4,513
 scaler/about.py,sha256=OBcfSvHO0P3mWaa2Ci4WEOTbH7is-3uYymScxgZPxyg,161
-scaler/version.txt,sha256=3WcnnPWUcjmVKZKuJerVIPqFkJ6dqDQAw-t9bD6TJTQ,7
+scaler/version.txt,sha256=BapNVsomB8f82_4o6SME3mmtU8l5mwsJj9b5hMy6ADk,7
 scaler/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/client/client.py,sha256=uyYVNYhLaX3H-Aqecf-yHSqvkKnWeDzpTr2atNUUv0E,24373
 scaler/client/future.py,sha256=fOl5g4Is4E5jtvO0kmRk4uUs_eUjSjMmyniYhWMAH4w,10041
@@ -27,8 +27,8 @@ scaler/cluster/object_storage_server.py,sha256=t7lx1tXAz1Iwc3xARJQqQOcG0s1BlIc-y
 scaler/cluster/scheduler.py,sha256=UqrB2ApZ9D_2IhleyGzKgZRUda5PPBiSOHO-Z0hj72k,3267
 scaler/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/config/defaults.py,sha256=HhYpemdTj1LQUZx8Fga5zVvCeIld1vvaNhTPjP2sRB4,2865
-scaler/config/loader.py,sha256=_qNqh1fu6jcexvhZkPbmWQuPN4AD9c5Sw_5sDCjwqf0,3842
-scaler/config/mixins.py,sha256=4La0kmxoMS9JzRuDNUV9vzUWtpOekoL03QEDVIhpVLo,361
+scaler/config/loader.py,sha256=nQXS7ysT5p-IVTjVTzfC19ZDdsQPBh1lnD-MX7DVHL4,3866
+scaler/config/mixins.py,sha256=o1YivS_8AzejSQ_jfSt5bkaA59DQGbw9P-rO5Z7LFVs,443
 scaler/config/section/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/config/section/cluster.py,sha256=JTn3rFM5HaOGyM-r9yd2xgImLgL9YJBkQPsAEDOXCd8,2855
 scaler/config/section/native_worker_adapter.py,sha256=dYPJn3a8CrGlynrlD4NlPRfA8PBkmcERPecRdf_hKWg,2262
@@ -39,8 +39,8 @@ scaler/config/section/top.py,sha256=4YUCyZTRVfINUhV56j50pg8be5o8nlWxG08fDqofHrA,
 scaler/config/section/webui.py,sha256=-9oFn1C64re2xZ_KKJIsHG--6PaVTvCP9vmRZNR_9MA,487
 scaler/config/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/config/types/object_storage_server.py,sha256=xvuCwiAQ4C_hKgTI4y6XMx9NKE0aX2QC6dlWNyvJyk4,1338
-scaler/config/types/worker.py,sha256=ld-gD5SnQEiT0xtqtiCZQ0y8F3WdYnTz6urKKKqKoSk,1626
-scaler/config/types/zmq.py,sha256=GAgcTOUQvdG_Qsly0MOgD7PvAnPBBoRC46GygcXW99Y,2512
+scaler/config/types/worker.py,sha256=0pt871QcyQ0_PEDVPxxgnnk3l5_syQA-71V1bhUmf0g,1708
+scaler/config/types/zmq.py,sha256=0VODax61H-4PxN6rIeWKlMXOHiW5elVSt1zc-UF0SL8,2593
 scaler/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/entry_points/cluster.py,sha256=5jPO_fFVe8IiSiAkLhLZ0mXJKXiYUWjvpXjEGlcgwW4,5779
 scaler/entry_points/object_storage_server.py,sha256=SEfBC_MdIHdZUxqHhGPb2AHje5dtIEM5uELRdHfFc0o,1316
@@ -58,7 +58,7 @@ scaler/io/sync_connector.py,sha256=zRDlBuMVbH92LqbdS35EPHXVOnaeWrvjmZZCISqqjPI,1
 scaler/io/sync_object_storage_connector.py,sha256=Zeo0aVAQ_bkRnhmqG9Ozst584072uMQfASfTLixQoeQ,7324
 scaler/io/sync_subscriber.py,sha256=rHbnhkfxvWtyswLNEyvr3D76i-sVBnGwWAGjLp2-thk,2523
 scaler/io/utility.py,sha256=yFq8-X47RfWp344HpRfqc_3XF3c6vewKPLi73e248s8,1189
-scaler/io/ymq/CMakeLists.txt,sha256=pQL_OJCioIVhQe6xatFkfe-MZ9qQiTlvsBkHBvW4chQ,2052
+scaler/io/ymq/CMakeLists.txt,sha256=znJS9ru-tjtn7Lv8RN1RJZVPhlHaE5AKS44z1Nnj_vE,1987
 scaler/io/ymq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/io/ymq/_ymq.pyi,sha256=HYLhjYhHTOgjffpAnlqyCSdUjEvKVRP7Slv8vIgGdkI,3036
 scaler/io/ymq/_ymq.so,sha256=XHSDgdogSOfR7P9gPflh6fryTGF-m510BYZXcXj8mNY,1114080
@@ -66,13 +66,12 @@ scaler/io/ymq/bytes.h,sha256=fxaZ0NMwzJC-agotCZbGizMs-IgPW4VWG4raeWBXC5I,2931
 scaler/io/ymq/common.h,sha256=XmYnfVeaIGZU3-gI2slw4uZyRrz807ANJXSQTf1joEY,711
 scaler/io/ymq/configuration.h,sha256=VvtSSGgD5dCOKc-gvtsqSBDoagaRnfnUS7jueDVsn9U,1951
 scaler/io/ymq/epoll_context.cpp,sha256=Sde1QRukul2ecD5EpTu8D-wy3u_tVN-FphvG5QM-3Aw,4937
-scaler/io/ymq/epoll_context.h,sha256=o5Zaqcy7CsxRNiVYIda6Gg7VQTod62Sb5Pqy3vbg9tM,2684
+scaler/io/ymq/epoll_context.h,sha256=0Cu840Utq6puRHCTVctCWpfdfNpUFcZJqw5D7e7hzSs,2641
 scaler/io/ymq/error.h,sha256=BUb55lcKou20u9e_GHZ0WEmlHJeC3VQWEzW-yTuRCTQ,5552
 scaler/io/ymq/event_loop.h,sha256=CDvcOszqtDSqkFt3t9hsT8n9HStbIchk7UO1u-3CTL0,1652
 scaler/io/ymq/event_loop_thread.cpp,sha256=0aYMmgpg8g6mmC-Ked2F3GCHNGJNXZAZLPobEQqu7g4,1801
 scaler/io/ymq/event_loop_thread.h,sha256=TiB_FZ6s8LE6pIBNeaQv2uuapXkoPG_JRWWywsibKHo,1593
 scaler/io/ymq/event_manager.h,sha256=WTRkNg8j8J_tLNU2ZtilVogC2EoLT5LrLIezeox5i80,2066
-scaler/io/ymq/file_descriptor.h,sha256=trsHS6Xi1vIzBFmYfbyqjT71OQT5y_gopb7OC-0Queo,4948
 scaler/io/ymq/interruptive_concurrent_queue.h,sha256=_hZkdfImpXT0L1fNsb-EfAYbaeTjQNmMGVMyZ6gT2Gg,4750
 scaler/io/ymq/io_context.cpp,sha256=MoIeg3xlSA9Q4S1O4FLXbjJSF7ZV5dRmaKJqUzQl200,3168
 scaler/io/ymq/io_context.h,sha256=eYyXCnHWWfSPVykvvA0sdjjAnKq2y768t3Exg0EU_IA,1248
@@ -109,7 +108,7 @@ scaler/io/ymq/pymod_ymq/python.h,sha256=wb0-WNF4occ4nDphSoUI47_OrfVPP72eLlGC_B59
 scaler/io/ymq/pymod_ymq/ymq.cpp,sha256=LoxL5ViLK0zyWRSYfmZn0QO-0vLw3xVZrRQJ5rWtc4w,526
 scaler/io/ymq/pymod_ymq/ymq.h,sha256=juX5DcDMY8rxp5BixFR0NgSlTrLBPog4JdqyQB9NfVI,11936
 scaler/io/ymq/third_party/concurrentqueue.h,sha256=yN268t8miyojar0bBBPIEjMI3DlHVZci2eufkDDA0FA,152819
-scaler/object_storage/CMakeLists.txt,sha256=F81288F-RssdfOp3R-jfN9gMfstMeG1ytJXfqmO6bLs,1727
+scaler/object_storage/CMakeLists.txt,sha256=tmkXHBOe1Gho32n4zEqChZBNlxytRTPnIaJ_hAWHBKg,1665
 scaler/object_storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/object_storage/constants.h,sha256=b5iTCS6lxWjNlanaknIheKJocTofopVxpcRCuMxiDaI,304
 scaler/object_storage/defs.h,sha256=hYFhhYdHgkT6C7iFQuG2d-Rexvkr8VvIy1LLGEh8Mrk,286
@@ -119,10 +118,10 @@ scaler/object_storage/message.cpp,sha256=nOaLu--Q1UyRLLHZY_8obHtGEhSnPiSnMSbF5uO
 scaler/object_storage/message.h,sha256=8KCts7n36jys3PiX09-lPtfa6DjfHI_2hYvled9afG0,4208
 scaler/object_storage/object_manager.cpp,sha256=cxNv9vOkCC910hlF5JF0mOUwTho8ieA1RJgF_P4e3ho,3083
 scaler/object_storage/object_manager.h,sha256=TkxICR8_20I-tkHwnMO0VpLWkm24vOEabrmQG6hdnmQ,1696
-scaler/object_storage/object_storage_server.cpp,sha256=iAQDDygo-K7DWswC-DPLuVQnCLyMc0wIoXoLLmFexDA,13316
-scaler/object_storage/object_storage_server.h,sha256=e3bYcI-OlAovT1mOFID3o2RdMD_bZfhyHcAGIbASzfI,4174
-scaler/object_storage/object_storage_server.so,sha256=IFOIrcbLhthuX39JktWgCM4WjjSOmXyjl5mqQd1VmuI,1348873
-scaler/object_storage/pymod_object_storage_server.cpp,sha256=Braun1TZrK1QjKErF4ftbCbnDHR8rWVLYgZlJETeGek,3482
+scaler/object_storage/object_storage_server.cpp,sha256=lJ863--NU6yzcUJAL4EQ2yQjDBekOaP0dYU581hl_Nc,13635
+scaler/object_storage/object_storage_server.h,sha256=11BD3U9NnLcqx8hFXJCnTjvQEgyirj-0LKlTYgtzaXI,4277
+scaler/object_storage/object_storage_server.so,sha256=jxMfY-9eKU1q4O818TjxExQNpUSOuKlEr8DiH4peqUM,1353249
+scaler/object_storage/pymod_object_storage_server.cpp,sha256=D09p81wZF6WnV35I6od3iDhgktV20v82CRR_tQ90ROs,3811
 scaler/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/protocol/introduction.md,sha256=G8oRzui4KmSlfFUu70y24tTmDmfEKBkog9tFVUn7G1U,5406
 scaler/protocol/worker.md,sha256=o2Hh_HCooqrptpXcHGzuzUkO_o4NWOurp7ja-DQi5ho,10503
@@ -223,10 +222,10 @@ scaler/worker_adapter/symphony/message.py,sha256=HOonEASua8e-uwpPVxprjyl1rrYmFJa
 scaler/worker_adapter/symphony/task_manager.py,sha256=phgx8dtAv-5ynsvsmG4DKcSlENz4b340FE6LDUWyMwo,12139
 scaler/worker_adapter/symphony/worker.py,sha256=VIDOoqVXbwrjHYN3lghbQpEIuCbVJUgiYsBknrI-0oc,7957
 scaler/worker_adapter/symphony/worker_adapter.py,sha256=eAAD1O0Uz1pjEdQPPl2fd8kyaF6q-aqCRrg48k1ocUU,5455
-opengris_scaler-1.12.7.dist-info/METADATA,sha256=i69CuRwX4FWL2SExVHaUH4j12YIxoslPPxjYpUsP3Vo,26987
-opengris_scaler-1.12.7.dist-info/WHEEL,sha256=4wppc7XK8XyImqEMe_MI_VzPhF-ahW4R81F5uWo_v_U,118
-opengris_scaler-1.12.7.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
-opengris_scaler-1.12.7.dist-info/RECORD,,
-opengris_scaler-1.12.7.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
-opengris_scaler-1.12.7.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
-opengris_scaler-1.12.7.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286
+opengris_scaler-1.12.9.dist-info/METADATA,sha256=Yk5bpbJorqpYauwfQ26S-BG7KHYEexvon0rWodbQrp0,26987
+opengris_scaler-1.12.9.dist-info/WHEEL,sha256=4wppc7XK8XyImqEMe_MI_VzPhF-ahW4R81F5uWo_v_U,118
+opengris_scaler-1.12.9.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
+opengris_scaler-1.12.9.dist-info/RECORD,,
+opengris_scaler-1.12.9.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
+opengris_scaler-1.12.9.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
+opengris_scaler-1.12.9.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286

scaler/config/loader.py

@@ -1,11 +1,12 @@
 import argparse
 import dataclasses
 import enum
+import sys
 from typing import Any, cast, Dict, Optional, Type, TypeVar, Union, get_args, get_origin
 
-try:
+if sys.version_info >= (3, 11):
     import tomllib
-except ImportError:
+else:
     import tomli as tomllib
 
 from scaler.config.mixins import ConfigType

scaler/config/mixins.py

@@ -1,5 +1,10 @@
 import abc
-from typing_extensions import Self
+import sys
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 
 class ConfigType(metaclass=abc.ABCMeta):

scaler/config/types/worker.py

@@ -1,6 +1,11 @@
 import dataclasses
+import sys
 from typing import List, Dict
-from typing_extensions import Self
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 from scaler.config.mixins import ConfigType
 

scaler/config/types/zmq.py

@@ -1,8 +1,12 @@
 import dataclasses
 import enum
+import sys
 from typing import Optional
 
-from typing_extensions import Self
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 from scaler.config.mixins import ConfigType
 
 

scaler/io/ymq/CMakeLists.txt

@@ -58,7 +58,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/io/ymq)
 
 if(LINUX)
     # ymq python =======================================================================================================
-    find_package(Python3 COMPONENTS Development.Module REQUIRED)
 
     add_library(py_ymq SHARED
         pymod_ymq/bytes.h

scaler/io/ymq/epoll_context.h

@@ -12,7 +12,6 @@
 #include "scaler/io/ymq/timed_queue.h"
 
 // First-party
-#include "scaler/io/ymq/file_descriptor.h"
 #include "scaler/io/ymq/interruptive_concurrent_queue.h"
 #include "scaler/io/ymq/timestamp.h"
 

scaler/object_storage/CMakeLists.txt

@@ -21,8 +21,6 @@ add_library(object_storage_server_objs OBJECT
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/object_storage)
 
 # object_storage_server python =========================================================================================
-find_package(Python3 REQUIRED COMPONENTS Development.Module)
-
 add_library(py_object_storage_server MODULE
     pymod_object_storage_server.cpp
 )

scaler/object_storage/object_storage_server.cpp

@@ -29,7 +29,8 @@ void ObjectStorageServer::run(
     ObjectStorageServer::Identity identity,
     std::string log_level,
     std::string log_format,
-    std::vector<std::string> log_paths)
+    std::vector<std::string> log_paths,
+    std::function<bool()> running)
 {
     _logger = scaler::ymq::Logger(log_format, std::move(log_paths), scaler::ymq::Logger::stringToLogLevel(log_level));
 
@@ -44,7 +45,7 @@ void ObjectStorageServer::run(
 
         _logger.log(scaler::ymq::Logger::LoggingLevel::info, "ObjectStorageServer: started");
 
-        processRequests();
+        processRequests(running);
 
         _ioContext.removeIOSocket(_ioSocket);
     } catch (const std::exception& e) {
@@ -117,7 +118,7 @@ void ObjectStorageServer::closeServerReadyFds()
     }
 }
 
-void ObjectStorageServer::processRequests()
+void ObjectStorageServer::processRequests(std::function<bool()> running)
 {
     using namespace std::chrono_literals;
     Identity lastMessageIdentity;
@@ -134,7 +135,13 @@ void ObjectStorageServer::processRequests()
                 }
             });
 
-            auto maybeMessage = ymq::syncRecvMessage(_ioSocket);
+            auto maybeMessageFuture = ymq::futureRecvMessage(_ioSocket);
+            while (maybeMessageFuture.wait_for(100ms) == std::future_status::timeout) {
+                if (!running()) {
+                    return;
+                }
+            }
+            auto maybeMessage = maybeMessageFuture.get();
 
             if (!maybeMessage) {
                 auto error = maybeMessage.error();

scaler/object_storage/object_storage_server.h

@@ -35,7 +35,8 @@ public:
         Identity identity                  = "ObjectStorageServer",
         std::string log_level              = "INFO",
         std::string log_format             = "%(levelname)s: %(message)s",
-        std::vector<std::string> log_paths = {"/dev/stdout"});
+        std::vector<std::string> log_paths = {"/dev/stdout"},
+        std::function<bool()> running      = []() { return true; });
 
     void waitUntilReady();
 
@@ -78,7 +79,7 @@ private:
 
     void closeServerReadyFds();
 
-    void processRequests();
+    void processRequests(std::function<bool()> stopCondition);
 
     void processSetRequest(std::shared_ptr<Client> client, std::pair<ObjectRequestHeader, Bytes> request);
 

scaler/object_storage/pymod_object_storage_server.cpp

@@ -1,6 +1,8 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+#include <pyerrors.h>
 
+#include "scaler/io/ymq/pymod_ymq/gil.h"
 #include "scaler/object_storage/object_storage_server.h"
 
 extern "C" {
@@ -52,10 +54,19 @@ static PyObject* PyObjectStorageServerRun(PyObject* self, PyObject* args)
         logging_paths.push_back(PyUnicode_AsUTF8(path_obj));
     }
 
+    auto running = []() -> bool {
+        AcquireGIL gil;
+        (void)gil;
+        return PyErr_CheckSignals() == 0;
+    };
+
     ((PyObjectStorageServer*)self)
-        ->server.run(addr, std::to_string(port), identity, log_level, log_format, std::move(logging_paths));
+        ->server.run(
+            addr, std::to_string(port), identity, log_level, log_format, std::move(logging_paths), std::move(running));
 
-    Py_RETURN_NONE;
+    // TODO: Ideally, run should return a bool and we return failure with nullptr.
+    return nullptr;
+    // Py_RETURN_NONE;
 }
 
 static PyObject* PyObjectStorageServerWaitUntilReady(PyObject* self, [[maybe_unused]] PyObject* args)

scaler/version.txt

@@ -1 +1 @@
-1.12.7
+1.12.9

scaler/io/ymq/file_descriptor.h

@@ -1,203 +0,0 @@
-#pragma once
-
-// System
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/socket.h>
-#include <sys/timerfd.h>
-#include <unistd.h>
-
-// C
-#include <cerrno>
-
-// C++
-#include <expected>
-#include <optional>
-
-// First-party
-#include "scaler/io/ymq/common.h"
-
-class FileDescriptor {
-    int fd;
-
-    FileDescriptor(int fd): fd(fd) {}
-
-public:
-    ~FileDescriptor() noexcept(false)
-    {
-        if (auto code = close(fd) < 0)
-            throw std::system_error(errno, std::system_category(), "Failed to close file descriptor");
-
-        this->fd = -1;
-    }
-
-    FileDescriptor(): fd(-1) {}
-
-    // move-only
-    FileDescriptor(const FileDescriptor&)            = delete;
-    FileDescriptor& operator=(const FileDescriptor&) = delete;
-    FileDescriptor(FileDescriptor&& other) noexcept: fd(other.fd)
-    {
-        other.fd = -1;  // prevent double close
-    }
-    FileDescriptor& operator=(FileDescriptor&& other) noexcept
-    {
-        if (this != &other) {
-            if (fd >= 0) {
-                close(fd);  // close current fd
-            }
-            fd       = other.fd;
-            other.fd = -1;  // prevent double close
-        }
-        return *this;
-    }
-
-    static std::expected<FileDescriptor, Errno> socket(int domain, int type, int protocol)
-    {
-        if (int fd = ::socket(domain, type, protocol) < 0) {
-            return std::unexpected {errno};
-        } else {
-            return FileDescriptor(fd);
-        }
-    }
-
-    static std::expected<FileDescriptor, Errno> eventfd(int initval, int flags)
-    {
-        if (int fd = ::eventfd(initval, flags) < 0) {
-            return std::unexpected {errno};
-        } else {
-            return FileDescriptor(fd);
-        }
-    }
-
-    static std::expected<FileDescriptor, Errno> timerfd(clockid_t clock, int flags)
-    {
-        if (int fd = ::timerfd_create(clock, flags) < 0) {
-            return std::unexpected {errno};
-        } else {
-            return FileDescriptor(fd);
-        }
-    }
-
-    static std::expected<FileDescriptor, Errno> epollfd()
-    {
-        if (int fd = ::epoll_create1(0) < 0) {
-            return std::unexpected {errno};
-        } else {
-            return FileDescriptor(fd);
-        }
-    }
-
-    std::optional<Errno> listen(int backlog)
-    {
-        if (::listen(fd, backlog) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::expected<FileDescriptor, Errno> accept(sockaddr& addr, socklen_t& addrlen)
-    {
-        if (auto fd2 = ::accept(fd, &addr, &addrlen) < 0) {
-            return std::unexpected {errno};
-        } else {
-            return FileDescriptor(fd2);
-        }
-    }
-
-    std::optional<Errno> connect(const sockaddr& addr, socklen_t addrlen)
-    {
-        if (::connect(fd, &addr, addrlen) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::optional<Errno> bind(const sockaddr& addr, socklen_t addrlen)
-    {
-        if (::bind(fd, &addr, addrlen) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::expected<ssize_t, Errno> read(void* buf, size_t count)
-    {
-        ssize_t n = ::read(fd, buf, count);
-        if (n < 0) {
-            return std::unexpected {errno};
-        } else {
-            return n;
-        }
-    }
-
-    std::expected<ssize_t, Errno> write(const void* buf, size_t count)
-    {
-        ssize_t n = ::write(fd, buf, count);
-        if (n < 0) {
-            return std::unexpected {errno};
-        } else {
-            return n;
-        }
-    }
-
-    std::optional<Errno> eventfd_signal()
-    {
-        uint64_t u = 1;
-        if (::eventfd_write(fd, u) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::optional<Errno> eventfd_wait()
-    {
-        uint64_t u;
-        if (::eventfd_read(fd, &u) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::optional<Errno> timerfd_settime(const itimerspec& new_value, itimerspec* old_value = nullptr)
-    {
-        if (::timerfd_settime(fd, 0, &new_value, old_value) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::optional<Errno> timerfd_wait()
-    {
-        uint64_t u;
-        if (::read(fd, &u, sizeof(u)) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::optional<Errno> epoll_ctl(int op, FileDescriptor& other, epoll_event* event)
-    {
-        if (::epoll_ctl(fd, op, other.fd, event) < 0) {
-            return errno;
-        } else {
-            return std::nullopt;
-        }
-    }
-
-    std::expected<int, Errno> epoll_wait(epoll_event* events, int maxevents, int timeout)
-    {
-        if (auto n = ::epoll_wait(fd, events, maxevents, timeout) < 0) {
-            return errno;
-        } else {
-            return n;
-        }
-    }
-};