polyphony 0.98 → 0.99.1

data/test/test_socket.rb

@@ -3,6 +3,7 @@
 require_relative 'helper'
 require 'fileutils'
 require 'msgpack'
+require 'localhost/authority'
 
 class TCPSocketTest < MiniTest::Test
   def start_tcp_server_on_random_port(host = '127.0.0.1')
@@ -322,3 +323,159 @@ if IS_LINUX
     end
   end
 end
+
+class SSLSocketTest < MiniTest::Test
+  def handle_http_request(socket)
+    while (data = socket.gets("\n", 8192))
+      if data.chomp.empty?
+        socket << "HTTP/1.1 200 OK\nConnection: close\nContent-Length: 3\n\nfoo"
+        break
+      end
+    end
+  end
+
+  def test_ssl_accept_loop
+    authority = Localhost::Authority.fetch
+    server_ctx = authority.server_context
+    
+    opts = {
+      reuse_addr:     true,
+      dont_linger:    true,
+      secure_context: server_ctx
+    }
+    
+    port = rand(10001..39999)
+    server = Polyphony::Net.tcp_listen('127.0.0.1', port, opts)
+    f = spin do
+      server.accept_loop { |s| handle_http_request(s) }
+    end
+
+    # make bad request
+    `curl -s http://localhost:#{port}/`
+
+    msg = `curl -sk https://localhost:#{port}/`
+    assert_equal 'foo', msg
+
+    f.stop
+    f.await
+
+    port = rand(10001..39999)
+    server = Polyphony::Net.tcp_listen('127.0.0.1', port, opts)
+    errors = []
+    f = spin do
+      ## without ignoring errors
+      f2 = spin do
+        server.accept_loop(false) { |s| handle_http_request(s) }
+      end
+      f2.await
+    rescue => e
+      errors << e
+    end
+
+    msg = `curl -sk https://localhost:#{port}/`
+    assert_equal 'foo', msg
+
+    # make bad request
+    `curl -s http://localhost:#{port}/`
+
+    f.await
+    assert_equal 1, errors.size
+    assert_kind_of OpenSSL::SSL::SSLError, errors.first
+  end
+end
+
+class MultishotAcceptTest < MiniTest::Test
+  def setup
+    skip if !TCPServer.instance_methods(false).include?(:multishot_accept)
+  end
+
+  def start_tcp_server_on_random_port(host = '127.0.0.1')
+    port = rand(1100..60000)
+    server = TCPServer.new(host, port)
+    [port, server]
+  rescue Errno::EADDRINUSE
+    retry
+  end
+
+  def test_multishot_accept_while_loop
+    port, server = start_tcp_server_on_random_port
+    server_fiber = spin do
+      server.multishot_accept do
+        while (socket = server.accept)
+          spin do
+            while (data = socket.gets(8192))
+              socket << data
+            end
+          end
+        end
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('127.0.0.1', port)
+    client.write("1234\n")
+    assert_equal "1234\n", client.recv(8192)
+    client.close
+
+    client = TCPSocket.new('127.0.0.1', port)
+    client.write("5678\n")
+    assert_equal "5678\n", client.recv(8192)
+    client.close
+
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
+  def spin_client(socket)
+    spin do
+      while (data = socket.gets(8192))
+        socket << data
+      end
+    end
+  end
+
+  def test_multishot_accept_loop
+    port, server = start_tcp_server_on_random_port
+    server_fiber = spin do
+      server.multishot_accept do
+        server.accept_loop { |s| spin_client(s) }
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('127.0.0.1', port)
+    client.write("1234\n")
+    assert_equal "1234\n", client.recv(8192)
+    client.close
+
+    client = TCPSocket.new('127.0.0.1', port)
+    client.write("5678\n")
+    assert_equal "5678\n", client.recv(8192)
+    client.close
+
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
+  def test_multishot_accept_error
+    port, server = start_tcp_server_on_random_port
+    error = nil
+    server_fiber = spin do
+      server.multishot_accept do
+        server.accept_loop { |s| spin_client(s) }
+      rescue SystemCallError => e
+        error = e
+      end
+    end
+    snooze
+    server.close
+    snooze
+    server_fiber.await
+    assert_kind_of Errno::EBADF, error
+  end
+
+end

data/test/test_sync.rb

@@ -113,4 +113,45 @@ class MutexTest < MiniTest::Test
     receive
     assert !lock.locked?
   end
-end
+
+  def test_lock_unlock
+    m = Polyphony::Mutex.new
+    assert_nil m.locked?
+    assert_equal false, m.owned?
+    assert_raises(ThreadError) { m.unlock }
+
+    m.lock
+    assert_equal Fiber.current, m.locked?
+    assert_equal true, m.owned?
+
+    assert_raises(ThreadError) { m.lock }
+
+    m.unlock
+    assert_nil m.locked?
+    assert_equal false, m.owned?
+  end
+
+  def test_try_lock
+    m = Polyphony::Mutex.new
+
+    r = m.try_lock
+    assert_equal true, r
+
+    r = m.try_lock
+    assert_equal false, r
+
+    this = Fiber.current
+    m.unlock
+    f = spin do
+      m.synchronize { this << 'ok'; sleep 0.2 }
+    end
+
+    assert_equal 'ok', receive
+    r = m.try_lock
+    assert_equal false, r
+
+    f.await
+    r = m.try_lock
+    assert_equal true, r
+  end
+end

data/test/test_timer.rb

@@ -39,18 +39,18 @@ class TimerMoveOnAfterTest < MiniTest::Test
     skip unless IS_LINUX
 
     t0 = Time.now
-    v = @timer.move_on_after(0.01, with_value: :moved_on) do
-      sleep 0.007
+    v = @timer.move_on_after(0.1, with_value: :moved_on) do
+      sleep 0.07
       @timer.reset
-      sleep 0.007
+      sleep 0.07
       @timer.reset
-      sleep 0.007
+      sleep 0.07
       nil
     end
     t1 = Time.now
 
     assert_nil v
-    assert_in_range 0.015..0.04, t1 - t0
+    assert_in_range 0.15..0.4, t1 - t0
   end
 end
 

data/vendor/liburing/.github/workflows/build.yml

@@ -26,7 +26,8 @@ jobs:
             cxx_pkg: clang
             cc: clang
             cxx: clang++
-            extra_flags: -Wshorten-64-to-32
+            liburing_extra_flags: -Wshorten-64-to-32
+            extra_flags: -Wmissing-prototypes -Wstrict-prototypes -Wunreachable-code-loop-increment -Wunreachable-code -Wmissing-variable-declarations -Wextra-semi-stmt
 
           # x86 (32-bit) gcc
           - arch: i686
@@ -85,10 +86,10 @@ jobs:
             cxx: mips-linux-gnu-g++
 
     env:
-      FLAGS: -g -O3 -Wall -Wextra -Werror
+      FLAGS: -g -O3 -Wall -Wextra -Werror -Wno-sign-compare ${{matrix.extra_flags}}
 
       # Flags for building sources in src/ dir only.
-      LIBURING_CFLAGS: ${{matrix.extra_flags}}
+      LIBURING_CFLAGS: ${{matrix.liburing_extra_flags}}
 
     steps:
     - name: Checkout source
@@ -98,9 +99,9 @@ jobs:
       run: |
         if [[ "${{matrix.cc_pkg}}" == "clang" ]]; then \
             wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh; \
-            sudo bash /tmp/llvm.sh 16; \
-            sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 400; \
-            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 400; \
+            sudo bash /tmp/llvm.sh 17; \
+            sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 400; \
+            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 400; \
         else \
             sudo apt-get update -y; \
             sudo apt-get install -y ${{matrix.cc_pkg}} ${{matrix.cxx_pkg}}; \
@@ -116,16 +117,6 @@ jobs:
         ./configure --cc=${{matrix.cc}} --cxx=${{matrix.cxx}};
         make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS";
 
-    - name: Build nolibc
-      run: |
-        if [[ "${{matrix.arch}}" == "x86_64" || "${{matrix.arch}}" == "i686" || "${{matrix.arch}}" == "aarch64" ]]; then \
-            make clean; \
-            ./configure --cc=${{matrix.cc}} --cxx=${{matrix.cxx}} --nolibc; \
-            make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS"; \
-        else \
-            echo "Skipping nolibc build, this arch doesn't support building liburing without libc"; \
-        fi;
-
     - name: Test install command
       run: |
         sudo make install;

data/vendor/liburing/.gitignore

@@ -9,8 +9,12 @@
 
 /src/liburing.a
 /src/liburing.so*
+/src/liburing-ffi.a
+/src/liburing-ffi.so*
 /src/include/liburing/compat.h
+/src/include/liburing/io_uring_version.h
 
+/examples/io_uring-close-test
 /examples/io_uring-cp
 /examples/io_uring-test
 /examples/io_uring-udp
@@ -28,5 +32,6 @@ config-host.mak
 config.log
 
 liburing.pc
+liburing-ffi.pc
 
 cscope.out

data/vendor/liburing/CHANGELOG

@@ -1,8 +1,30 @@
+liburing-2.4 release
+
+- Add io_uring_{major,minor,check}_version() functions.
+- Add IO_URING_{MAJOR,MINOR,CHECK}_VERSION() macros.
+- FFI support (for non-C/C++ languages integration).
+- Add io_uring_prep_msg_ring_cqe_flags() function.
+- Deprecate --nolibc configure option.
+- CONFIG_NOLIBC is always enabled on x86-64, x86, and aarch64.
+- Add support for IORING_REGISTER_USE_REGISTERED_RING and use if available.
+- Add io_uring_close_ring_fd() function.
+
 liburing-2.3 release
 
 - Support non-libc build for aarch64.
 - Add io_uring_{enter,enter2,register,setup} syscall functions.
-
+- Add sync cancel interface, io_uring_register_sync_cancel().
+- Fix return value of io_uring_submit_and_wait_timeout() to match the
+  man page.
+- Improvements to the regression tests
+- Add support and test case for passthrough IO
+- Add recv and recvmsg multishot helpers and support
+- Add documentation and support for IORING_SETUP_DEFER_TASKRUN
+- Fix potential missing kernel entry with IORING_SETUP_IOPOLL
+- Add support and documentation for zero-copy network transmit
+- Various optimizations
+- Many cleanups
+- Many man page additions and updates
 
 liburing-2.2 release
 

data/vendor/liburing/Makefile

@@ -25,7 +25,7 @@ runtests-parallel: all
 	@$(MAKE) -C test runtests-parallel
 
 config-host.mak: configure
-	@if [ ! -e "$@" ]; then					\
+	+@if [ ! -e "$@" ]; then				\
 	  echo "Running configure ...";				\
 	  ./configure;						\
 	else							\
@@ -45,13 +45,14 @@ endif
 	    -e "s%@VERSION@%$(VERSION)%g" \
 	    $< >$@
 
-install: $(NAME).pc
+install: $(NAME).pc $(NAME)-ffi.pc
 	@$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) \
 		includedir=$(DESTDIR)$(includedir) \
 		libdir=$(DESTDIR)$(libdir) \
 		libdevdir=$(DESTDIR)$(libdevdir) \
 		relativelibdir=$(relativelibdir)
 	$(INSTALL) -D -m 644 $(NAME).pc $(DESTDIR)$(libdevdir)/pkgconfig/$(NAME).pc
+	$(INSTALL) -D -m 644 $(NAME)-ffi.pc $(DESTDIR)$(libdevdir)/pkgconfig/$(NAME)-ffi.pc
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man2
 	$(INSTALL) -m 644 man/*.2 $(DESTDIR)$(mandir)/man2
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
@@ -63,7 +64,7 @@ install-tests:
 	@$(MAKE) -C test install prefix=$(DESTDIR)$(prefix) datadir=$(DESTDIR)$(datadir)
 
 clean:
-	@rm -f config-host.mak config-host.h cscope.out $(NAME).pc test/*.dmesg
+	@rm -f config-host.mak config-host.h cscope.out $(NAME).pc $(NAME)-ffi.pc test/*.dmesg
 	@$(MAKE) -C src clean
 	@$(MAKE) -C test clean
 	@$(MAKE) -C examples clean

data/vendor/liburing/Makefile.common

@@ -3,4 +3,5 @@ NAME=liburing
 SPECFILE=$(TOP)/$(NAME).spec
 VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE))
 VERSION_MAJOR=$(shell echo $(VERSION) | cut -d. -f1)
+VERSION_MINOR=$(shell echo $(VERSION) | cut -d. -f2)
 TAG = $(NAME)-$(VERSION)

data/vendor/liburing/README

@@ -47,6 +47,54 @@ the kernel io_uring support. Please note that this suite isn't expected to
 pass on older kernels, and may even crash or hang older kernels!
 
 
+Building liburing
+-----------------
+
+    #
+    # Prepare build config (optional).
+    #
+    #  --cc  specifies the C   compiler.
+    #  --cxx speficies the C++ compiler.
+    #
+    ./configure --cc=gcc --cxx=g++;
+
+    #
+    # Build liburing.
+    #
+    make -j$(nproc);
+
+    #
+    # Install liburing (headers, shared/static libs, and manpage).
+    #
+    sudo make install;
+
+See './configure --help' for more information about build config options.
+
+
+FFI support
+-----------
+
+By default, the build results in 4 lib files:
+
+    2 shared libs:
+
+        liburing.so
+        liburing-ffi.so
+
+    2 static libs:
+
+        liburing.a
+        liburing-ffi.a
+
+Languages and applications that can't use 'static inline' functions in
+liburing.h should use the FFI variants.
+
+liburing's main public interface lives in liburing.h as 'static inline'
+functions. Users wishing to consume liburing purely as a binary dependency
+should link against liburing-ffi. It contains definitions for every 'static
+inline' function.
+
+
 License
 -------
 

data/vendor/liburing/configure

@@ -5,6 +5,22 @@ set -e
 cc=${CC:-gcc}
 cxx=${CXX:-g++}
 
+#
+# TODO(ammarfaizi2): Remove this notice and `--nolibc` option.
+#
+nolibc_deprecated() {
+  echo "";
+  echo "=================================================================";
+  echo "";
+  echo "  --nolibc option is deprecated and has no effect.";
+  echo "  It will be removed in a future liburing release.";
+  echo "";
+  echo "  liburing on x86-64, x86 (32-bit) and aarch64 always use CONFIG_NOLIBC.";
+  echo "";
+  echo "=================================================================";
+  echo "";
+}
+
 for opt do
   optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)' || true)
   case "$opt" in
@@ -26,7 +42,7 @@ for opt do
   ;;
   --cxx=*) cxx="$optarg"
   ;;
-  --nolibc) liburing_nolibc="yes"
+  --nolibc) nolibc_deprecated
   ;;
   *)
     echo "ERROR: unknown option $opt"
@@ -115,7 +131,7 @@ print_config() {
 }
 
 # Default CFLAGS
-CFLAGS="-D_GNU_SOURCE -include config-host.h"
+CFLAGS="-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -include config-host.h"
 BUILD_CFLAGS=""
 
 # Print configure header at the top of $config_host_h
@@ -385,13 +401,43 @@ fi
 print_config "NVMe uring command support" "$nvme_uring_cmd"
 
 #############################################################################
+#
+# Currently, CONFIG_NOLIBC is only enabled on x86-64, x86 (32-bit) and aarch64.
+#
+cat > $TMPC << EOF
+int main(void){
+#if defined(__x86_64__) || defined(__i386__) || defined(__aarch64__)
+  return 0;
+#else
+#error libc is needed
+#endif
+}
+EOF
+if compile_prog "" "" "nolibc support"; then
+  liburing_nolibc="yes"
+fi
+print_config "nolibc support" "$liburing_nolibc";
+#############################################################################
+
+####################################################
+# Most Android devices don't have sys/fanotify.h
+has_fanotify="no"
+cat > $TMPC << EOF
+#include <sys/fanotify.h>
+int main(void)
+{
+  return 0;
+}
+EOF
+if compile_prog "" "" "fanotify"; then
+  has_fanotify="yes"
+fi
+print_config "has_fanotify" "$has_fanotify"
+####################################################
+
 if test "$liburing_nolibc" = "yes"; then
   output_sym "CONFIG_NOLIBC"
-else
-  liburing_nolibc="no"
 fi
-print_config "liburing_nolibc" "$liburing_nolibc"
-
 if test "$__kernel_rwf_t" = "yes"; then
   output_sym "CONFIG_HAVE_KERNEL_RWF_T"
 fi
@@ -422,12 +468,31 @@ fi
 if test "$nvme_uring_cmd" = "yes"; then
   output_sym "CONFIG_HAVE_NVME_URING"
 fi
+if test "$has_fanotify" = "yes"; then
+  output_sym "CONFIG_HAVE_FANOTIFY"
+fi
 
 echo "CC=$cc" >> $config_host_mak
 print_config "CC" "$cc"
 echo "CXX=$cxx" >> $config_host_mak
 print_config "CXX" "$cxx"
 
+# generate io_uring_version.h
+MAKE_PRINT_VARS="include Makefile.common\nprint-%: ; @echo \$(\$*)\n"
+VERSION_MAJOR=$(env echo -e "$MAKE_PRINT_VARS" | make -s --no-print-directory -f - print-VERSION_MAJOR)
+VERSION_MINOR=$(env echo -e "$MAKE_PRINT_VARS" | make -s --no-print-directory -f - print-VERSION_MINOR)
+io_uring_version_h="src/include/liburing/io_uring_version.h"
+cat > $io_uring_version_h << EOF
+/* SPDX-License-Identifier: MIT */
+#ifndef LIBURING_VERSION_H
+#define LIBURING_VERSION_H
+
+#define IO_URING_VERSION_MAJOR $VERSION_MAJOR
+#define IO_URING_VERSION_MINOR $VERSION_MINOR
+
+#endif
+EOF
+
 # generate compat.h
 compat_h="src/include/liburing/compat.h"
 cat > $compat_h << EOF
@@ -452,10 +517,15 @@ struct __kernel_timespec {
 	long long	tv_nsec;
 };
 
+/* <linux/time_types.h> is not available, so it can't be included */
+#define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H 1
+
 EOF
 else
 cat >> $compat_h << EOF
 #include <linux/time_types.h>
+/* <linux/time_types.h> is included above and not needed again */
+#define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H 1
 
 EOF
 fi

data/vendor/liburing/debian/changelog

@@ -1,3 +1,14 @@
+liburing (2.2-1) stable; urgency=low
+
+  * Update to 2.2
+  * Bump up so version to 2
+  * Drop liburing1-udeb
+  * Package using dh instead of using dh_* helpers manually
+  * Add linux header dependency to liburing-dev
+  * Bump up debhelper-compact level to 13
+
+ -- Kefu Chai <tchaikov@gmail.com>  Sun, 16 Oct 2022 16:30:48 +0800
+
 liburing (0.7-1) stable; urgency=low
 
   * Update to 0.7

data/vendor/liburing/debian/control

@@ -2,13 +2,14 @@ Source: liburing
 Section: libs
 Priority: optional
 Maintainer: Liu Changcheng <changcheng.liu@intel.com>
-Build-Depends: debhelper (>=9)
+Build-Depends:
+  debhelper-compat (= 13)
 Standards-Version: 4.1.4
 Homepage: https://git.kernel.dk/cgit/liburing/tree/README
 Vcs-Git: https://git.kernel.dk/liburing
 Vcs-Browser: https://git.kernel.dk/cgit/liburing/
 
-Package: liburing1
+Package: liburing2
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -21,24 +22,14 @@ Description: userspace library for using io_uring
  .
  This package contains the shared library.
 
-Package: liburing1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Description: userspace library for using io_uring
- io_uring is kernel feature to improve development
- The newese Linux IO interface, io_uring could improve
- system performance a lot. liburing is the userpace
- library to use io_uring feature.
- .
- This package contains the udeb shared library.
-
 Package: liburing-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends}, liburing1 (= ${binary:Version}),
+Depends:
+  ${misc:Depends},
+  liburing2 (= ${binary:Version}),
+  linux-libc-dev (>= 5.1)
 Description: userspace library for using io_uring
  io_uring is kernel feature to improve development
  The newese Linux IO interface, io_uring could improve

data/vendor/liburing/debian/liburing-dev.manpages

@@ -1,6 +1,3 @@
-man/io_uring_setup.2
-man/io_uring_enter.2
-man/io_uring_register.2
-man/io_uring_queue_exit.3
-man/io_uring_queue_init.3
-man/io_uring_get_sqe.3
+usr/share/man/man2/io_uring_*.2
+usr/share/man/man3/io_uring_*.3
+usr/share/man/man7/io_uring.7

data/vendor/liburing/debian/liburing2.install

@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*