Optimize the error log for failed io_uring creation

Author: matyhtf

include/swoole_log.h

@@ -148,7 +148,7 @@ swoole::Logger *sw_logger();
 
 #define swoole_error(str, ...)                                                                                         \
     do {                                                                                                               \
-        size_t _sw_error_len = sw_snprintf(sw_error, SW_ERROR_MSG_SIZE, str, ##__VA_ARGS__);                           \
+        size_t _sw_error_len = sw_snprintf(sw_error, SW_ERROR_MSG_SIZE, "%s(): " str, __SW_FUNC__, ##__VA_ARGS__);     \
         sw_logger()->put(SW_LOG_ERROR, sw_error, _sw_error_len);                                                       \
         swoole_exit(1);                                                                                                \
     } while (0)

src/coroutine/iouring.cc

@@ -93,20 +93,17 @@ Iouring::Iouring(Reactor *_reactor) {
     int ret =
         io_uring_queue_init(entries, &ring, (SwooleG.iouring_flag == IORING_SETUP_SQPOLL ? IORING_SETUP_SQPOLL : 0));
     if (ret < 0) {
-        swoole_error_log(
-            SW_LOG_WARNING, SW_ERROR_SYSTEM_CALL_FAIL, "Create io_uring failed, the error code is %d", -ret);
+        errno = -ret;
+        swoole_sys_error("Failed to initialize io_uring instance");
         return;
     }
 
     if (SwooleG.iouring_workers > 0) {
         uint32_t workers[2] = {SwooleG.iouring_workers, SwooleG.iouring_workers};
         ret = io_uring_register_iowq_max_workers(&ring, workers);
-
         if (ret < 0) {
-            swoole_error_log(SW_LOG_WARNING,
-                             SW_ERROR_SYSTEM_CALL_FAIL,
-                             "Failed to increase io_uring async workers, the error code is %d",
-                             -ret);
+            errno = -ret;
+            swoole_sys_error("Failed to set the maximum of io_uring async workers");
             return;
         }
     }
@@ -116,17 +113,13 @@ Iouring::Iouring(Reactor *_reactor) {
 
 #ifdef HAVE_IOURING_FUTEX
     if (!(major >= 6 && minor >= 7)) {
-        swoole_error_log(SW_LOG_WARNING,
-                         SW_ERROR_OPERATION_NOT_SUPPORT,
-                         "The Iouring::futex_wait()/Iouring::futex_wakeup() requires `6.7` or higher Linux kernel");
+        swoole_error("The Iouring::futex_wait()/Iouring::futex_wakeup() requires `6.7` or higher Linux kernel");
     }
 #endif
 
 #ifdef HAVE_IOURING_FTRUNCATE
     if (!(major >= 6 && minor >= 9)) {
-        swoole_error_log(SW_LOG_WARNING,
-                         SW_ERROR_OPERATION_NOT_SUPPORT,
-                         "The Iouring::ftruncate() requires `6.9` or higher Linux kernel");
+        swoole_error("The Iouring::ftruncate() requires `6.9` or higher Linux kernel");
     }
 #endif
 
@@ -155,9 +148,11 @@ Iouring::Iouring(Reactor *_reactor) {
         SwooleTG.iouring->submit(true);
     });
 
-    reactor->add(ring_socket, SW_EVENT_READ);
-
     reactor->iouring_interrupt_handler = [this](Reactor *reactor) { wakeup(); };
+
+    if (reactor->add(ring_socket, SW_EVENT_READ) == SW_ERR) {
+        swoole_sys_error("Failed to add io_uring ring fd to the event loop");
+    }
 }
 
 Iouring::~Iouring() {
@@ -350,15 +345,9 @@ void Iouring::submit(bool immediately) {
 Iouring *Iouring::get_instance() {
     if (sw_unlikely(!SwooleTG.iouring)) {
         if (!swoole_event_is_available()) {
-            swoole_warning("no event loop, cannot initialized");
-            throw Exception(SW_ERROR_WRONG_OPERATION);
-        }
-        auto iouring = new Iouring(sw_reactor());
-        if (!iouring->ready()) {
-            delete iouring;
-            return nullptr;
+            swoole_error("The event loop is unavailable, unable to create io_uring instance.");
         }
-        SwooleTG.iouring = iouring;
+        SwooleTG.iouring = new Iouring(sw_reactor());
     }
     return SwooleTG.iouring;
 }