update cmake

Author: microcai

example/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.25)
 project(iocp_tests)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 link_libraries(uasync)
 
@@ -13,13 +14,19 @@ link_libraries(ws2_32.lib kernel32.lib ntdll.lib)
 endif()
 
 add_executable(echo_server_callback echo_server/echo_server_callback.cpp)
+set_target_properties(echo_server_callback PROPERTIES FOLDER "examples")
 add_executable(echo_server_stackfull echo_server/echo_server_stackfull.cpp)
+set_target_properties(echo_server_stackfull PROPERTIES FOLDER "examples")
 add_executable(echo_server_stackless echo_server/echo_server_stackless.cpp)
+set_target_properties(echo_server_stackless PROPERTIES FOLDER "examples")
 
 add_executable(web_server web_server/server.cpp)
+set_target_properties(web_server PROPERTIES FOLDER "examples")
 
 add_executable(example_on_zhihu zhihu.cpp)
+set_target_properties(example_on_zhihu PROPERTIES FOLDER "examples")
 
 add_executable(echo_client_stackfull echo_client/echo_client_stackfull.cpp)
+set_target_properties(echo_client_stackfull PROPERTIES FOLDER "examples")
 
 add_subdirectory(unbufcpy)

example/echo_client/echo_client_stackfull.cpp

@@ -31,7 +31,7 @@ static void echo_client(HANDLE iocp_handle, const char* lp_server_addr)
 
 	FiberOVERLAPPED ov;
 
-	auto result = WSAConnectEx(sock, (const SOCKADDR*) &server_addr, INET_ADDRSTRLEN, 0, 0, 0, &ov.ov);
+	auto result = WSAConnectEx(sock, (const SOCKADDR*) &server_addr, INET_ADDRSTRLEN, 0, 0, 0, &ov);
 
 	float c = ov.last_error + 1;
 
@@ -61,7 +61,7 @@ static void echo_client(HANDLE iocp_handle, const char* lp_server_addr)
 
 	DWORD sent = 0;
 
-	result = WSASend(sock, &buf, 1, &sent, 0, &ov.ov, 0);
+	result = WSASend(sock, &buf, 1, &sent, 0, &ov, 0);
 	ov.last_error = WSAGetLastError();
 	if (!(!result && ov.last_error != WSA_IO_PENDING))
 	{
@@ -74,7 +74,7 @@ static void echo_client(HANDLE iocp_handle, const char* lp_server_addr)
 
 	WSABUF readbuf = { .len = sizeof(buffer), .buf = buffer };
 
-	result = WSARecv(sock, &readbuf, 1, &read_bytes, &ignore, &ov.ov, 0);
+	result = WSARecv(sock, &readbuf, 1, &read_bytes, &ignore, &ov, 0);
 	ov.last_error = WSAGetLastError();
 	if (!(!result && ov.last_error != WSA_IO_PENDING))
 	{

example/echo_server/echo_server_stackfull.cpp

@@ -105,7 +105,7 @@ static void echo_sever_client_session(SOCKET client_sock)
 
    DWORD recv_bytes = 0, flag = 0;
 
-   if (WSARecv(client_sock, &wsabuf1, 1, &recv_bytes, &flag, &ov.ov, NULL) == SOCKET_ERROR)
+   if (WSARecv(client_sock, &wsabuf1, 1, &recv_bytes, &flag, &ov, NULL) == SOCKET_ERROR)
    {
       int err = WSAGetLastError();
       if (err != WSA_IO_PENDING)
@@ -130,7 +130,7 @@ static void echo_sever_client_session(SOCKET client_sock)
 
    memset(&ov, 0, sizeof(ov));
 
-   if (WSASend(client_sock, wsabuf, 3, NULL, 0, &ov.ov, NULL) == SOCKET_ERROR)
+   if (WSASend(client_sock, wsabuf, 3, NULL, 0, &ov, NULL) == SOCKET_ERROR)
    {
       int err = WSAGetLastError();
       if (err != WSA_IO_PENDING)
@@ -168,7 +168,7 @@ static void accept_coroutine(SOCKET listener, HANDLE iocp_handle)
 		FiberOVERLAPPED ov;
       DWORD ignore = 0;
 
-		BOOL result = AcceptEx(listener, client_socket, addr_buf, 0, sizeof (SOCKADDR_IN)+16, sizeof (SOCKADDR_IN)+16, &ignore, &ov.ov);
+		BOOL result = AcceptEx(listener, client_socket, addr_buf, 0, sizeof (SOCKADDR_IN)+16, sizeof (SOCKADDR_IN)+16, &ignore, &ov);
 		ov.last_error = WSAGetLastError();
 
 		if (!(!result && ov.last_error != WSA_IO_PENDING))

example/unbufcpy/CMakeLists.txt

@@ -1,3 +1,5 @@
 
 add_executable(unbufcp1 unbufcp1/unbufcp1.c)
 add_executable(unbufcp2 unbufcp2/unbufcp2.cpp)
+set_target_properties(unbufcp1 PROPERTIES FOLDER "examples")
+set_target_properties(unbufcp2 PROPERTIES FOLDER "examples")

uasync/CMakeLists.txt

@@ -5,7 +5,7 @@ option(DISABLE_BOOST_CONTEXT "disable the usa of boost.context asm" OFF)
 option(DISABLE_UCONTEXT "disable ucontext and use setjmp/longjmp" OFF)
 option(USE_ZCONTEXT "use zcontext api to do context switch" OFF)
 
-add_library(uasync INTERFACE)
+add_library(uasync INTERFACE include/awaitable.hpp include/extensable_iocp.hpp include/iocp_callback.hpp include/universal_async.hpp include/universal_fiber.hpp include/universal_fiber.h)
 
 target_include_directories(uasync INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 

uasync/include/universal_fiber.hpp

@@ -110,9 +110,8 @@ struct object_space
 	static constexpr size_t size = stack_align_space<T, alignas_>();
 };
 
-typedef struct FiberOVERLAPPED
-{
-	OVERLAPPED ov;
+typedef struct FiberOVERLAPPED : public OVERLAPPED
+{	
 #if defined (USE_FCONTEXT)
 	fcontext_t target;
 #elif defined(USE_WINFIBER)
@@ -129,34 +128,29 @@ typedef struct FiberOVERLAPPED
 	std::atomic_flag ready;
 	std::atomic_flag resume_flag;
 
-	OVERLAPPED* operator & ()
-	{
-		 return & ov;
-	}
-
     void reset()
     {
-        ov.Internal = ov.InternalHigh = 0;
-        ov.hEvent = NULL;
+        Internal = InternalHigh = 0;
+        hEvent = NULL;
         byte_transfered = 0;
         ready.clear();
 		resume_flag.clear();
     }
 
     void set_offset(uint64_t offset)
     {
-        ov.Offset = offset & 0xFFFFFFFF;
-        ov.OffsetHigh = (offset >> 32);
+        Offset = offset & 0xFFFFFFFF;
+        OffsetHigh = (offset >> 32);
     }
 
     void add_offset(uint64_t offset)
     {
-        uint64_t cur_offset = ov.OffsetHigh;
+        uint64_t cur_offset = OffsetHigh;
         cur_offset <<= 32;
-        cur_offset += ov.Offset;
+        cur_offset += Offset;
         cur_offset += offset;
-        ov.Offset = cur_offset & 0xFFFFFFFF;
-        ov.OffsetHigh = (cur_offset >> 32);
+        Offset = cur_offset & 0xFFFFFFFF;
+        OffsetHigh = (cur_offset >> 32);
     }
 
 	FiberOVERLAPPED()