| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | |
| |
| |
| |
| | |
Prompted by and partially taken from
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167973
|
| | |
| |
| |
| |
| | |
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167972
|
| | |
| |
| |
| |
| | |
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167970
|
| | |
| |
| |
| |
| | |
See
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167969
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The: table entry for `spawn_thread` was wrong. We use AsyncExecutors'
spawn_blocking which uses tokio::task::spawn_blocking.
This has implications for the semantics, as per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167967
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167968
|
| | |
| |
| |
| |
| | |
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167966
|
| | |
| |
| |
| |
| | |
As suggested
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2810#note_3167965
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
This will let us call _inner from blocking_io, with a different
precondition. No functional change.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This is going to become a hazard. Let's be explicit.
This means using educe to derive the Default for Data.
We also need to update our educe dependency to 0.4.22, since that's
when Default(expression= "...") started working correctly.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
execute_until_first_stall is now simply a wrapper which does some
logging. It will do a bit more in a moment.
Giving the inner function a more obvious name is helpful, since the
executor main loop is a thing one is often looking for.
|
| | |
| |
| |
| | |
rustfmt.
|
| | |
| |
| |
| |
| |
| | |
This member is the principal one which implemnets Spawn, Blocking and
perhaps ToplevelBlockOn. It doesn't appear that we actually need to
split this into multiple members.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Introduce ToplevelRuntime as an alias, and use it in the top-level
programs.
Now none of the principal protocol implementation code has access to
the executor's toplevel entrypoint, and can't call it by mistake.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This was referenced and explained from the docs, but didn't exist yet.
Here it is.
Everyone except the Tokio glue, and the CompoundRuntime, just use the
default implementation in terms of spawn_thread. spawn_thread has a
more relaxed contract, so this is correct.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Forbid re-entering the executor using ToplevelBlockOn::block_on.
This was always forbidden in the case of MockExecutor, but that meant
that tests using MockExecutor would malfunction if the code under test
needed to re-enter the executor from sync code (since the code under test
would have to use block_on, which wrong). See #1835.
Provide a function which *can* do this, reenter_block_on. The
MockExecutor needs to know the difference, and other runtimes may too.
They are conceptually quite different operations.
Introduce ToplevelRuntime as a convenience alias.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Document the new plan for blocking interaction in the trait-level
docs for the Blocking trait (used to be SpawnBlocking).
Add cross-references (in some cases to not-yet-existing pieces).
* Rename: spawn_blocking to spawn_thread. We're going to distinguish
thread-creation (relatively expensive) from brief entry to sync code
(relatively cheap, but more restricted).
* Rename the SpawnBlocking trait to Blocking, and its ThreadHandle
to ThreadHandle. This trait is going to gain more functionality.
* Add the missing mention of `Blocking` to the docs for `Runtime`.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We're going to distinguish top-level runtime entry, from *re*-entry to
an existing executor. It is most convenient to rename this trait
first. Documentation of the distinction will come later.
(We're going to retain the function name `block_on`, but we want the trait
to be more obviously a top-level only thing, though, so we give it a
name that will hopefully avoid it peroulating throughout the codebase..)
|
| |/
|
|
| |
The MockExecutor doesn't have a threadpool.
|
| |
|
|
|
|
|
| |
This commit adds the RSA ID of a relay into a debug statement, as found
in other places in the code. It mostly serves the purpose that the
Ed25519 ID in itself is rather inconvenient, as metrics.torproject.org
only allows querying from the RSA ID.
|
| |\
| |
| |
| |
| | |
tor-proto: Update CtrlCmd and CtrlMsg docs.
See merge request tpo/core/arti!2829
|
| | |
| |
| |
| |
| |
| | |
In aa08ede11fd483cd6dcb4522c431f9e07001717e, the reactor loop was
rewritten to unconditionally read from the `CtrlMsg` channel, so we need
to adjust the docs.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
tor-proto: Add CtrlCmd:ShutdownAndReturnCircuit
Closes #1876
See merge request tpo/core/arti!2831
|
| | | |
| | |
| | |
| | | |
Closes #1876
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This will be used to implement the new `ShutdownAndReturnCircuit`
control command.
Part of #1876
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Some of these were supposed to be `bad_api_usage`, because they result
from API misuse rather than an internal error (bug).
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
This will enable us to reuse these checks for implementing other methods
that are only supported if the conflux set has a single leg.
|
| | |/
| |
| |
| |
| |
| | |
For consistency with the `CtrlCmd::Shutdown` handling from
`Reactor::wait_for_create` (`handle_shutdown()` also prints a helpful
trace log).
|
| |\ \
| | |
| | |
| | |
| | | |
tor-congestion: remove crate
See merge request tpo/core/arti!2828
|
| | | | |
|
| | |/
|/| |
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
tor-proto: Rewrite reactor loop to read from all circuits.
Closes #1863
See merge request tpo/core/arti!2817
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
This was left over from the refactoring that moved the inner `select`
into the `ConfluxSet` impl.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit updates the `Reactor::run_once()` loop to attempt to read
from (and write to) all of its circuit legs as opposed to just the
primary one.
Note that this slightly changes the behavior of the reactor. Previously,
we'd only read from the control channel if the `chan_sender` was ready,
whereas now the control channel is unconditionally read from, in the
*outer* select. The overall effect is that the control channel can cause
unbounded buffering in the `chan_sender` of each circuit (which can
happen if the `chan_sender` is not ready to send). This was actually how
the reactor worked before the refactoring from !2747, which is
reflected in the `chan_sender` docs:
```rust
/// Sender object used to actually send cells.
///
/// NOTE: Control messages could potentially add unboundedly to this, although that's
/// not likely to happen (and isn't triggereable from the network, either).
chan_sender: SometimesUnboundedSink<AnyChanCell, ChannelSender>,
```
I don't believe this to be a problem, for the reason mentioned in the
`chan_sender` docs, and because the main reason we check for
`chan_sender` readiness is to apply backpressure on senders, which is
not something we need to worry about when it comes to the control
channel. Besides, the control channel is unbounded, so not reading
from it won't stop the senders from sending more commands anyway.
Closes #1863
|
| | |
| |
| |
| |
| | |
This tells the reactor to remove a given circuit from the conflux set,
and will be used to remove the circuits that have been shut down.
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | | |
Remove semver files for 1.4.1
See merge request tpo/core/arti!2827
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | | |
tor-proto: Remove unnecessary async block.
See merge request tpo/core/arti!2815
|
| | | | |
|
| | |/
| |
| |
| |
| | |
`futures::future::poll_fn` returns a future, so the `async` block isn't
actually necessary.
|
| | | |
|
| | | |
|