| Index: webrtc/tools/network_tester/packet_sender.cc
|
| diff --git a/webrtc/tools/network_tester/packet_sender.cc b/webrtc/tools/network_tester/packet_sender.cc
|
| deleted file mode 100644
|
| index 6bd4dd075cf1cc7a2c11b6b5f976c1f54c913820..0000000000000000000000000000000000000000
|
| --- a/webrtc/tools/network_tester/packet_sender.cc
|
| +++ /dev/null
|
| @@ -1,133 +0,0 @@
|
| -/*
|
| - * Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
| - *
|
| - * Use of this source code is governed by a BSD-style license
|
| - * that can be found in the LICENSE file in the root of the source
|
| - * tree. An additional intellectual property rights grant can be found
|
| - * in the file PATENTS. All contributing project authors may
|
| - * be found in the AUTHORS file in the root of the source tree.
|
| - */
|
| -
|
| -#include "webrtc/tools/network_tester/packet_sender.h"
|
| -
|
| -#include <algorithm>
|
| -#include <string>
|
| -#include <utility>
|
| -
|
| -#include "webrtc/base/timeutils.h"
|
| -#include "webrtc/tools/network_tester/config_reader.h"
|
| -#include "webrtc/tools/network_tester/test_controller.h"
|
| -
|
| -namespace webrtc {
|
| -
|
| -namespace {
|
| -
|
| -class SendPacketTask : public rtc::QueuedTask {
|
| - public:
|
| - explicit SendPacketTask(PacketSender* packet_sender)
|
| - : target_time_ms_(rtc::TimeMillis()), packet_sender_(packet_sender) {}
|
| -
|
| - private:
|
| - bool Run() override {
|
| - if (packet_sender_->IsSending()) {
|
| - packet_sender_->SendPacket();
|
| - target_time_ms_ += packet_sender_->GetSendIntervalMs();
|
| - int64_t delay_ms = std::max(static_cast<int64_t>(0),
|
| - target_time_ms_ - rtc::TimeMillis());
|
| - rtc::TaskQueue::Current()->PostDelayedTask(
|
| - std::unique_ptr<QueuedTask>(this), delay_ms);
|
| - return false;
|
| - } else {
|
| - return true;
|
| - }
|
| - }
|
| - int64_t target_time_ms_;
|
| - PacketSender* const packet_sender_;
|
| -};
|
| -
|
| -class UpdateTestSettingTask : public rtc::QueuedTask {
|
| - public:
|
| - UpdateTestSettingTask(PacketSender* packet_sender,
|
| - std::unique_ptr<ConfigReader> config_reader)
|
| - : packet_sender_(packet_sender),
|
| - config_reader_(std::move(config_reader)) {}
|
| -
|
| - private:
|
| - bool Run() override {
|
| - auto config = config_reader_->GetNextConfig();
|
| - if (config) {
|
| - packet_sender_->UpdateTestSetting((*config).packet_size,
|
| - (*config).packet_send_interval_ms);
|
| - rtc::TaskQueue::Current()->PostDelayedTask(
|
| - std::unique_ptr<QueuedTask>(this), (*config).execution_time_ms);
|
| - return false;
|
| - } else {
|
| - packet_sender_->StopSending();
|
| - return true;
|
| - }
|
| - }
|
| - PacketSender* const packet_sender_;
|
| - const std::unique_ptr<ConfigReader> config_reader_;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -PacketSender::PacketSender(TestController* test_controller,
|
| - const std::string& config_file_path)
|
| - : packet_size_(0),
|
| - send_interval_ms_(0),
|
| - sequence_number_(0),
|
| - sending_(false),
|
| - config_file_path_(config_file_path),
|
| - test_controller_(test_controller),
|
| - worker_queue_("Packet Sender", rtc::TaskQueue::Priority::HIGH) {}
|
| -
|
| -PacketSender::~PacketSender() = default;
|
| -
|
| -void PacketSender::StartSending() {
|
| - worker_queue_checker_.Detach();
|
| - worker_queue_.PostTask([this]() {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - sending_ = true;
|
| - });
|
| - worker_queue_.PostTask(
|
| - std::unique_ptr<rtc::QueuedTask>(new UpdateTestSettingTask(
|
| - this,
|
| - std::unique_ptr<ConfigReader>(new ConfigReader(config_file_path_)))));
|
| - worker_queue_.PostTask(
|
| - std::unique_ptr<rtc::QueuedTask>(new SendPacketTask(this)));
|
| -}
|
| -
|
| -void PacketSender::StopSending() {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - sending_ = false;
|
| - test_controller_->OnTestDone();
|
| -}
|
| -
|
| -bool PacketSender::IsSending() const {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - return sending_;
|
| -}
|
| -
|
| -void PacketSender::SendPacket() {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - NetworkTesterPacket packet;
|
| - packet.set_type(NetworkTesterPacket::TEST_DATA);
|
| - packet.set_sequence_number(sequence_number_++);
|
| - packet.set_send_timestamp(rtc::TimeMicros());
|
| - test_controller_->SendData(packet, rtc::Optional<size_t>(packet_size_));
|
| -}
|
| -
|
| -int64_t PacketSender::GetSendIntervalMs() const {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - return send_interval_ms_;
|
| -}
|
| -
|
| -void PacketSender::UpdateTestSetting(size_t packet_size,
|
| - int64_t send_interval_ms) {
|
| - RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_queue_checker_);
|
| - send_interval_ms_ = send_interval_ms;
|
| - packet_size_ = packet_size;
|
| -}
|
| -
|
| -} // namespace webrtc
|
|
|