zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of rtc::MessageHandler in net/dcsctp

Browse Source 
Bug: webrtc:9702
Change-Id: I80f7fb7406f91a9bfc80e040a72d4af4950187fb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272062
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37818}
This commit is contained in:
Danil Chapovalov
2022-08-17 16:51:36 +02:00
committed by WebRTC LUCI CQ
parent dc0911bd37
commit 6ba4b63f3a
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/dcsctp/socket/BUILD.gn
View File

@ -228,7 +228,8 @@ if (rtc_include_tests) {
"../../../api:array_view", "../../../api:array_view",
"../../../api:create_network_emulation_manager", "../../../api:create_network_emulation_manager",
"../../../api:network_emulation_manager_api", "../../../api:network_emulation_manager_api",
"../../../api/task_queue:task_queue", "../../../api/task_queue",
"../../../api/task_queue:pending_task_safety_flag",
"../../../api/units:time_delta", "../../../api/units:time_delta",
"../../../call:simulated_network", "../../../call:simulated_network",
"../../../rtc_base:checks", "../../../rtc_base:checks",

50
net/dcsctp/socket/dcsctp_socket_network_test.cc
View File

@ -18,6 +18,7 @@
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/array_view.h" #include "api/array_view.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_base.h"
#include "api/test/create_network_emulation_manager.h" #include "api/test/create_network_emulation_manager.h"
#include "api/test/network_emulation_manager.h" #include "api/test/network_emulation_manager.h"
@ -61,7 +62,8 @@ constexpr size_t kSmallPayloadSize = 10;
constexpr size_t kLargePayloadSize = 10000; constexpr size_t kLargePayloadSize = 10000;
constexpr size_t kHugePayloadSize = 262144; constexpr size_t kHugePayloadSize = 262144;
constexpr size_t kBufferedAmountLowThreshold = kLargePayloadSize * 2; constexpr size_t kBufferedAmountLowThreshold = kLargePayloadSize * 2;
constexpr int kPrintBandwidthDurationMillis = 1000; constexpr webrtc::TimeDelta kPrintBandwidthDuration =
webrtc::TimeDelta::Seconds(1);
constexpr webrtc::TimeDelta kBenchmarkRuntime(webrtc::TimeDelta::Seconds(10)); constexpr webrtc::TimeDelta kBenchmarkRuntime(webrtc::TimeDelta::Seconds(10));
constexpr webrtc::TimeDelta kAWhile(webrtc::TimeDelta::Seconds(1)); constexpr webrtc::TimeDelta kAWhile(webrtc::TimeDelta::Seconds(1));
@ -93,10 +95,6 @@ enum class ActorMode {
kLimitedRetransmissionSender, kLimitedRetransmissionSender,
}; };
enum class MessageId : uint32_t {
kPrintBandwidth = 1,
};
// An abstraction around EmulatedEndpoint, representing a bound socket that // An abstraction around EmulatedEndpoint, representing a bound socket that
// will send its packet to a given destination. // will send its packet to a given destination.
class BoundSocket : public webrtc::EmulatedNetworkReceiverInterface { class BoundSocket : public webrtc::EmulatedNetworkReceiverInterface {
@ -134,9 +132,7 @@ class BoundSocket : public webrtc::EmulatedNetworkReceiverInterface {
}; };
// Sends at a constant rate but with random packet sizes. // Sends at a constant rate but with random packet sizes.
class SctpActor : public rtc::MessageHandlerAutoCleanup, class SctpActor : public DcSctpSocketCallbacks {
public DcSctpSocketCallbacks,
public sigslot::has_slots<> {
public: public:
SctpActor(absl::string_view name, SctpActor(absl::string_view name,
BoundSocket& emulated_socket, BoundSocket& emulated_socket,
@ -160,25 +156,23 @@ class SctpActor : public rtc::MessageHandlerAutoCleanup,
}); });
} }
void OnMessage(rtc::Message* pmsg) override { void PrintBandwidth() {
if (pmsg->message_id == static_cast<uint32_t>(MessageId::kPrintBandwidth)) { TimeMs now = TimeMillis();
TimeMs now = TimeMillis(); DurationMs duration = now - last_bandwidth_printout_;
DurationMs duration = now - last_bandwidth_printout_;
double bitrate_mbps = double bitrate_mbps =
static_cast<double>(received_bytes_ * 8) / *duration / 1000; static_cast<double>(received_bytes_ * 8) / *duration / 1000;
RTC_LOG(LS_INFO) << log_prefix() RTC_LOG(LS_INFO) << log_prefix()
<< rtc::StringFormat("Received %0.2f Mbps", << rtc::StringFormat("Received %0.2f Mbps", bitrate_mbps);
bitrate_mbps);
received_bitrate_mbps_.push_back(bitrate_mbps); received_bitrate_mbps_.push_back(bitrate_mbps);
received_bytes_ = 0; received_bytes_ = 0;
last_bandwidth_printout_ = now; last_bandwidth_printout_ = now;
// Print again in a second. // Print again in a second.
if (mode_ == ActorMode::kThroughputReceiver) { if (mode_ == ActorMode::kThroughputReceiver) {
thread_->PostDelayed(RTC_FROM_HERE, kPrintBandwidthDurationMillis, this, thread_->PostDelayedTask(
static_cast<uint32_t>(MessageId::kPrintBandwidth)); SafeTask(safety_.flag(), [this] { PrintBandwidth(); }),
} kPrintBandwidthDuration);
} }
} }
@ -282,8 +276,9 @@ class SctpActor : public rtc::MessageHandlerAutoCleanup,
SendOptions()); SendOptions());
} else if (mode == ActorMode::kThroughputReceiver) { } else if (mode == ActorMode::kThroughputReceiver) {
thread_->PostDelayed(RTC_FROM_HERE, kPrintBandwidthDurationMillis, this, thread_->PostDelayedTask(
static_cast<uint32_t>(MessageId::kPrintBandwidth)); SafeTask(safety_.flag(), [this] { PrintBandwidth(); }),
kPrintBandwidthDuration);
} }
} }
@ -322,6 +317,7 @@ class SctpActor : public rtc::MessageHandlerAutoCleanup,
TimeMs last_bandwidth_printout_; TimeMs last_bandwidth_printout_;
// Per-second received bitrates, in Mbps // Per-second received bitrates, in Mbps
std::vector<double> received_bitrate_mbps_; std::vector<double> received_bitrate_mbps_;
webrtc::ScopedTaskSafety safety_;
}; };
class DcSctpSocketNetworkTest : public testing::Test { class DcSctpSocketNetworkTest : public testing::Test {