Merge pull request #89 from Quicr/tievens-1027

Support priority pass down to transport
Quicr · Oct 30, 2023 · 5088310 · 5088310
2 parents 0dadf42 + fc8770d
commit 5088310
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -35,8 +35,19 @@ jobs:
       if: matrix.os == 'macos-latest'
 
     - name: Install Packages (Ubuntu)
-      run: sudo apt-get install -y clang-tidy
+      run: |
+        sudo apt-get install -y clang-tidy 
+      if: matrix.os == 'ubuntu-latest'
+
+      # Work around https://github.com/actions/runner-images/issues/8659
+    - name: "[Ubuntu] Remove GCC 13 from runner image"
       if: matrix.os == 'ubuntu-latest'
+      shell: bash
+      run: |
+        echo "TEMPORARY WORKAROUND FOR GITHUB RUNNER BUG #8659\n\nRemoving GCC 13 as it breaks Clang14"
+        sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
+        sudo apt-get update
+        sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/dependencies/qname b/dependencies/qname
diff --git a/dependencies/transport b/dependencies/transport
diff --git a/include/quicr/quicr_client.h b/include/quicr/quicr_client.h
@@ -92,13 +92,16 @@ class Client
    * @param payload                 : Opaque payload to be forwarded to Origin
    * @param use_reliable_transport  : Indicates to use reliable for matching
    *                                  published objects
+   * @param priority                : Identifies the relative priority for the stream if reliable
+   *
    */
   bool publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
                      const quicr::Namespace& quicr_namespace,
                      const std::string& origin_url,
                      const std::string& auth_token,
                      bytes&& payload,
-                     bool use_reliable_transport = false);
+                     bool use_reliable_transport = false,
+                     uint8_t priority = 1);
 
   /**
    * @brief Stop publishing on the given QUICR namespace

diff --git a/include/quicr/quicr_client_session.h b/include/quicr/quicr_client_session.h
@@ -68,13 +68,15 @@ class ClientSession
    *                                  Origin
    * @param use_reliable_transport  : Indicates to use reliable for matching
    *                                  published objects
+   * @param priority                : Identifies the relative priority for the stream if reliable
    */
   virtual bool publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
                              const quicr::Namespace& quicr_namespace,
                              const std::string& origin_url,
                              const std::string& auth_token,
                              bytes&& payload,
-                             bool use_reliable_transport) = 0;
+                             bool use_reliable_transport,
+                             uint8_t priority) = 0;
 
   /**
    * @brief Stop publishing on the given QUICR namespace

diff --git a/src/quicr_client.cpp b/src/quicr_client.cpp
@@ -60,14 +60,16 @@ Client::publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
                       const std::string& origin_url,
                       const std::string& auth_token,
                       bytes&& payload,
-                      bool use_reliable_transport)
+                      bool use_reliable_transport,
+                      uint8_t priority)
 {
   return client_session->publishIntent(std::move(pub_delegate),
                                        quicr_namespace,
                                        origin_url,
                                        auth_token,
                                        std::move(payload),
-                                       use_reliable_transport);
+                                       use_reliable_transport,
+                                       priority);
 }
 
 void

diff --git a/src/quicr_client_raw_session.cpp b/src/quicr_client_raw_session.cpp
@@ -250,7 +250,8 @@ ClientRawSession::publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
                                 const std::string& /* origin_url */,
                                 const std::string& /* auth_token */,
                                 bytes&& payload,
-                                bool use_reliable_transport)
+                                bool use_reliable_transport,
+                                uint8_t priority)
 {
   if (pub_delegates.contains(quicr_namespace)) {
     return true;
@@ -261,7 +262,8 @@ ClientRawSession::publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
   const auto& context_id = transport_context_id.value();
   auto stream_id = transport_dgram_stream_id.value();
   if (use_reliable_transport) {
-    stream_id = transport->createStream(context_id, true);
+    stream_id = transport->createStream(context_id, true, priority);
+    logger->debug << "Set stream: " << stream_id << " to priority: " << static_cast<int>(priority) << std::flush;
   }
 
   publish_state[quicr_namespace] = {

diff --git a/src/quicr_client_raw_session.h b/src/quicr_client_raw_session.h
@@ -98,14 +98,16 @@ class ClientRawSession
    * @param payload                 : Opaque payload to be forwarded to the
    * Origin
    * @param use_reliable_transport  : Indicates to use reliable for matching
-   * published objects
+   *                                  published objects
+   * @param priority                : Identifies the relative priority for the stream if reliable
    */
   bool publishIntent(std::shared_ptr<PublisherDelegate> pub_delegate,
                      const quicr::Namespace& quicr_namespace,
                      const std::string& origin_url,
                      const std::string& auth_token,
                      bytes&& payload,
-                     bool use_reliable_transport) override;
+                     bool use_reliable_transport,
+                     uint8_t priority) override;
 
   /**
    * @brief Stop publishing on the given QUICR namespace