Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stream_info: Collapse constructors #10691

Merged
merged 7 commits into from
Apr 21, 2020
Merged

stream_info: Collapse constructors #10691

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3ab0d2
stream_info: Collapse constructors
Apr 8, 2020
8ec2aad
Merge branch 'master' of github.com:envoyproxy/envoy into stream-info…
Apr 9, 2020
20c23b3
remove intermediate constructor
Apr 9, 2020
35826fa
CR
Apr 11, 2020
26281d9
Merge branch 'master' of github.com:envoyproxy/envoy into stream-info…
Apr 16, 2020
7fd597d
Merge branch 'master' of github.com:envoyproxy/envoy into stream-info…
Apr 18, 2020
6a19ab2
fmt
Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions source/common/stream_info/stream_info_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,20 @@ namespace StreamInfo {

struct StreamInfoImpl : public StreamInfo {
StreamInfoImpl(TimeSource& time_source)
: time_source_(time_source), start_time_(time_source.systemTime()),
start_time_monotonic_(time_source.monotonicTime()),
filter_state_(std::make_shared<FilterStateImpl>(FilterState::LifeSpan::FilterChain)),
request_id_extension_(Http::RequestIDExtensionFactory::noopInstance()) {}
: StreamInfoImpl(absl::nullopt, time_source,
std::make_shared<FilterStateImpl>(FilterState::LifeSpan::FilterChain)) {}

StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source)
: time_source_(time_source), start_time_(time_source.systemTime()),
start_time_monotonic_(time_source.monotonicTime()), protocol_(protocol),
filter_state_(std::make_shared<FilterStateImpl>(FilterState::LifeSpan::FilterChain)),
request_id_extension_(Http::RequestIDExtensionFactory::noopInstance()) {}
: StreamInfoImpl(protocol, time_source,
std::make_shared<FilterStateImpl>(FilterState::LifeSpan::FilterChain)) {}

StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source,
std::shared_ptr<FilterState>& parent_filter_state)
: time_source_(time_source), start_time_(time_source.systemTime()),
start_time_monotonic_(time_source.monotonicTime()), protocol_(protocol),
filter_state_(std::make_shared<FilterStateImpl>(
FilterStateImpl::LazyCreateAncestor(parent_filter_state,
FilterState::LifeSpan::Connection),
FilterState::LifeSpan::FilterChain)),
request_id_extension_(Http::RequestIDExtensionFactory::noopInstance()) {}
: StreamInfoImpl(protocol, time_source,
std::make_shared<FilterStateImpl>(
FilterStateImpl::LazyCreateAncestor(parent_filter_state,
FilterState::LifeSpan::Connection),
FilterState::LifeSpan::FilterChain)) {}

SystemTime startTime() const override { return start_time_; }

Expand Down Expand Up @@ -296,6 +290,13 @@ struct StreamInfoImpl : public StreamInfo {
std::string route_name_;

private:
StreamInfoImpl(absl::optional<Http::Protocol> protocol, TimeSource& time_source,
FilterStateSharedPtr filter_state)
: time_source_(time_source), start_time_(time_source.systemTime()),
start_time_monotonic_(time_source.monotonicTime()), protocol_(protocol),
filter_state_(std::move(filter_state)),
request_id_extension_(Http::RequestIDExtensionFactory::noopInstance()) {}

uint64_t bytes_received_{};
uint64_t bytes_sent_{};
Network::Address::InstanceConstSharedPtr upstream_local_address_;
Expand Down