opengris-scaler 1.12.7__tar.gz → 1.12.8__tar.gz

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/CMakeLists.txt

@@ -103,6 +103,18 @@ find_package(CapnProto CONFIG REQUIRED)
 get_target_property(CAPNP_INCLUDE_DIRS CapnProto::capnp INTERFACE_INCLUDE_DIRECTORIES)
 message(STATUS "Found Capnp includes in ${CAPNP_INCLUDE_DIRS}")
 
+execute_process(
+  COMMAND python3-config --prefix
+  OUTPUT_VARIABLE PYTHON_PREFIX
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set(Python3_ROOT_DIR "${PYTHON_PREFIX}")
+
+find_package(Python3 REQUIRED COMPONENTS Development.Module)
+message(STATUS "Python version: ${Python3_VERSION}")
+message(STATUS "Python include dirs: ${Python3_INCLUDE_DIRS}")
+message(STATUS "Python ABI: ${Python3_SOABI}")
+
 # Make LSP happy
 include_directories(${CAPNP_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR})

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/PKG-INFO

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

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/examples/cpp/ymq/automated_echo_client.cpp

@@ -40,7 +40,7 @@ int main()
 
     const std::string_view line = longStr;
 
-    for (int cnt = 0; cnt < msgCnt; ++cnt) {
+    for (size_t cnt = 0; cnt < msgCnt; ++cnt) {
         Message message;
         std::string destAddress = "ServerSocket";
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/examples/cpp/ymq/pingpong.cpp

@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
     const std::string_view line = longStr;
 
     time_point<system_clock> start = system_clock::now();
-    for (int cnt = 0; cnt < msgCnt; ++cnt) {
+    for (size_t cnt = 0; cnt < msgCnt; ++cnt) {
         Message message {};
         message.payload = Bytes {const_cast<char*>(line.data()), line.size()};
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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):

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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
 
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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"
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/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
 )

opengris_scaler-1.12.8/scaler/version.txt

@@ -0,0 +1 @@
+1.12.8

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/tests/cpp/ymq/common.h

@@ -28,12 +28,10 @@
 #include <ctime>
 #include <exception>
 #include <filesystem>
-#include <format>
 #include <functional>
 #include <iostream>
 #include <optional>
 #include <print>
-#include <stdexcept>
 #include <string>
 #include <system_error>
 #include <thread>
@@ -471,13 +469,26 @@ inline TestResult run_python(const char* path, std::vector<const wchar_t*> argv
     if (PyStatus_Exception(status))
         goto exception;
 
+    argv.insert(argv.begin(), L"mitm");
+    status = PyConfig_SetArgv(&config, argv.size(), (wchar_t**)argv.data());
+    if (PyStatus_Exception(status))
+        goto exception;
+
+    // pass argv to the script as-is
+    config.parse_argv = 0;
+
     status = Py_InitializeFromConfig(&config);
     if (PyStatus_Exception(status))
         goto exception;
     PyConfig_Clear(&config);
 
-    argv.insert(argv.begin(), L"mitm");
-    PySys_SetArgv(argv.size(), (wchar_t**)argv.data());
+    // add the cwd to the path
+    {
+        PyObject* sysPath = PySys_GetObject("path");
+        PyObject* newPath = PyUnicode_FromString(".");
+        PyList_Append(sysPath, newPath);
+        Py_DECREF(newPath);
+    }
 
     {
         auto file = fopen(path, "r");

{opengris_scaler-1.12.7 → opengris_scaler-1.12.8}/tests/cpp/ymq/py_mitm/main.py

@@ -8,7 +8,6 @@ import argparse
 import os
 import signal
 import subprocess
-import types
 from typing import List
 from scapy.all import IP, TCP, TunTapInterface  # type: ignore
 

opengris_scaler-1.12.7/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;
-        }
-    }
-};

opengris_scaler-1.12.7/scaler/version.txt

@@ -1 +0,0 @@
-1.12.7