Implementation attempt: sceNetEpoll things

.clang-format-ignore

@@ -1,2 +1,3 @@
 **/third_party/**
 **/vk_mem_alloc.h
+**/modules/libSceNet/wepoll.*

.vscode/settings.json

@@ -34,6 +34,7 @@
     "third_party/boost",
     "third_party/optick",
     "third_party/magic_enum",
-    "third_part/SDL2"
+    "third_party/SDL2",
+    "third_party/libpng"
   ]
 }

modules/libSceNet/CMakeLists.txt

@@ -4,7 +4,7 @@ include(../setupModule.cmake)
 set(libName libSceNet)
 project(${libName})
 
-add_library(${libName} SHARED entry.cpp epoll.cpp socket.cpp resolver.cpp)
+add_library(${libName} SHARED entry.cpp wepoll.c epoll.cpp socket.cpp resolver.cpp)
 
 target_link_libraries(${libName} ws2_32)
 

modules/libSceNet/epoll.cpp

@@ -1,6 +1,11 @@
 #include "common.h"
 #include "logging.h"
 #include "types.h"
+#include "wepoll.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <WinSock2.h>
+#include <unordered_map>
 
 LOG_DEFINE_MODULE(libSceNet);
 
@@ -10,14 +15,11 @@ union SceNetEpollData {
   uint32_t u32;
 };
 
-enum class SCE_NET_EpollEvent : int {
-  EPOLLIN     = 0x00000001,
-  EPOLLOUT    = 0x00000002,
-  EPOLLERR    = 0x00000008,
-  EPOLLHUP    = 0x00000010,
-  EPOLLDESCID = 0x00010000,
-
-};
+constexpr int SCE_NET_EPOLLIN     = 0x00000001;
+constexpr int SCE_NET_EPOLLOUT    = 0x00000002;
+constexpr int SCE_NET_EPOLLERR    = 0x00000008;
+constexpr int SCE_NET_EPOLLHUP    = 0x00000010;
+constexpr int SCE_NET_EPOLLDESCID = 0x00010000;
 
 struct SceNetEpollEvent {
   uint32_t        events;
@@ -31,27 +33,82 @@ constexpr int SCE_NET_EPOLL_CTL_MOD = 2;
 constexpr int SCE_NET_EPOLL_CTL_DEL = 3;
 
 constexpr int SCE_NET_EPOLL_ABORT_FLAG_PRESERVATION = 0x00000001;
+
+static inline int32_t sce_GetLastError() {
+  auto win_err = (uint32_t)GetLastError();
+  if (win_err == WSANOTINITIALISED) return Err::ERROR_ENOTINIT;
+  return (0x80000000 | (0x041 << 16) | (0x0100 | win_err));
+}
+
+static inline uint32_t sce_map_epoll_events(uint32_t events) {
+  LOG_USE_MODULE(libSceNet);
+  uint32_t _events = 0;
+  if (events & SCE_NET_EPOLLIN) _events |= EPOLLIN;
+  if (events & SCE_NET_EPOLLOUT) _events |= EPOLLOUT;
+  if (events & SCE_NET_EPOLLERR) _events |= EPOLLERR;
+  if (events & SCE_NET_EPOLLHUP) _events |= EPOLLHUP;
+  if (events & SCE_NET_EPOLLDESCID) LOG_CRIT(L"Unhandled epoll event SCE_NET_EPOLLDESCID");
+  return _events;
+}
+
+// Probably the safest way, since sizeof(SceNetId) < sizeof(HANDLE)
+// We cannot guarantee that this HANDLE value will not exceed int32_t
+static std::unordered_map<SceNetId, HANDLE> map;
+
+static HANDLE sce_map_id_get(SceNetId id) {
+  if (map.find(id) != map.end()) return map[id];
+  return INVALID_HANDLE_VALUE;
+}
+
+static HANDLE sce_map_id_del(SceNetId id) {
+  auto it = map.find(id);
+  if (it != map.end()) {
+    auto value = map[id];
+    map.erase(it);
+    return value;
+  }
+  return INVALID_HANDLE_VALUE;
+}
 } // namespace
 
 extern "C" {
 EXPORT SYSV_ABI SceNetId sceNetEpollCreate(const char* name, int flags) {
-  static int id = 0;
-  return ++id;
+  static SceNetId id = 0;
+  HANDLE          ep;
+
+  if ((ep = epoll_create1(flags)) != NULL && ep != INVALID_HANDLE_VALUE) {
+    map[++id] = ep;
+    return id;
+  }
+
+  return sce_GetLastError();
 }
 
 EXPORT SYSV_ABI int sceNetEpollControl(SceNetId eid, int op, SceNetId id, SceNetEpollEvent* event) {
+  epoll_event ev {
+      .events = sce_map_epoll_events(event->events),
+      .data   = {.ptr = event->data.ptr},
+  };
+
+  if (epoll_ctl(sce_map_id_get(eid), op, id, &ev) == SOCKET_ERROR) return sce_GetLastError();
   return Ok;
 }
 
 EXPORT SYSV_ABI int sceNetEpollWait(SceNetId eid, SceNetEpollEvent* events, int maxevents, int timeout) {
+  epoll_event ev {
+      .events = sce_map_epoll_events(events->events),
+      .data   = {.ptr = events->data.ptr},
+  };
+  if (epoll_wait(sce_map_id_get(eid), &ev, maxevents, timeout) == SOCKET_ERROR) return sce_GetLastError();
   return Ok;
 }
 
 EXPORT SYSV_ABI int sceNetEpollDestroy(SceNetId eid) {
+  if (epoll_close(sce_map_id_del(eid)) == SOCKET_ERROR) return sce_GetLastError();
   return Ok;
 }
 
 EXPORT SYSV_ABI int sceNetEpollAbort(SceNetId eid, int flags) {
   return Ok;
 }
-}
+}

modules/libSceNet/socket.cpp

@@ -60,8 +60,11 @@ EXPORT SYSV_ABI int sceNetGetsockname(SceNetId s, SceNetSockaddr* name, SceNetSo
 }
 
 EXPORT SYSV_ABI int sceNetGetsockopt(SceNetId s, int level, int optname, void* optval, SceNetSocklen_t* optlen) {
-  // todo: probably not so cool to make transparent call there
-  return Ok;
+  int _optlen = optlen ? (int)*optlen : sizeof(SceNetSockaddr);
+  int _ret    = getsockopt(s, level, optname, (char*)optval, &_optlen);
+  if (_ret == SOCKET_ERROR) return sce_WSAGetLastError();
+  *optlen = (SceNetSocklen_t)_optlen;
+  return _ret;
 }
 
 EXPORT SYSV_ABI int sceNetListen(SceNetId s, int backlog) {
@@ -104,7 +107,7 @@ EXPORT SYSV_ABI int sceNetSendmsg(SceNetId s, const SceNetMsghdr* msg, int flags
 }
 
 EXPORT SYSV_ABI int sceNetSetsockopt(SceNetId s, int level, int optname, const void* optval, SceNetSocklen_t optlen) {
-  // todo: probably not so cool to make transparent call there
+  if (setsockopt(s, level, optname, (char*)optval, (int)optlen) == SOCKET_ERROR) return sce_WSAGetLastError();
   return Ok;
 }
 

modules/libSceNet/wepoll.h

@@ -0,0 +1,113 @@
+/*
+ * wepoll - epoll for Windows
+ * https://github.com/piscisaureus/wepoll
+ *
+ * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEPOLL_H_
+#define WEPOLL_H_
+
+#ifndef WEPOLL_EXPORT
+#define WEPOLL_EXPORT
+#endif
+
+#include <stdint.h>
+
+enum EPOLL_EVENTS {
+  EPOLLIN      = (int) (1U <<  0),
+  EPOLLPRI     = (int) (1U <<  1),
+  EPOLLOUT     = (int) (1U <<  2),
+  EPOLLERR     = (int) (1U <<  3),
+  EPOLLHUP     = (int) (1U <<  4),
+  EPOLLRDNORM  = (int) (1U <<  6),
+  EPOLLRDBAND  = (int) (1U <<  7),
+  EPOLLWRNORM  = (int) (1U <<  8),
+  EPOLLWRBAND  = (int) (1U <<  9),
+  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
+  EPOLLRDHUP   = (int) (1U << 13),
+  EPOLLONESHOT = (int) (1U << 31)
+};
+
+#define EPOLLIN      (1U <<  0)
+#define EPOLLPRI     (1U <<  1)
+#define EPOLLOUT     (1U <<  2)
+#define EPOLLERR     (1U <<  3)
+#define EPOLLHUP     (1U <<  4)
+#define EPOLLRDNORM  (1U <<  6)
+#define EPOLLRDBAND  (1U <<  7)
+#define EPOLLWRNORM  (1U <<  8)
+#define EPOLLWRBAND  (1U <<  9)
+#define EPOLLMSG     (1U << 10)
+#define EPOLLRDHUP   (1U << 13)
+#define EPOLLONESHOT (1U << 31)
+
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_MOD 2
+#define EPOLL_CTL_DEL 3
+
+typedef void* HANDLE;
+typedef uintptr_t SOCKET;
+
+typedef union epoll_data {
+  void* ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+  SOCKET sock; /* Windows specific */
+  HANDLE hnd;  /* Windows specific */
+} epoll_data_t;
+
+struct epoll_event {
+  uint32_t events;   /* Epoll events and flags */
+  epoll_data_t data; /* User data variable */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WEPOLL_EXPORT HANDLE epoll_create(int size);
+WEPOLL_EXPORT HANDLE epoll_create1(int flags);
+
+WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
+
+WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
+                            int op,
+                            SOCKET sock,
+                            struct epoll_event* event);
+
+WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
+                             struct epoll_event* events,
+                             int maxevents,
+                             int timeout);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* WEPOLL_H_ */