Development: 1.6.0

.appveyor.yml

@@ -5,7 +5,6 @@ configuration:
 image:
   - Visual Studio 2022
   - Visual Studio 2019
-  - Visual Studio 2015
 
 platform:
   - x64

.devcontainer/devcontainer.json

@@ -0,0 +1,19 @@
+{
+  "name": "SRT Development",
+  "dockerFile": "../docker/Dockerfile",
+  "workspaceFolder": "/srt_build_env",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/srt_build_env,type=bind",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+      },
+      "extensions": [
+        "ms-vscode.cpptools",
+        "ms-vscode.cmake-tools",
+        "twxs.cmake"
+      ]
+    }
+  },
+  "remoteUser": "srt-dev"
+}

.github/workflows/abi.yml

@@ -32,7 +32,7 @@ jobs:
       run: |
         sudo apt install -y abi-dumper
         sudo apt install -y tcl
-        cd gitview_pr/_build && cmake --build ./
+        cd gitview_pr/_build && cmake --build ./ --parallel
         make install DESTDIR=./installdir
         SRT_TAG_VERSION=v$(../scripts/get-build-version.tcl full)
         echo "SRT_TAG_VERSION=$SRT_TAG_VERSION" >> "$GITHUB_OUTPUT"
@@ -89,7 +89,7 @@ jobs:
         sudo apt install -y abi-dumper
         sudo apt install -y tcl
         cd gitview_base      
-        cd _build && cmake --build ./
+        cd _build && cmake --build ./ --parallel
         make install DESTDIR=./installdir
         echo "TAGGING BASE BUILD: $SRT_BASE"
         abi-dumper libsrt.so -o libsrt-base.dump -public-headers installdir/usr/local/include/srt/ -lver $SRT_BASE

.github/workflows/cxx03-ubuntu.yaml

@@ -19,7 +19,7 @@ jobs:
     - name: build
       # That below is likely SonarQube remains, which was removed earlier.
       #run: cd _build && build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build .
-      run: cd _build && cmake --build .
+      run: cd _build && make -j -k
     - name: test
       run: |
         cd _build && ctest --extra-verbose

.github/workflows/cxx11-macos.yaml

@@ -24,8 +24,8 @@ jobs:
     - name: configure
       run: |
         mkdir _build && cd _build
-        cmake ../ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=OFF -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DUSE_CXX_STD=17
+        cmake ../ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=OFF -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DUSE_CXX_STD=17 -DENABLE_HEAVY_LOGGING=ON
     - name: build
-      run: cd _build && cmake --build ./
+      run: cd _build &&  make -j -k
     - name: test
       run: cd _build && ctest --extra-verbose

.github/workflows/cxx11-ubuntu.yaml

@@ -17,7 +17,7 @@ jobs:
         mkdir _build && cd _build
         cmake ../ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DENABLE_CODE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
     - name: build
-      run: cd _build && cmake --build .
+      run: cd _build && cmake --build . --parallel
     - name: test
       run: |
         cd _build && ctest --extra-verbose

.github/workflows/cxx11-win.yaml

@@ -19,6 +19,6 @@ jobs:
         md _build && cd _build
         cmake ../ -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=OFF -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_LOCALIF_WIN32=ON -DUSE_CXX_STD=c++11
     - name: build
-      run: cd _build && cmake --build ./ --config Release --verbose
+      run: cd _build && cmake --build ./ --parallel --config Release --verbose
     - name: test
       run: cd _build && ctest -E "TestIPv6.v6_calls_v4|TestConnectionTimeout.BlockingLoop" --extra-verbose -C Release

.github/workflows/iOS.yaml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        cxxstdsync: [OFF, ON]
+        cxxstdsync: [ON] #[OFF, ON] # cxxsync=off is Linux-gcc-only.
 
     name: iOS-cxxsync${{ matrix.cxxstdsync }}
     runs-on: macos-latest
@@ -26,4 +26,4 @@ jobs:
         export PATH="/opt/homebrew/opt/llvm/bin:$PATH" CC=clang CXX=clang++
         cmake .. -DCMAKE_MAKE_PROGRAM=gmake -DENABLE_ENCRYPTION=OFF -DENABLE_STDCXX_SYNC=${{matrix.cxxstdsync}} -DENABLE_MONOTONIC_CLOCK=OFF -DENABLE_UNITTESTS=OFF -DUSE_CXX_STD=c++11 -DENABLE_BONDING=ON --toolchain scripts/iOS.cmake
     - name: build
-      run: cd _build && cmake --build ./
+      run: cd _build && cmake --build ./ --parallel

.github/workflows/s390x-focal.yaml

@@ -34,8 +34,8 @@ jobs:
           apt-get -y install tzdata &&
           uname -a &&
           lscpu | grep Endian &&
-          apt-get -y install cmake g++ libssl-dev git && 
+          apt-get -y install cmake g++ libssl-dev git python && 
           mkdir _build && cd _build &&
-          cmake ../ -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON &&
-          cmake --build ./ &&
+          cmake --debug-output ../ -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON &&
+          cmake --build ./ --parallel &&
           ./test-srt -disable-ipv6"

.travis.yml

@@ -6,7 +6,7 @@
 #    - COLON characters (in freestanding strings) not allowed in the script
 
 language: cpp
-dist: xenial
+dist: trusty
 
 addons:
     apt:
@@ -32,6 +32,11 @@ jobs:
         - env:
           - BUILD_TYPE=Debug CFG="nologging mbedtls monotonic werror"
           - CMAKE_OPTS='-DENABLE_LOGGING=OFF -DUSE_ENCLIB=mbedtls -DENABLE_MONOTONIC_CLOCK=ON -DENABLE_BONDING=ON -DCMAKE_CXX_FLAGS="-Werror"'
+        - os: linux
+          dist: xenial
+          env:
+          - BUILD_TYPE=Release CFG="old-distro notests werror"
+          - CMAKE_OPTS='-DUSE_CXX_STD=C++98 -DCMAKE_CXX_FLAGS="-Werror"'
         - os: linux
           env: BUILD_TYPE=Release CFG=default
 #       - os: osx
@@ -60,7 +65,7 @@ jobs:
             - ./Configure --cross-compile-prefix=x86_64-w64-mingw32- mingw64
             - make
             - cd ..
-          env: BUILD_TYPE=Release CFG=no-UT
+          env: BUILD_TYPE=Release CFG=notests
 
          # Power jobs
          # Forcing Focal distro because Xenial
@@ -84,6 +89,7 @@ script:
           exit 1;
       fi;
     - export REQUIRE_UNITTESTS=1
+    - if [[ $CFG == *"notests"* ]]; then REQUIRE_UNITTESTS=0; fi
     - if [ "$TRAVIS_COMPILER" == "x86_64-w64-mingw32-g++" ]; then
         CMAKE_OPTS+=" -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc";
         CMAKE_OPTS+=" -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++";

apps/logsupport.cpp → ATTIC/logsupport.cpp

@@ -17,15 +17,20 @@
 #include "logsupport.hpp"
 #include "../srtcore/srt.h"
 #include "../srtcore/utilities.h"
+#include "ofmt.h"
 
 using namespace std;
+using namespace srt;
+
+namespace hvu
+{
 
 // This is based on codes taken from <sys/syslog.h>
 // This is POSIX standard, so it's not going to change.
 // Haivision standard only adds one more severity below
 // DEBUG named DEBUG_TRACE to satisfy all possible needs.
 
-map<string, int> srt_level_names
+map<string, int> level_names
 {
     { "alert", LOG_ALERT },
     { "crit", LOG_CRIT },
@@ -46,17 +51,17 @@ map<string, int> srt_level_names
 
 
 
-srt_logging::LogLevel::type SrtParseLogLevel(string level)
+hvu::logging::LogLevel::type ParseLogLevel(string level)
 {
-    using namespace srt_logging;
+    using namespace hvu::logging;
 
     if ( level.empty() )
         return LogLevel::fatal;
 
     if ( isdigit(level[0]) )
     {
         long lev = strtol(level.c_str(), 0, 10);
-        if ( lev >= SRT_LOG_LEVEL_MIN && lev <= SRT_LOG_LEVEL_MAX )
+        if ( lev >= HVU_LOG_LEVEL_MIN && lev <= HVU_LOG_LEVEL_MAX )
             return LogLevel::type(lev);
 
         cerr << "ERROR: Invalid loglevel number: " << level << " - fallback to FATAL\n";
@@ -91,24 +96,13 @@ struct ToLowerFormat
     }
 };
 
-void LogFANames::Install(string upname, int value)
-{
-    string id;
-    transform(upname.begin(), upname.end(), back_inserter(id), ToLowerFormat());
-    namemap[id] = value;
-}
 
 // See logsupport_appdefs.cpp for log FA definitions
 LogFANames srt_transmit_logfa_names;
 
-const map<string, int> SrtLogFAList()
+set<hvu::logging::LogFA> ParseLogFA(string fa, set<string>* punknown)
 {
-    return srt_transmit_logfa_names.namemap;
-}
-
-set<srt_logging::LogFA> SrtParseLogFA(string fa, set<string>* punknown)
-{
-    using namespace srt_logging;
+    using namespace hvu::logging;
 
     set<LogFA> fas;
 
@@ -173,7 +167,7 @@ set<srt_logging::LogFA> SrtParseLogFA(string fa, set<string>* punknown)
 
 void ParseLogFASpec(const vector<string>& speclist, string& w_on, string& w_off)
 {
-    std::ostringstream son, soff;
+    hvu::ofmtbufstream son, soff;
 
     for (auto& s: speclist)
     {
@@ -202,4 +196,5 @@ void ParseLogFASpec(const vector<string>& speclist, string& w_on, string& w_off)
     w_off = soffs.empty() ? string() : soffs.substr(1);
 }
 
+}
 

apps/logsupport.hpp → ATTIC/logsupport.hpp

@@ -14,21 +14,16 @@
 #include <string>
 #include <map>
 #include <vector>
-#include "../srtcore/srt.h"
-#include "../srtcore/logging_api.h"
+#include "logging_api.h"
 
-srt_logging::LogLevel::type SrtParseLogLevel(std::string level);
-std::set<srt_logging::LogFA> SrtParseLogFA(std::string fa, std::set<std::string>* punknown = nullptr);
+namespace hvu
+{
+
+hvu::logging::LogLevel::type ParseLogLevel(std::string level);
+std::set<hvu::logging::LogFA> ParseLogFA(std::string fa, std::set<std::string>* punknown = nullptr);
 void ParseLogFASpec(const std::vector<std::string>& speclist, std::string& w_on, std::string& w_off);
-const std::map<std::string, int> SrtLogFAList();
 
-SRT_API extern std::map<std::string, int> srt_level_names;
 
-struct LogFANames
-{
-    std::map<std::string, int> namemap;
-    void Install(std::string upname, int value);
-    LogFANames();
-};
+}
 
 #endif

ATTIC/sync_timer.cpp

@@ -0,0 +1,126 @@
+#include "sync_timer.h"
+
+namespace srt
+{
+namespace sync
+{
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Timer
+//
+////////////////////////////////////////////////////////////////////////////////
+
+CTimer::CTimer()
+{
+}
+
+
+CTimer::~CTimer()
+{
+}
+
+// This function sleeps up to the given time, then exits.
+// Meanwhile it can be influenced from another thread by calling:
+// - tick(): exit waiting, but re-check the end time and fall back to sleep if not reached
+// - interrupt(): exit waiting with setting wait time to now() so that it exits immediately
+//
+// This function returns true if it has exit on the originally set time.
+// If the time was changed due to being interrupted and it did really exit before
+// that time, false is returned.
+bool CTimer::sleep_until(TimePoint<steady_clock> tp)
+{
+    // The class member m_sched_time can be used to interrupt the sleep.
+    // Refer to Timer::interrupt().
+    enterCS(m_event.mutex());
+    m_tsSchedTime = tp;
+    leaveCS(m_event.mutex());
+
+#if SRT_BUSY_WAITING
+    wait_busy();
+#else
+    wait_stalled();
+#endif
+
+    // Returning false means that sleep was early interrupted
+    return m_tsSchedTime.load() >= tp;
+}
+
+void CTimer::wait_stalled()
+{
+    TimePoint<steady_clock> cur_tp = steady_clock::now();
+    {
+        UniqueLock elk (m_event.mutex());
+        while (cur_tp < m_tsSchedTime.load())
+        {
+            m_event.wait_until(elk, m_tsSchedTime);
+            cur_tp = steady_clock::now();
+        }
+    }
+}
+
+void srt::sync::CTimer::wait_busy()
+{
+#if defined(_WIN32)
+    // 10 ms on Windows: bad accuracy of timers
+    const steady_clock::duration
+        td_threshold = milliseconds_from(10);
+#else
+    // 1 ms on non-Windows platforms
+    const steady_clock::duration
+        td_threshold = milliseconds_from(1);
+#endif
+
+    TimePoint<steady_clock> cur_tp = steady_clock::now();
+    {
+        UniqueLock elk (m_event.mutex());
+        while (cur_tp < m_tsSchedTime.load())
+        {
+            steady_clock::duration td_wait = m_tsSchedTime.load() - cur_tp;
+            if (td_wait <= 2 * td_threshold)
+                break;
+
+            td_wait -= td_threshold;
+            m_event.wait_for(elk, td_wait);
+
+            cur_tp = steady_clock::now();
+        }
+
+        while (cur_tp < m_tsSchedTime.load())
+        {
+            InvertedLock ulk (m_event.mutex());
+#ifdef IA32
+            __asm__ volatile ("pause; rep; nop; nop; nop; nop; nop;");
+#elif IA64
+            __asm__ volatile ("nop 0; nop 0; nop 0; nop 0; nop 0;");
+#elif AMD64
+            __asm__ volatile ("nop; nop; nop; nop; nop;");
+#elif defined(_WIN32) && !defined(__MINGW32__)
+            __nop();
+            __nop();
+            __nop();
+            __nop();
+            __nop();
+#endif
+            cur_tp = steady_clock::now();
+        }
+    }
+}
+
+
+void CTimer::interrupt()
+{
+    UniqueLock lck(m_event.mutex());
+    m_tsSchedTime = steady_clock::now();
+    m_event.notify_all();
+}
+
+
+void CTimer::tick()
+{
+    m_event.notify_one();
+}
+
+}
+}