Merge upstream/master into master

intermedia-net · Jan 26, 2025 · c25ef92 · c25ef92
2 parents 9745995 + a89917e
commit c25ef92
Show file tree

Hide file tree

Showing 39 changed files with 287 additions and 202 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -6,8 +6,8 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 env:
-  CI_ARGS: ${{ vars.CI_UBUNTU_ARGS }}
-  CI_MODE: ${{ vars.CI_MODE }}
+  CI_ARGS: -w 3 --shuffle --stdout-buf 1
+  CI_MODE: --ci-mode
   MAKE_FAST: make -j 3
 jobs:
   default-build:

diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -6,8 +6,8 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 env:
-  CI_ARGS: ${{ vars.CI_MAC_ARGS }}
-  CI_MODE: ${{ vars.CI_MODE }}
+  CI_ARGS: -w 2 --shuffle --stdout-buf 1
+  CI_MODE: --ci-mode
   MAKE_FAST: make -j 2
 jobs:
   default-build:

diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
@@ -5,6 +5,9 @@ on:
       - 'master'
   pull_request:
     types: [opened, synchronize, reopened]
+env:
+  CI_WIN_ARGS: -w 3 --shuffle
+  CI_MODE: --ci-mode
 jobs:
   default:
     runs-on: windows-latest
@@ -82,21 +85,24 @@ jobs:
         $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
         $env:PATH+=";$env:OPENSSL_DIR\bin"
         cd pjlib/bin
-        ./pjlib-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }} ${{ vars.CI_MODE }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjlib-test-i386-Win32-vc14-Release.exe $args $env:CI_MODE
       shell: powershell
     - name: pjlib-util-test
       run: |
         $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
         $env:PATH+=";$env:OPENSSL_DIR\bin"
         cd pjlib-util/bin
-        ./pjlib-util-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjlib-util-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
     - name: pjmedia-test
       run: |
         $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
         $env:PATH+=";$env:OPENSSL_DIR\bin"
         cd pjmedia/bin
-        ./pjmedia-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjmedia-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
 
   openssl-2:
@@ -161,7 +167,8 @@ jobs:
         $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
         $env:PATH+=";$env:OPENSSL_DIR\bin"
         cd pjsip/bin
-        ./pjsip-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjsip-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
     - name: python pjsua tests
       run: |
@@ -214,7 +221,8 @@ jobs:
         $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
         $env:PATH+=";$env:OPENSSL_DIR\bin"
         cd pjnath/bin
-        ./pjnath-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjnath-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
 
   gnu-tls:
@@ -333,28 +341,32 @@ jobs:
         $env:SDL_DIR = Get-Content .\sdl_dir.txt
         $env:PATH+=";$env:SDL_DIR\lib\x86;"
         cd pjlib/bin
-        ./pjlib-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }} ${{ vars.CI_MODE }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjlib-test-i386-Win32-vc14-Release.exe $args $env:CI_MODE
       shell: powershell
     - name: pjlib-util-test
       run: |
         $env:SDL_DIR = Get-Content .\sdl_dir.txt
         $env:PATH+=";$env:SDL_DIR\lib\x86;"
         cd pjlib-util/bin
-        ./pjlib-util-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjlib-util-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
     - name: pjmedia-test
       run: |
         $env:SDL_DIR = Get-Content .\sdl_dir.txt
         $env:PATH+=";$env:SDL_DIR\lib\x86;"
         cd pjmedia/bin
-        ./pjmedia-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjmedia-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
     - name: pjnath-test
       run: |
         $env:SDL_DIR = Get-Content .\sdl_dir.txt
         $env:PATH+=";$env:SDL_DIR\lib\x86;"
         cd pjnath/bin
-        ./pjnath-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }} ${{ vars.CI_MODE }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjnath-test-i386-Win32-vc14-Release.exe $args $env:CI_MODE
       shell: powershell
 
   vid-libvpx-schannel-2:
@@ -517,7 +529,8 @@ jobs:
         $env:SDL_DIR = Get-Content .\sdl_dir.txt
         $env:PATH+=";$env:SDL_DIR\lib\x86;"
         cd pjsip/bin
-        ./pjsip-test-i386-Win32-vc14-Release.exe ${{ vars.CI_WIN_ARGS }}
+        $args = $env:CI_WIN_ARGS -split ' '
+        ./pjsip-test-i386-Win32-vc14-Release.exe $args
       shell: powershell
 
   build-win-vid-ffmpeg:

diff --git a/aconfigure b/aconfigure
@@ -732,7 +732,6 @@ ac_external_gsm
 ac_external_speex
 ac_no_pjsua2
 ac_shared_libraries
-ac_linux_poll
 ac_os_objs
 ac_std_cpp_lib
 ac_target_arch
@@ -6839,32 +6838,33 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
 printf %s "checking ioqueue backend... " >&6; }
 
-ac_os_objs=ioqueue_select.o
-ac_linux_poll=select
-
 case $target in
     *darwin* | *bsd*)
         # Check whether --enable-kqueue was given.
 if test ${enable_kqueue+y}
 then :
   enableval=$enable_kqueue;
                 if test "$enable_kqueue" = "yes"; then
-                    ac_os_objs=ioqueue_kqueue.o
                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: kqueue()" >&5
 printf "%s\n" "kqueue()" >&6; }
+                    printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_KQUEUE" >>confdefs.h
+
                 else
                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
 printf "%s\n" "select()" >&6; }
+                    printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_SELECT" >>confdefs.h
+
                 fi
 
 else case e in #(
   e)
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
 printf "%s\n" "select()" >&6; }
+                printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_SELECT" >>confdefs.h
+
 
          ;;
 esac
@@ -6877,21 +6877,23 @@ if test ${enable_epoll+y}
 then :
   enableval=$enable_epoll;
                 if test "$enable_epoll" = "yes"; then
-                    ac_os_objs=ioqueue_epoll.o
                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
 printf "%s\n" "/dev/epoll" >&6; }
-                    printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
+                    printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_EPOLL" >>confdefs.h
 
-                    ac_linux_poll=epoll
                 else
                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
 printf "%s\n" "select()" >&6; }
+                    printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_SELECT" >>confdefs.h
+
                 fi
 
 else case e in #(
   e)
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
 printf "%s\n" "select()" >&6; }
+                printf "%s\n" "#define PJ_IOQUEUE_IMP PJ_IOQUEUE_IMP_SELECT" >>confdefs.h
+
 
          ;;
 esac

diff --git a/aconfigure.ac b/aconfigure.ac
@@ -569,26 +569,24 @@ dnl ######################
 dnl # ioqueue selection
 dnl #
 AC_SUBST(ac_os_objs)
-AC_SUBST(ac_linux_poll)
 AC_MSG_CHECKING([ioqueue backend])
 
-ac_os_objs=ioqueue_select.o
-ac_linux_poll=select
-
 case $target in
     *darwin* | *bsd*)
         AC_ARG_ENABLE(kqueue,
             AS_HELP_STRING([--enable-kqueue], [Use kqueue ioqueue on macos/BSD (experimental)]),
             [
                 if test "$enable_kqueue" = "yes"; then
-                    ac_os_objs=ioqueue_kqueue.o
                     AC_MSG_RESULT([kqueue()])
+                    AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_KQUEUE)
                 else
                     AC_MSG_RESULT([select()])
+                    AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_SELECT)
                 fi
             ],
             [
                 AC_MSG_RESULT([select()])
+                AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_SELECT)
             ]
         )
         ;;
@@ -597,16 +595,16 @@ case $target in
             AS_HELP_STRING([--enable-epoll], [Use /dev/epoll ioqueue on Linux (experimental)]),
             [
                 if test "$enable_epoll" = "yes"; then
-                    ac_os_objs=ioqueue_epoll.o
                     AC_MSG_RESULT([/dev/epoll])
-                    AC_DEFINE(PJ_HAS_LINUX_EPOLL,1)
-                    ac_linux_poll=epoll
+                    AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_EPOLL)
                 else
                     AC_MSG_RESULT([select()])
+                    AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_SELECT)
                 fi
             ],
             [
                 AC_MSG_RESULT([select()])
+                AC_DEFINE(PJ_IOQUEUE_IMP, PJ_IOQUEUE_IMP_SELECT)
             ]
         )
         ;;

diff --git a/pjlib-util/src/pjlib-util-test/resolver_test.c b/pjlib-util/src/pjlib-util-test/resolver_test.c
@@ -1018,7 +1018,7 @@ static int simple_test(void)
                     NULL, return -300);
 
     pj_sem_wait(sem);
-    pj_thread_sleep(set.qretr_delay * 1.2);
+    pj_thread_sleep((unsigned)(set.qretr_delay * 1.2));
 
 
     /* Both servers must get packet */

diff --git a/pjlib-util/src/pjlib-util-test/test.c b/pjlib-util/src/pjlib-util-test/test.c
@@ -24,8 +24,10 @@
 
 pj_pool_factory *mem;
 struct test_app_t test_app = {
-    .param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
-                       PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT,
+    {0},            /* ut_app */
+    PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
+        PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT,
+                    /* param_log_decor */
 };
 
 void app_perror(const char *msg, pj_status_t rc)

diff --git a/pjlib/build/os-auto.mak.in b/pjlib/build/os-auto.mak.in
@@ -10,6 +10,7 @@ AC_OS_OBJS=@ac_os_objs@
 #
 export PJLIB_OBJS +=    $(AC_OS_OBJS) \
                         addr_resolv_sock.o \
+                        ioqueue_dummy.o ioqueue_epoll.o ioqueue_kqueue.o ioqueue_select.o \
                         log_writer_stdout.o \
                         os_timestamp_common.o \
                         pool_policy_malloc.o sock_bsd.o sock_select.o

diff --git a/pjlib/build/pjlib.vcproj b/pjlib/build/pjlib.vcproj
@@ -5405,7 +5405,6 @@
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5415,7 +5414,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5425,7 +5423,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5435,7 +5432,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5445,7 +5441,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-Static|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5455,7 +5450,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-Static|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5465,7 +5459,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-Dynamic|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5475,7 +5468,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-Dynamic|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5485,7 +5477,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-Dynamic|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5495,7 +5486,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-Dynamic|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5505,7 +5495,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-Static|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5515,7 +5504,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-Static|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"