Async: Move AsyncFileClose return code to completion data

Author: Pagghiu

Libraries/Async/Async.h

@@ -788,17 +788,17 @@ struct AsyncFileClose : public AsyncRequest
     AsyncFileClose() : AsyncRequest(Type::FileClose) {}
 
     /// @brief Completion data for AsyncFileClose
-    using CompletionData = AsyncCompletionData;
+    struct CompletionData : public AsyncCompletionData
+    {
+        int code = 0; ///< Return code of close file operation
+    };
 
     /// @brief Callback result for AsyncFileClose
     using Result = AsyncResultOf<AsyncFileClose, CompletionData>;
 
     /// @brief Sets async request members and calls AsyncEventLoop::start
     SC::Result start(AsyncEventLoop& eventLoop, FileDescriptor::Handle fileDescriptor);
 
-    // TODO: Move code to CompletionData
-    int code = 0; ///< Return code of close socket operation
-
     Function<void(Result&)> callback; ///< Callback called after fully closing the file descriptor
 
   private:

Libraries/Async/Internal/AsyncLinux.inl

@@ -605,7 +605,9 @@ struct SC::AsyncEventLoop::Internal::KernelEventsIoURing
 
     Result completeAsync(AsyncFileClose::Result& result)
     {
-        result.returnCode = Result(true);
+        io_uring_cqe& completion   = events[result.eventIndex];
+        result.returnCode          = Result(true);
+        result.completionData.code = completion.res;
         return Result(true);
     }
 

Libraries/Async/Internal/AsyncPosix.inl

@@ -299,7 +299,7 @@ struct SC::AsyncEventLoop::Internal::KernelQueuePosix
 #if SC_ASYNC_USE_EPOLL
         constexpr auto VALUE = EPOLL_CTL_ADD;
 #else
-        constexpr auto VALUE = EV_ADD | EV_ENABLE;
+        constexpr auto VALUE = EV_ADD;
 #endif
         return setSingleWatcherImmediate<VALUE>(eventLoop, handle, filter);
     }
@@ -389,7 +389,7 @@ struct SC::AsyncEventLoop::Internal::KernelEventsPosix
     Result setEventWatcher(AsyncEventLoop& eventLoop, AsyncRequest& async, int fileDescriptor, short filter,
                            unsigned int options = 0)
     {
-        EV_SET(events + newEvents, fileDescriptor, filter, EV_ADD | EV_ENABLE, options, 0, &async);
+        EV_SET(events + newEvents, fileDescriptor, filter, EV_ADD, options, 0, &async);
         newEvents += 1;
         if (newEvents >= totalNumEvents)
         {
@@ -1001,13 +1001,21 @@ struct SC::AsyncEventLoop::Internal::KernelEventsPosix
     //-------------------------------------------------------------------------------------------------------
     Result setupAsync(AsyncEventLoop&, AsyncFileClose& async)
     {
-        // TODO: Allow running close on thread pool
         async.flags |= Internal::Flag_ManualCompletion;
-        async.code = ::close(async.handle);
-        SC_TRY_MSG(async.code == 0, "Close returned error");
         return Result(true);
     }
 
+    static Result executeOperation(AsyncFileClose& async, AsyncFileClose::CompletionData& completionData)
+    {
+        completionData.code = ::close(async.handle);
+        return Result(true);
+    }
+
+    Result completeAsync(AsyncFileClose::Result& result)
+    {
+        return executeOperation(result.getAsync(), result.completionData);
+    }
+
     //-------------------------------------------------------------------------------------------------------
     // Process EXIT
     //-------------------------------------------------------------------------------------------------------

Libraries/Async/Internal/AsyncWindows.inl

@@ -692,13 +692,21 @@ struct SC::AsyncEventLoop::Internal::KernelEvents
     //-------------------------------------------------------------------------------------------------------
     Result setupAsync(AsyncEventLoop&, AsyncFileClose& async)
     {
-        // TODO: Allow running close on thread pool
         async.flags |= Internal::Flag_ManualCompletion;
-        async.code = ::CloseHandle(async.handle) == FALSE ? -1 : 0;
-        SC_TRY_MSG(async.code == 0, "Close returned error");
         return Result(true);
     }
 
+    static Result executeOperation(AsyncFileClose& async, AsyncFileClose::CompletionData& completionData)
+    {
+        completionData.code = ::CloseHandle(async.handle);
+        return Result(true);
+    }
+
+    Result completeAsync(AsyncFileClose::Result& result)
+    {
+        return executeOperation(result.getAsync(), result.completionData);
+    }
+
     //-------------------------------------------------------------------------------------------------------
     // Process EXIT
     //-------------------------------------------------------------------------------------------------------

Tests/SCTest/SC Spaces.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Stefano Cristiano
+// SPDX-License-Identifier: MIT
+
 // The only reason why this file exists is to test that build system can handle spaces in files
 #ifndef SC_SPACES_SPECIFIC_DEFINE
 // This is a define specific to this file that has been created in SC-Build.cpp as a tests