Skip to content

quiche: pass Dispatcher to EnvoyQuicClock/Alarm instead of TimeSystem#7711

Merged
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
danzh2010:fixclock
Jul 26, 2019
Merged

quiche: pass Dispatcher to EnvoyQuicClock/Alarm instead of TimeSystem#7711
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
danzh2010:fixclock

Conversation

@danzh2010
Copy link
Copy Markdown
Contributor

@danzh2010 danzh2010 commented Jul 24, 2019

Currently EnvoyQuicClock takes a TimeSystem reference. But TimeSystem objects is not accessible within the scope of its creation. Instead, Event::Dispatcher is accessible in most of the code and also provide access to underlying TimeSource and a per-event loop timestamp which can be helpful for #7177.

For same reason also change EnvoyQuicAlarm to take a Dispatcher reference.

Risk Level: low, not in production
Testing: existing tests passed.
Part of #7177 #2557

Signed-off-by: Dan Zhang <danzh@google.com>
@danzh2010
Copy link
Copy Markdown
Contributor Author

/assign @wu-bin @alyssawilk

@danzh2010
Copy link
Copy Markdown
Contributor Author

/retest

@repokitteh-read-only
Copy link
Copy Markdown

🔨 rebuilding ci/circleci: compile_time_options (failed build)

🐱

Caused by: a #7711 (comment) was created by @danzh2010.

see: more, trace.

@danzh2010
Copy link
Copy Markdown
Contributor Author

/retest

@repokitteh-read-only
Copy link
Copy Markdown

🤷‍♀️ nothing to rebuild.

🐱

Caused by: a #7711 (comment) was created by @danzh2010.

see: more, trace.

@danzh2010
Copy link
Copy Markdown
Contributor Author

/azp retest

@azure-pipelines
Copy link
Copy Markdown

Command 'retest' is not supported by Azure Pipelines.

Supported commands
  • help:
    • Get descriptions, examples and documentation about supported commands
    • Example: help "command_name"
  • list:
    • List all pipelines for this repository using a comment.
    • Example: "list"
  • run:
    • Run all pipelines or a specific pipeline for this repository using a comment. Use this command by itself to trigger all related pipelines, or specify a pipeline to run.
    • Example: "run" or "run pipeline_name"
  • where:
    • Report back the Azure DevOps orgs that are related to this repository and org
    • Example: "where"

See additional documentation.

@danzh2010
Copy link
Copy Markdown
Contributor Author

/azp run envoy-macos

@azure-pipelines
Copy link
Copy Markdown

Commenter does not have sufficient privileges for PR 7711 in repo envoyproxy/envoy

Copy link
Copy Markdown
Contributor

@wu-bin wu-bin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks Dan.

quic::QuicTime EnvoyQuicClock::Now() const {
return quic::QuicTime::Zero() + quic::QuicTime::Delta::FromMicroseconds(
microsecondsSinceEpoch(time_system_.monotonicTime()));
return quic::QuicTime::Zero() + quic::QuicTime::Delta::FromMicroseconds(microsecondsSinceEpoch(
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function seems to be not clang-formated, can you do that?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, otherwise the format ci would have failed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM, thanks for double check.

@danzh2010
Copy link
Copy Markdown
Contributor Author

/assign @mattklein123

@danzh2010
Copy link
Copy Markdown
Contributor Author

ping? @mattklein123

@mattklein123 mattklein123 merged commit a8200bc into envoyproxy:master Jul 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants