Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Arti
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jill
Arti
Commits
482c022e
Commit
482c022e
authored
2 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
circmgr: Remove now-unused scheduled entry points.
Now that we have TaskSchedule, we don't need to expose these any longer.
parent
3d5276a9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
crates/tor-circmgr/src/lib.rs
+8
-18
8 additions, 18 deletions
crates/tor-circmgr/src/lib.rs
doc/semver_status.md
+1
-0
1 addition, 0 deletions
doc/semver_status.md
with
9 additions
and
18 deletions
crates/tor-circmgr/src/lib.rs
+
8
−
18
View file @
482c022e
...
...
@@ -411,16 +411,14 @@ impl<R: Runtime> CircMgr<R> {
self
.mgr
.get_or_launch
(
&
usage
,
netdir
)
.await
.map
(|(
c
,
_
)|
c
)
}
/// Launch circuits preemptively, using the preemptive circuit predictor's predictions.
/// Launch circuits preemptively, using the preemptive circuit predictor's
/// predictions.
///
/// # Note
///
/// This function is invoked periodically from the
/// `arti-client` crate, based on timings from the network
/// parameters. As with `launch_timeout_testing_circuit_if_appropriate`, this
/// should ideally be refactored to be internal to this crate, and not be a
/// public API here.
pub
async
fn
launch_circuits_preemptively
(
&
self
,
netdir
:
DirInfo
<
'_
>
)
{
/// This function is invoked periodically from
/// `continually_preemptively_build_circuits()`.
async
fn
launch_circuits_preemptively
(
&
self
,
netdir
:
DirInfo
<
'_
>
)
{
debug!
(
"Checking preemptive circuit predictions."
);
let
(
circs
,
threshold
)
=
{
let
preemptive
=
self
.predictor
.lock
()
.expect
(
"preemptive lock poisoned"
);
...
...
@@ -480,17 +478,9 @@ impl<R: Runtime> CircMgr<R> {
///
/// # Note
///
/// This function is invoked periodically from the
/// `arti-client` crate, based on timings from the network
/// parameters. Please don't invoke it on your own; I hope we can
/// have this API go away in the future.
///
/// I would much prefer to have this _not_ be a public API, and
/// instead have it be a daemon task. The trouble is that it
/// needs to get a NetDir as input, and that isn't possible with
/// the current CircMgr design. See
/// [arti#161](https://gitlab.torproject.org/tpo/core/arti/-/issues/161).
pub
fn
launch_timeout_testing_circuit_if_appropriate
(
&
self
,
netdir
:
&
NetDir
)
->
Result
<
()
>
{
/// This function is invoked periodically from
/// `continually_launch_timeout_testing_circuits`.
fn
launch_timeout_testing_circuit_if_appropriate
(
&
self
,
netdir
:
&
NetDir
)
->
Result
<
()
>
{
if
!
self
.mgr
.peek_builder
()
.learning_timeouts
()
{
return
Ok
(());
}
...
...
This diff is collapsed.
Click to expand it.
doc/semver_status.md
+
1
−
0
View file @
482c022e
...
...
@@ -30,6 +30,7 @@ BREAKING: Added `ChanProvenance` to `ChanMgr::get_or_launch`.
### tor-circmgr
MODIFIED: Added a new variant in tor_circmgr::Error.
BREAKING: Made internal scheduled entry points non-public.
### tor-guardmgr
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment