mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-21 22:43:48 +00:00
137 lines
7.1 KiB
Markdown
137 lines
7.1 KiB
Markdown
# C++20 core and allocation policy
|
|
|
|
Status: phases 1-3 done, 4-5 in progress. Every module of `src/` is
|
|
compiled as C++20 (most of it is still the C design, converted
|
|
mechanically). The ownership and allocation primitives (`src/core/`), the
|
|
event layer (`src/event/`), allocation-free AEAD and stream codecs
|
|
(`src/crypto/`) and the slab-based cache exist and are tested; the relay
|
|
engines that will use them are the next phases.
|
|
|
|
## Goals
|
|
|
|
- Move `src/` from C11 to C++20, one module at a time, with every step
|
|
keeping the CLI, the JSON configuration, protocol behaviour and the public
|
|
`shadowsocks.h` C ABI unchanged.
|
|
- Make ownership explicit. Each object has exactly one owner, a
|
|
`std::unique_ptr`. Non-owning references are generation-checked handles
|
|
that go stale instead of dangling.
|
|
- No heap allocation after startup. Connections, buffers, cipher contexts,
|
|
DNS queries and UDP sessions come from fixed-capacity pools reserved once
|
|
at startup. The steady-state data path does not call `malloc`. When a pool
|
|
is full, new work is refused rather than allocated.
|
|
|
|
## Language profile
|
|
|
|
- C++20, `-fno-exceptions -fno-rtti -fno-threadsafe-statics`, warnings as
|
|
errors. Errors are returned as `ss::Result<T>` (`src/core/result.hpp`), which
|
|
implements a subset of `std::expected`.
|
|
- Only header-only parts of the standard library are used (`<array>`,
|
|
`<span>`, `<optional>`, `<variant>`, `<memory>`'s `std::unique_ptr`). This
|
|
keeps the binaries and the static library free of libstdc++/libc++ symbols,
|
|
so C consumers of `libshadowsocks-c.a` do not need a C++ runtime.
|
|
- `scripts/check_no_heap.py` (a ctest) rejects `new`, `malloc`, allocating
|
|
containers, `std::string`, `std::function` and `std::shared_ptr` in C++
|
|
sources under `src/`. A startup reservation that really must allocate is
|
|
marked `// heap-ok: <reason>`.
|
|
- blake3 (`src/blake3`) and `third_party/bloom` stay C.
|
|
- Minimum compilers: GCC 11, Clang 14, Apple Clang 15.
|
|
|
|
## Primitives (`src/core/`)
|
|
|
|
| Header | Purpose |
|
|
|---|---|
|
|
| `result.hpp` | `Result<T>`, `Status`, `Errc`, `SS_TRY`. |
|
|
| `region.hpp` | `Region`, the only startup `calloc` in the core. Also ASan poison helpers. |
|
|
| `pool.hpp` | `ObjectPool<T>`, `PoolPtr<T>` (`std::unique_ptr` with a pool deleter), `Handle<T>`. Types that embed libuv handles model `AsyncClosable`: their slot is recycled only after the asynchronous close finishes. |
|
|
| `ref.hpp` | `RefCounted<T>`/`RefPtr<T>`, intrusive shared ownership for the few genuinely shared objects (AEAD-2022 UDP sessions). Used instead of `std::shared_ptr` because its control block cannot be pooled portably. |
|
|
| `buffer.hpp` | `FixedBuffer<N>`: inline bytes with `std::span` views; replaces `buffer_t`. |
|
|
| `arena.hpp` | `MonotonicArena` for configuration data that lives as long as the process. |
|
|
| `fixed_map.hpp` | `FixedHashMap` (open addressing, backward-shift deletion) and `FixedLru`; replace uthash and `cache.cpp`. |
|
|
| `intrusive_list.hpp` | `IntrusiveList`/`ListNode`; replaces `ss_list`. Nodes unlink themselves when destroyed. |
|
|
| `fixed_heap.hpp` | Bounded size-class allocator to hand to libuv, c-ares and Mbed TLS through their allocator hooks. |
|
|
|
|
## Event layer (`src/event/loop.hpp`)
|
|
|
|
`Loop`, `Poll`, `Timer`, `Signal` and `Async` wrap libuv handles that are
|
|
embedded by value in their owner and call a member function of the owner
|
|
chosen at compile time (declare that member before the handle). A `Poll`
|
|
owns its socket and carries both read and write interest on one libuv
|
|
handle; a handle closed from another callback gets no further events.
|
|
Handles close into a `CloseGroup`, which signals completion after the last
|
|
asynchronous close, so pooled owners implement `AsyncClosable::begin_close`
|
|
by closing their handles into one. `DeadlineList` drives the idle timeouts
|
|
of many owners from one timer. The `ss_event` C API remains for the code
|
|
that still uses it and is removed with its last caller.
|
|
|
|
## Crypto (`src/crypto/`)
|
|
|
|
`aead.hpp` (SIP004/SIP007 AEAD) and `stream.hpp` (legacy stream ciphers)
|
|
provide value-type codecs: the cipher state is held inside the codec, TCP
|
|
decoders reassemble into a fixed buffer sized for one chunk, and HKDF-SHA1
|
|
runs on stack SHA-1 state. They are tested differentially against the C
|
|
implementation, which the programs still use until the relay engines move
|
|
over. The bundled Mbed TLS enables `MBEDTLS_BLOCK_CIPHER_C` so GCM key setup
|
|
does not allocate; with a system Mbed TLS lacking it, `mbedtls_gcm_setkey`
|
|
may still allocate. AEAD-2022 (SIP022) codecs follow once the pending
|
|
UDP-session rework on `fix/aead2022-udp-session-eviction` has landed.
|
|
|
|
## Phases
|
|
|
|
1. Build and core (done): C++ enabled in CMake, `src/core/`, unit tests
|
|
(`test_core_*`), the no-heap lint, the C++ runtime check and the
|
|
allocation audit.
|
|
2. Mechanical C-to-C++ conversion, leaf modules first (done). Converted
|
|
modules still allocate like the C code; `scripts/no_heap_baseline.txt`
|
|
ratchets that down as they are rewritten.
|
|
3. Event loop wrapper over libuv (done: `src/event/`, `test_event_cpp`).
|
|
4. Crypto: cipher contexts held by value, dispatched with `std::variant`
|
|
(AEAD and stream codecs done; AEAD-2022 pending).
|
|
5. Services: cache (done: fixed slab, no per-entry allocation), lists,
|
|
resolver, ACL and configuration on the new primitives.
|
|
6. One TCP relay engine shared by ss-tunnel, ss-local, ss-redir and ss-server.
|
|
7. UDP relay engine.
|
|
8. Seal the heap after startup; new `max_connections`, `max_udp_sessions`
|
|
and `max_dns_queries` settings size the pools.
|
|
9. Public API: `shadowsocks.h` kept byte-for-byte, plus a new installed C++
|
|
header with an RAII handle.
|
|
10. Remove the C shims.
|
|
|
|
## Allocation audit
|
|
|
|
`tests/alloc_audit/alloc_counter.c` is a preloadable `malloc` counter
|
|
(glibc and macOS). `tests/alloc_audit/measure_alloc.py` warms ss-local and
|
|
ss-server up, snapshots their counters, relays more connections and reports
|
|
heap allocations per connection. It runs as the `alloc_audit_report` ctest
|
|
(report-only for now). It becomes a hard check, with a budget of zero, once
|
|
the relay is ported.
|
|
|
|
```sh
|
|
python3 tests/alloc_audit/measure_alloc.py --bin build/bin \
|
|
--shim build/lib/libss_alloc_audit.dylib --method aes-256-gcm
|
|
```
|
|
|
|
### C baseline
|
|
|
|
Commit `553cdc7`, macOS arm64, bundled Release build, 200 connections, each
|
|
echoing 16 KiB through ss-local and ss-server on loopback. The figures
|
|
include allocations made inside libuv, c-ares and Mbed TLS. ss-server
|
|
resolves the destination (`localhost`) for every connection, so its count
|
|
includes a DNS lookup.
|
|
|
|
| Method | ss-server allocations/connection | ss-local allocations/connection |
|
|
|---|---:|---:|
|
|
| aes-256-gcm | 89.1 | 39.2 |
|
|
| chacha20-ietf-poly1305 | 83.1 | 33.0 |
|
|
| 2022-blake3-aes-256-gcm | 84.0 | 33.0 |
|
|
| aes-256-cfb (stream) | 77.1 | 26.5 |
|
|
| aes-256-gcm, 1-byte payload | 85.0 | 36.0 |
|
|
|
|
After the cache rewrite and `MBEDTLS_BLOCK_CIPHER_C` (programs otherwise
|
|
unchanged): aes-256-gcm 87.1 / 36.9, 2022-blake3-aes-256-gcm 80.1 / 31.0.
|
|
The new codecs and the cache are checked separately for zero allocations
|
|
by `alloc_steady_crypto_aead`, `alloc_steady_crypto_stream` and
|
|
`alloc_steady_cache` (`tests/alloc_audit/check_steady.py`).
|
|
|
|
Unstripped Release sizes at the same commit: ss-local 1,086,888 bytes,
|
|
ss-server 1,086,952 bytes, ss-tunnel 542,200 bytes.
|