mediasoup 3.20.6 → 3.20.7

package/worker/src/RTC/WebRtcTransport.cpp

@@ -785,7 +785,7 @@ namespace RTC
 		const uint8_t* data = packet->GetBuffer();
 		auto len            = packet->GetLength();
 
-		if (!this->srtpSendSession->EncryptRtp(&data, &len))
+		if (!this->srtpSendSession->EncryptRtp(&data, std::addressof(len)))
 		{
 			if (cb)
 			{
@@ -822,7 +822,7 @@ namespace RTC
 			return;
 		}
 
-		if (!this->srtpSendSession->EncryptRtcp(&data, &len))
+		if (!this->srtpSendSession->EncryptRtcp(&data, std::addressof(len)))
 		{
 			return;
 		}
@@ -855,7 +855,7 @@ namespace RTC
 			return;
 		}
 
-		if (!this->srtpSendSession->EncryptRtcp(&data, &len))
+		if (!this->srtpSendSession->EncryptRtcp(&data, std::addressof(len)))
 		{
 			return;
 		}
@@ -1025,7 +1025,7 @@ namespace RTC
 		}
 
 		// Decrypt the SRTP packet.
-		if (!this->srtpRecvSession->DecryptSrtp(const_cast<uint8_t*>(data), &len))
+		if (!this->srtpRecvSession->DecryptSrtp(const_cast<uint8_t*>(data), std::addressof(len)))
 		{
 			const auto* packet = RTC::RTP::Packet::Parse(data, len, bufferLen);
 
@@ -1094,7 +1094,7 @@ namespace RTC
 		}
 
 		// Decrypt the SRTCP packet.
-		if (!this->srtpRecvSession->DecryptSrtcp(const_cast<uint8_t*>(data), &len))
+		if (!this->srtpRecvSession->DecryptSrtcp(const_cast<uint8_t*>(data), std::addressof(len)))
 		{
 			return;
 		}

package/worker/src/Settings.cpp

@@ -59,7 +59,6 @@ void Settings::SetConfiguration(int argc, char* argv[])
 		{ .name="dtlsCertificateFile",  .has_arg=optional_argument, .flag=nullptr, .val='c' },
 		{ .name="dtlsPrivateKeyFile",   .has_arg=optional_argument, .flag=nullptr, .val='p' },
 		{ .name="libwebrtcFieldTrials", .has_arg=optional_argument, .flag=nullptr, .val='W' },
-		{ .name="disableLiburing",      .has_arg=optional_argument, .flag=nullptr, .val='d' },
 		{ .name=nullptr,                .has_arg=0,                 .flag=nullptr,  .val=0  }
 	};
 	// clang-format on
@@ -159,18 +158,6 @@ void Settings::SetConfiguration(int argc, char* argv[])
 				break;
 			}
 
-			case 'd':
-			{
-				stringValue = std::string(optarg);
-
-				if (stringValue == "true")
-				{
-					Settings::configuration.disableLiburing = true;
-				}
-
-				break;
-			}
-
 			// Invalid option.
 			case '?':
 			{
@@ -382,7 +369,6 @@ void Settings::PrintConfiguration()
 		MS_DEBUG_TAG(
 		  info, "  libwebrtcFieldTrials: %s", Settings::configuration.libwebrtcFieldTrials.c_str());
 	}
-	MS_DEBUG_TAG(info, "  disableLiburing: %s", Settings::configuration.disableLiburing ? "yes" : "no");
 
 	MS_DEBUG_TAG(info, "</configuration>");
 }

package/worker/src/Utils/Crypto.cpp

@@ -125,9 +125,9 @@ namespace Utils
 		MS_TRACE();
 
 		char buffer[64];
-		static const char Chars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
-			                            'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-			                            'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+		static constexpr char Chars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
+			                                'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+			                                'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
 
 		len = std::min<size_t>(len, 64);
 

package/worker/src/Utils/String.cpp

@@ -20,7 +20,7 @@
 
 static constexpr size_t BufferOutSize{ 65536 };
 static thread_local uint8_t BufferOut[BufferOutSize];
-static const uint8_t Base64Table[65] =
+static constexpr uint8_t Base64Table[65] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 namespace Utils

package/worker/src/Worker.cpp

@@ -2,9 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "Worker.hpp"
-#ifdef MS_LIBURING_SUPPORTED
-#include "DepLibUring.hpp"
-#endif
 #include "FBS/response.h"
 #include "FBS/worker.h"
 #include "DepLibUV.hpp"
@@ -33,14 +30,6 @@ Worker::Worker(::Channel::ChannelSocket* channel, SharedInterface* shared)
 	}
 #endif
 
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		// Start polling CQEs, which will create a uv_pool_t handle.
-		DepLibUring::StartPollingCQEs();
-	}
-#endif
-
 	// Tell the Node process that we are running.
 	this->shared->GetChannelNotifier()->Emit(
 	  std::to_string(Logger::Pid), FBS::Notification::Event::WORKER_RUNNING);
@@ -92,14 +81,6 @@ void Worker::Close()
 	}
 	this->mapWebRtcServers.clear();
 
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		// Stop polling CQEs, which will close the uv_pool_t handle.
-		DepLibUring::StopPollingCQEs();
-	}
-#endif
-
 	// Close the Channel.
 	this->channel->Close();
 }
@@ -132,26 +113,12 @@ flatbuffers::Offset<FBS::Worker::DumpResponse> Worker::FillBuffer(
 	// Add channelMessageHandlers.
 	auto channelMessageHandlers = this->shared->GetChannelMessageRegistrator()->FillBuffer(builder);
 
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		return FBS::Worker::CreateDumpResponseDirect(
-		  builder,
-		  Logger::Pid,
-		  &webRtcServerIds,
-		  &routerIds,
-		  channelMessageHandlers,
-		  DepLibUring::FillBuffer(builder));
-	}
-	else
-	{
-		return FBS::Worker::CreateDumpResponseDirect(
-		  builder, Logger::Pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
-	}
-#else
 	return FBS::Worker::CreateDumpResponseDirect(
-	  builder, Logger::Pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
-#endif
+	  builder,
+	  Logger::Pid,
+	  std::addressof(webRtcServerIds),
+	  std::addressof(routerIds),
+	  channelMessageHandlers);
 }
 
 flatbuffers::Offset<FBS::Worker::ResourceUsageResponse> Worker::FillBufferResourceUsage(

package/worker/src/handles/TcpConnectionHandle.cpp

@@ -3,9 +3,6 @@
 
 #include "handles/TcpConnectionHandle.hpp"
 #include "DepLibUV.hpp"
-#ifdef MS_LIBURING_SUPPORTED
-#include "DepLibUring.hpp"
-#endif
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Utils.hpp"
@@ -151,7 +148,7 @@ void TcpConnectionHandle::Start()
 	}
 
 	// NOLINTNEXTLINE(misc-const-correctness)
-	int err = uv_read_start(
+	const int err = uv_read_start(
 	  reinterpret_cast<uv_stream_t*>(this->uvHandle),
 	  static_cast<uv_alloc_cb>(onAlloc),
 	  static_cast<uv_read_cb>(onRead));
@@ -166,18 +163,6 @@ void TcpConnectionHandle::Start()
 	{
 		MS_THROW_ERROR("error setting peer IP and port");
 	}
-
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		err = uv_fileno(reinterpret_cast<uv_handle_t*>(this->uvHandle), std::addressof(this->fd));
-
-		if (err != 0)
-		{
-			MS_THROW_ERROR("uv_fileno() failed: %s", uv_strerror(err));
-		}
-	}
-#endif
 }
 
 void TcpConnectionHandle::Write(
@@ -211,32 +196,6 @@ void TcpConnectionHandle::Write(
 		return;
 	}
 
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		if (!DepLibUring::IsActive())
-		{
-			goto write_libuv;
-		}
-
-		// Prepare the data to be sent.
-		// NOTE: If all SQEs are currently in use or no UserData entry is available we'll
-		// fall back to libuv.
-		auto prepared = DepLibUring::PrepareWrite(this->fd, data1, len1, data2, len2, cb);
-
-		if (!prepared)
-		{
-			MS_DEBUG_DEV("cannot write via liburing, fallback to libuv");
-
-			goto write_libuv;
-		}
-
-		return;
-	}
-
-write_libuv:
-#endif
-
 	// First try uv_try_write(). In case it can not directly write all the given
 	// data then build a uv_req_t and use uv_write().
 

package/worker/src/handles/UdpSocketHandle.cpp

@@ -2,9 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "handles/UdpSocketHandle.hpp"
-#ifdef MS_LIBURING_SUPPORTED
-#include "DepLibUring.hpp"
-#endif
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Utils.hpp"
@@ -73,7 +70,7 @@ UdpSocketHandle::UdpSocketHandle(uv_udp_t* uvHandle) : uvHandle(uvHandle)
 	this->uvHandle->data = static_cast<void*>(this);
 
 	// NOLINTNEXTLINE(misc-const-correctness)
-	int err = uv_udp_recv_start(
+	const int err = uv_udp_recv_start(
 	  this->uvHandle, static_cast<uv_alloc_cb>(onAlloc), static_cast<uv_udp_recv_cb>(onRecv));
 
 	if (err != 0)
@@ -90,18 +87,6 @@ UdpSocketHandle::UdpSocketHandle(uv_udp_t* uvHandle) : uvHandle(uvHandle)
 
 		MS_THROW_ERROR("error setting local IP and port");
 	}
-
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		err = uv_fileno(reinterpret_cast<uv_handle_t*>(this->uvHandle), std::addressof(this->fd));
-
-		if (err != 0)
-		{
-			MS_THROW_ERROR("uv_fileno() failed: %s", uv_strerror(err));
-		}
-	}
-#endif
 }
 
 UdpSocketHandle::~UdpSocketHandle()
@@ -157,32 +142,6 @@ void UdpSocketHandle::Send(
 		return;
 	}
 
-#ifdef MS_LIBURING_SUPPORTED
-	if (DepLibUring::IsEnabled())
-	{
-		if (!DepLibUring::IsActive())
-		{
-			goto send_libuv;
-		}
-
-		// Prepare the data to be sent.
-		// NOTE: If all SQEs are currently in use or no UserData entry is available we'll
-		// fall back to libuv.
-		auto prepared = DepLibUring::PrepareSend(this->fd, data, len, addr, cb);
-
-		if (!prepared)
-		{
-			MS_DEBUG_DEV("cannot send via liburing, fallback to libuv");
-
-			goto send_libuv;
-		}
-
-		return;
-	}
-
-send_libuv:
-#endif
-
 	// First try uv_udp_try_send(). In case it can not directly send the datagram
 	// then build a uv_req_t and use uv_udp_send().
 

package/worker/src/lib.cpp

@@ -3,13 +3,10 @@
 
 #include "lib.hpp"
 #include "common.hpp"
-#include "DepLibSRTP.hpp"
-#ifdef MS_LIBURING_SUPPORTED
-#include "DepLibUring.hpp"
-#endif
 #include "Channel/ChannelMessageRegistrator.hpp"
 #include "Channel/ChannelNotifier.hpp"
 #include "Channel/ChannelSocket.hpp"
+#include "DepLibSRTP.hpp"
 #include "DepLibUV.hpp"
 #include "DepLibWebRTC.hpp"
 #include "DepOpenSSL.hpp"
@@ -153,9 +150,6 @@ extern "C" int mediasoup_worker_run(
 		// Initialize static stuff.
 		DepOpenSSL::ClassInit();
 		DepLibSRTP::ClassInit();
-#ifdef MS_LIBURING_SUPPORTED
-		DepLibUring::ClassInit();
-#endif
 		DepLibWebRTC::ClassInit();
 		Utils::Crypto::ClassInit();
 		RTC::DtlsTransport::ClassInit();
@@ -175,9 +169,6 @@ extern "C" int mediasoup_worker_run(
 		DepLibSRTP::ClassDestroy();
 		Utils::Crypto::ClassDestroy();
 		DepLibWebRTC::ClassDestroy();
-#ifdef MS_LIBURING_SUPPORTED
-		DepLibUring::ClassDestroy();
-#endif
 		RTC::DtlsTransport::ClassDestroy();
 		DepLibUV::ClassDestroy();
 

package/worker/fbs/liburing.fbs

@@ -1,7 +0,0 @@
-namespace FBS.LibUring;
-
-table Dump {
-    sqe_process_count: uint64;
-    sqe_miss_count: uint64;
-    user_data_miss_count: uint64;
-}

package/worker/include/DepLibUring.hpp

@@ -1,143 +0,0 @@
-#ifndef MS_DEP_LIBURING_HPP
-#define MS_DEP_LIBURING_HPP
-
-#include "FBS/liburing.h"
-#include <uv.h>
-#include <functional>
-#include <liburing.h>
-#include <queue>
-
-class DepLibUring
-{
-public:
-	using onSendCallback = const std::function<void(bool sent)>;
-
-	/* Struct for the user data field of SQE and CQE. */
-	struct UserData
-	{
-		// Pointer to send buffer.
-		uint8_t* store{ nullptr };
-		// Frame len buffer for TCP.
-		uint8_t frameLen[2] = { 0 };
-		// iovec for TCP, first item for framing, second item for payload.
-		struct iovec iov[2];
-		// Send callback.
-		onSendCallback* cb{ nullptr };
-		// Index in userDatas array.
-		size_t idx{ 0 };
-	};
-
-	/* Number of submission queue entries (SQE). */
-	static constexpr size_t QueueDepth{ 1024 * 4 };
-	static constexpr size_t SendBufferSize{ 1500 };
-
-	using SendBuffer = uint8_t[SendBufferSize];
-
-	static void ClassInit();
-	static void ClassDestroy();
-	static bool CheckRuntimeSupport();
-	static bool IsEnabled();
-	static flatbuffers::Offset<FBS::LibUring::Dump> FillBuffer(flatbuffers::FlatBufferBuilder& builder);
-	static void StartPollingCQEs();
-	static void StopPollingCQEs();
-	static uint8_t* GetSendBuffer();
-	static bool PrepareSend(
-	  int sockfd, const uint8_t* data, size_t len, const struct sockaddr* addr, onSendCallback* cb);
-	static bool PrepareWrite(
-	  int sockfd, const uint8_t* data1, size_t len1, const uint8_t* data2, size_t len2, onSendCallback* cb);
-	static void Submit();
-	static void SetActive();
-	static bool IsActive();
-
-	class LibUring;
-
-	// Whether liburing is enabled or not after runtime checks.
-	static thread_local bool enabled;
-	static thread_local LibUring* liburing;
-
-public:
-	// Singleton.
-	class LibUring
-	{
-	public:
-		LibUring();
-		~LibUring();
-		flatbuffers::Offset<FBS::LibUring::Dump> FillBuffer(flatbuffers::FlatBufferBuilder& builder) const;
-		void StartPollingCQEs();
-		void StopPollingCQEs();
-		uint8_t* GetSendBuffer();
-		bool PrepareSend(
-		  int sockfd, const uint8_t* data, size_t len, const struct sockaddr* addr, onSendCallback* cb);
-		bool PrepareWrite(
-		  int sockfd,
-		  const uint8_t* data1,
-		  size_t len1,
-		  const uint8_t* data2,
-		  size_t len2,
-		  onSendCallback* cb);
-		void Submit();
-		void SetActive()
-		{
-			this->active = true;
-		}
-		bool IsActive() const
-		{
-			return this->active;
-		}
-		bool IsZeroCopyEnabled() const
-		{
-			return this->zeroCopyEnabled;
-		}
-		io_uring* GetRing()
-		{
-			return std::addressof(this->ring);
-		}
-		int GetEventFd() const
-		{
-			return this->efd;
-		}
-		void ReleaseUserDataEntry(size_t idx)
-		{
-			this->availableUserDataEntries.push(idx);
-		}
-
-	private:
-		void SetInactive()
-		{
-			this->active = false;
-		}
-		UserData* GetUserData();
-		bool IsDataInSendBuffers(const uint8_t* data) const
-		{
-			return data >= this->sendBuffers[0] && data <= this->sendBuffers[DepLibUring::QueueDepth - 1];
-		}
-
-	private:
-		// io_uring instance.
-		io_uring ring;
-		// Event file descriptor to watch for io_uring completions.
-		int efd;
-		// libuv handle used to poll io_uring completions.
-		uv_poll_t* uvHandle{ nullptr };
-		// Whether we are currently sending RTP over io_uring.
-		bool active{ false };
-		// Whether Zero Copy feature is enabled.
-		bool zeroCopyEnabled{ true };
-		// Pre-allocated UserData's.
-		UserData userDatas[QueueDepth]{};
-		// Indexes of available UserData entries.
-		std::queue<size_t> availableUserDataEntries;
-		// Pre-allocated SendBuffer's.
-		SendBuffer sendBuffers[QueueDepth];
-		// iovec structs to be registered for Zero Copy.
-		struct iovec iovecs[QueueDepth];
-		// Submission queue entry process count.
-		uint64_t sqeProcessCount{ 0u };
-		// Submission queue entry miss count.
-		uint64_t sqeMissCount{ 0u };
-		// User data miss count.
-		uint64_t userDataMissCount{ 0u };
-	};
-};
-
-#endif