mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 07:10:38 +01:00
59dd482249
Changes places where we explicitly construct an Optional to instead use nullopt or the requisite value type only. This CL was uploaded by git cl split. R=mbonadei@webrtc.org Bug: None Change-Id: Iec336d342414dc68b59ba4b4623fdf768f6fb655 Reviewed-on: https://webrtc-review.googlesource.com/23602 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oskar Sundbom <ossu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20932}
50 lines
1.8 KiB
C++
50 lines
1.8 KiB
C++
/*
|
|
* 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 "rtc_tools/network_tester/config_reader.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace webrtc {
|
|
|
|
ConfigReader::ConfigReader(const std::string& config_file_path)
|
|
: proto_config_index_(0) {
|
|
std::ifstream config_stream(config_file_path,
|
|
std::ios_base::in | std::ios_base::binary);
|
|
RTC_DCHECK(config_stream.is_open());
|
|
RTC_DCHECK(config_stream.good());
|
|
std::string config_data((std::istreambuf_iterator<char>(config_stream)),
|
|
(std::istreambuf_iterator<char>()));
|
|
if (config_data.size() > 0) {
|
|
proto_all_configs_.ParseFromString(config_data);
|
|
}
|
|
}
|
|
|
|
ConfigReader::~ConfigReader() = default;
|
|
|
|
rtc::Optional<ConfigReader::Config> ConfigReader::GetNextConfig() {
|
|
#ifdef WEBRTC_NETWORK_TESTER_PROTO
|
|
if (proto_config_index_ >= proto_all_configs_.configs_size())
|
|
return rtc::nullopt;
|
|
auto proto_config = proto_all_configs_.configs(proto_config_index_++);
|
|
RTC_DCHECK(proto_config.has_packet_send_interval_ms());
|
|
RTC_DCHECK(proto_config.has_packet_size());
|
|
RTC_DCHECK(proto_config.has_execution_time_ms());
|
|
Config config;
|
|
config.packet_send_interval_ms = proto_config.packet_send_interval_ms();
|
|
config.packet_size = proto_config.packet_size();
|
|
config.execution_time_ms = proto_config.execution_time_ms();
|
|
return config;
|
|
#else
|
|
return rtc::nullopt;
|
|
#endif // WEBRTC_NETWORK_TESTER_PROTO
|
|
}
|
|
|
|
} // namespace webrtc
|