samiandClaude Sonnet 5
91636f8a4d
Stage 8 of the CORE build order: the bodies behind the DownloadSpec / callback API reviewed in core/docs/engine-api-m1.md. Wires probe -> segment workers -> WriteBuffer -> SparseFile -> .veloxpart.meta -> retry/backoff -> SegmentBudget -> RateLimiter -> callbacks into one event-driven machine. - Engine (src/engine.cpp): owns HttpClient, Prober, SegmentBudget, RateLimiter and one timer jthread (min-heap of scheduled fns). start() builds a task and returns a DownloadHandle; ~Impl quiesces every task before joining the timer so no callback fires during teardown. - DownloadTaskState (src/task/download_task.cpp): one `mu` task lock; a shared_mutex over the worker map for the curl write path; callbacks collected under `mu` and fired after release via a separate deferred queue; weak_from_this() in every async hop. State machine over the CORE-owned EngineState subset, auto-pause on 401/407 and on a 200 where 206 was expected, validated resume via If-Range. - digest (src/task/digest.cpp): OpenSSL EVP hash_file() for the optional post-download checksum; links OpenSSL::Crypto PRIVATE. - Segmenter::release_segment(): hand a paused segment back to the pool unassigned so resume's assign_slot() picks it up instead of splitting a still-"assigned" range and orphaning its front half. - DownloadHandle now names the real control block (vdm::task:: DownloadTaskState, defined only in the engine TU) via a namespace-scope fwd decl and a public-but-effectively-engine-only ctor, replacing the nested State/friend pair. Every public signature is unchanged; DAEMON (vdm-79) confirmed sched/ names only the public API. Fixes found while building the end-to-end suite (tests/task/engine_test.cpp, 9 cases against tools/testserver, green under ASan/UBSan and TSan): - a dropped connection lost its unflushed WriteBuffer tail while advance() had already counted those bytes as done -> a retry resumed past an unwritten hole. Flush on the failure path. - when the byte counters hit total while other workers were still live, teardown dropped their buffered tails. Now: cancel them and let each worker's own seg_finished drain it (the `assembling` state), last one starts verification -- no cross-thread buffer access. - seg_head() let a 401 with credentials present abort before libcurl's resend; now it proceeds once and acts on the final status. Co-Authored-By: Claude Sonnet 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01HPPSGhiArbvQgwC2DNiURS
83 lines
3.3 KiB
CMake
83 lines
3.3 KiB
CMake
# core/ produces TWO targets (ADR 0009):
|
|
# veloxcore — the download engine. No JSON, no SQL, no Qt, no RPC. Ever (CLAUDE.md §3).
|
|
# veloxproto — the generated wire types, which ARE JSON. NOT linked by veloxcore.
|
|
# The `no JSON in core/` rule constrains core/src/ and core/include/; core/generated/ is
|
|
# the sanctioned exception. Wired in by PKG via add_subdirectory(core) in the root file.
|
|
|
|
find_package(Threads REQUIRED)
|
|
find_package(CURL 8.0 REQUIRED)
|
|
find_package(OpenSSL REQUIRED)
|
|
|
|
add_library(veloxcore STATIC
|
|
src/util/error.cpp
|
|
src/util/log.cpp
|
|
src/util/thread_pool.cpp
|
|
src/net/curl_error.cpp
|
|
src/net/http_client.cpp
|
|
src/net/text_codec.cpp
|
|
src/net/content_disposition.cpp
|
|
src/net/url.cpp
|
|
src/net/probe.cpp
|
|
src/io/sparse_file.cpp
|
|
src/io/write_buffer.cpp
|
|
src/meta/veloxpart.cpp
|
|
src/segment/segmenter.cpp
|
|
src/segment/budget.cpp
|
|
src/task/digest.cpp
|
|
src/task/download_task.cpp
|
|
src/engine.cpp
|
|
)
|
|
add_library(velox::core ALIAS veloxcore)
|
|
|
|
target_include_directories(veloxcore
|
|
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src # net/*.cpp -> "net/curl_error.hpp"
|
|
)
|
|
|
|
target_compile_features(veloxcore PUBLIC cxx_std_23)
|
|
|
|
# Warnings are set at target scope, not via CMAKE_CXX_FLAGS: the dev/tsan presets
|
|
# overwrite that cache variable wholesale (see core/docs/pkg-requests-m1.md P4).
|
|
target_compile_options(veloxcore PRIVATE
|
|
-Wall -Wextra -Wpedantic -Werror
|
|
)
|
|
|
|
target_link_libraries(veloxcore PUBLIC Threads::Threads CURL::libcurl PRIVATE OpenSSL::Crypto)
|
|
|
|
# Later stages add: find_package(OpenSSL) for meta/ (streaming SHA-256 + resume CRC).
|
|
|
|
# --- libveloxproto — generated wire code (ADR 0009) --------------------------------------
|
|
# Its own target so libveloxcore stays JSON-free. Consumed by veloxd, the CLI, the GUI and
|
|
# the conformance runner. The root CMakeLists only find_package(nlohmann_json)'s when
|
|
# daemon/ has landed, so find it here too — this must build even if core is the only lane.
|
|
if(NOT TARGET nlohmann_json::nlohmann_json)
|
|
find_package(nlohmann_json 3.11 REQUIRED)
|
|
endif()
|
|
|
|
add_library(veloxproto STATIC generated/velox_proto.cpp)
|
|
add_library(velox::proto ALIAS veloxproto)
|
|
|
|
target_include_directories(veloxproto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/generated)
|
|
target_compile_features(veloxproto PUBLIC cxx_std_23)
|
|
target_link_libraries(veloxproto PUBLIC nlohmann_json::nlohmann_json)
|
|
|
|
# Generated code is committed and never hand-edited (CLAUDE.md §2); do not fail the build
|
|
# on a codegen quirk that trips -Werror. Warnings stay on for visibility.
|
|
target_compile_options(veloxproto PRIVATE -Wall -Wextra -Wno-error)
|
|
|
|
# A build-time tripwire for the split ADR 0009 exists to protect: veloxcore must never end
|
|
# up linking veloxproto.
|
|
get_target_property(_core_links veloxcore LINK_LIBRARIES)
|
|
if(_core_links AND "veloxproto" IN_LIST _core_links)
|
|
message(FATAL_ERROR "veloxcore links veloxproto — ADR 0009 violation (engine sees JSON).")
|
|
endif()
|
|
|
|
if(VELOX_BUILD_TESTS)
|
|
add_subdirectory(tests)
|
|
endif()
|
|
|
|
# Fuzz targets live in ${CMAKE_SOURCE_DIR}/tools/fuzz (lane CORE) and are wired in by the
|
|
# top-level CMakeLists.txt, which add_subdirectory()s every tools/* with a CMakeLists.
|
|
# tools/fuzz/CMakeLists.txt self-guards on VELOX_BUILD_FUZZ + a Clang compiler.
|
|
# Present: Content-Disposition, URL (stage 3). Coming: .veloxpart.meta (stage 5).
|