[core] Implementation of logging/formatting system using {fmt}

.github/workflows/abi.yml

@@ -18,6 +18,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         path: pull_request
+        submodules: true
     - name: configure
       run: |
         cd pull_request

.github/workflows/android.yaml

@@ -19,6 +19,8 @@ jobs:
         ndk-version: r23
         add-to-path: false
     - uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: build
       run: |
         cd ./scripts/build-android/

.github/workflows/codeql.yml

@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: true
 
       - name: Configure
         run: cmake -DENABLE_HEAVY_LOGGING=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fpermissive -DENABLE_BONDING=1 .        

.github/workflows/cxx11-macos.yaml

@@ -15,6 +15,8 @@ jobs:
     - name: GoogleTest
       run: brew install googletest
     - uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: configure
       run: |
         mkdir _build && cd _build

.github/workflows/cxx11-ubuntu.yaml

@@ -14,6 +14,8 @@ jobs:
       BUILD_WRAPPER_OUT_DIR: sonar-output # Directory where build-wrapper output will be placed
     steps:
     - uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: Install sonar-scanner and build-wrapper
       uses: sonarsource/sonarcloud-github-c-cpp@v2
     - name: configure

.github/workflows/cxx11-win.yaml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: configure
       run: |
         md _build && cd _build

.github/workflows/iOS.yaml

@@ -17,6 +17,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: configure
       run: |
         mkdir _build && cd _build

.github/workflows/s390x-focal.yaml

@@ -23,6 +23,8 @@ jobs:
           "
     - name: Checkout
       uses: actions/checkout@v3
+      with:
+         submodules: true
     - name: configure
       uses: docker://multiarch/ubuntu-core:s390x-focal
       with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/fmt"]
+	path = submodules/fmt
+	url = [email protected]:ethouris/fmt.git

CMakeLists.txt

@@ -52,6 +52,8 @@ set_if(NEED_DESTINATION  ${CMAKE_VERSION} VERSION_LESS "3.14.0")
 
 include(GNUInstallDirs)
 
+add_subdirectory(submodules/fmt)
+
 # The CMAKE_BUILD_TYPE seems not to be always set, weird.
 if (NOT DEFINED ENABLE_DEBUG)
 
@@ -1025,6 +1027,7 @@ list(INSERT HEADERS_srt 0 "${CMAKE_CURRENT_BINARY_DIR}/version.h")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
 add_library(srt_virtual OBJECT ${SOURCES_srt} ${SOURCES_srt_extra} ${HEADERS_srt} ${SOURCES_haicrypt} ${SOURCES_common})
+add_dependencies(srt_virtual fmt)
 
 if (ENABLE_SHARED)
 	# Set this to sources as well, as it won't be automatically handled
@@ -1057,6 +1060,7 @@ if (srt_libspec_shared)
 	set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 	set_property(TARGET ${TARGET_srt}_shared PROPERTY OUTPUT_NAME ${TARGET_srt})
 	set_target_properties (${TARGET_srt}_shared PROPERTIES VERSION ${SRT_VERSION} SOVERSION ${SRT_VERSION_MAJOR}.${SRT_VERSION_MINOR})
+	target_link_libraries(${TARGET_srt}_shared PRIVATE fmt)
 	list (APPEND INSTALL_TARGETS ${TARGET_srt}_shared)
 	if (ENABLE_ENCRYPTION)
 		target_link_libraries(${TARGET_srt}_shared PRIVATE ${SSL_LIBRARIES})
@@ -1082,6 +1086,7 @@ endif()
 
 if (srt_libspec_static)
 	add_library(${TARGET_srt}_static STATIC ${OBJECT_LIB_SUPPORT} ${VIRTUAL_srt})
+    target_link_libraries(${TARGET_srt}_static PRIVATE fmt)
 
 	# For Windows, leave the name to be "srt_static.lib".
 	# Windows generates two different library files:
@@ -1115,6 +1120,7 @@ if (srt_libspec_static)
 endif()
 
 target_include_directories(srt_virtual PRIVATE  ${SSL_INCLUDE_DIRS})
+target_include_directories(srt_virtual PRIVATE submodules/fmt/include)
 
 if (MICROSOFT)
 	if (OPENSSL_USE_STATIC_LIBS)
@@ -1281,6 +1287,8 @@ macro(srt_add_program_dont_install name)
 	add_executable(${name} ${ARGN})
 	target_include_directories(${name} PRIVATE apps)
 	target_include_directories(${name} PRIVATE common)
+    target_include_directories(${name} PRIVATE submodules/fmt/include)
+	#message(STATUS "PROGRAM: ${name} with apps, common, fmt; SOURCES: ${ARGN}")
 endmacro()
 
 macro(srt_add_program name)
@@ -1364,6 +1372,8 @@ if (ENABLE_APPS)
 	# library should be changed into a static one and made useful
 	# for users.
 	add_library(srtsupport_virtual OBJECT ${SOURCES_support})
+	add_dependencies(srtsupport_virtual fmt)
+	target_include_directories(srtsupport_virtual PRIVATE submodules/fmt/include)
 	srt_set_stdcxx(srtsupport_virtual "${USE_CXX_STD_APP}")
 	set (VIRTUAL_srtsupport $<TARGET_OBJECTS:srtsupport_virtual>)
 
@@ -1404,6 +1414,7 @@ if (ENABLE_APPS)
 
 		srt_add_testprogram(utility-test)
 		srt_set_stdcxx(utility-test "${USE_CXX_STD_APP}")
+	    target_link_libraries(utility-test PRIVATE fmt)
 		if (NOT WIN32)
 			# This program is symlinked under git-cygwin.
 			# Avoid misleading syntax error.

apps/logsupport.cpp

@@ -173,7 +173,9 @@ 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;
+    using namespace fmt;
+
+    memory_buffer son, soff;
 
     for (auto& s: speclist)
     {
@@ -190,13 +192,13 @@ void ParseLogFASpec(const vector<string>& speclist, string& w_on, string& w_off)
             name = s;
 
         if (on)
-            son << "," << name;
+            ffwrite(son, ",", name);
         else
-            soff << "," << name;
+            ffwrite(soff, ",", name);
     }
 
-    const string& sons = son.str();
-    const string& soffs = soff.str();
+    string sons = ffcat(son);
+    string soffs = ffcat(soff);
 
     w_on = sons.empty() ? string() : sons.substr(1);
     w_off = soffs.empty() ? string() : soffs.substr(1);

apps/srt-file-transmit.cpp

@@ -390,7 +390,7 @@ bool DoUpload(UriParser& ut, string path, string filename,
             {
                 int st = tar->Write(buf.data() + shift, n, 0, out_stats);
                 Verb() << "Upload: " << n << " --> " << st
-                    << (!shift ? string() : "+" + Sprint(shift));
+                    << (!shift ? string() : fmt::ffcat("+", shift));
                 if (st == SRT_ERROR)
                 {
                     cerr << "Upload: SRT error: " << srt_getlasterror_str()

apps/transmitmedia.cpp

@@ -198,7 +198,7 @@ void SrtCommon::InitParameters(string host, map<string,string> par)
         if (transmit_chunk_size > SRT_LIVE_MAX_PLSIZE)
             throw std::runtime_error("Chunk size in live mode exceeds 1456 bytes; this is not supported");
 
-        par["payloadsize"] = Sprint(transmit_chunk_size);
+        par["payloadsize"] = fmt::ffcat(transmit_chunk_size);
     }
 
     // Assign the others here.

apps/uriparser.cpp

@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <map>
 #include <string>
+#include "fmt/format.h"
 
 #include "uriparser.hpp"
 
@@ -57,48 +58,49 @@ UriParser::~UriParser(void)
 
 string UriParser::makeUri()
 {
+    using namespace fmt;
     // Reassemble parts into the URI
     string prefix = "";
     if (m_proto != "")
     {
         prefix = m_proto + "://";
     }
 
-    std::ostringstream out;
+    memory_buffer out;
 
-    out << prefix << m_host;
+    ffwrite(out, prefix, m_host);
     if ((m_port == "" || m_port == "0") && m_expect == EXPECT_FILE)
     {
         // Do not add port
     }
     else
     {
-        out << ":" << m_port;
+        ffwrite(out, ":", m_port);
     }
 
     if (m_path != "")
     {
         if (m_path[0] != '/')
-            out << "/";
-        out << m_path;
+            ffwrite(out, "/");
+        ffwrite(out, m_path);
     }
 
     if (!m_mapQuery.empty())
     {
-        out << "?";
+        ffwrite(out, "?");
 
         query_it i = m_mapQuery.begin();
         for (;;)
         {
-            out << i->first << "=" << i->second;
+            ffwrite(out, i->first, "=", i->second);
             ++i;
             if (i == m_mapQuery.end())
                 break;
-            out << "&";
+            ffwrite(out, "&");
         }
     }
 
-    m_origUri = out.str();
+    m_origUri = ffcat(out);
     return m_origUri;
 }