Skip to content

Commit 645e8a3

Browse files
luisleo526claude
andcommitted
Merge main into the memory-cache branch
Brings in the run-quota admission of scratch-file growth and of the sink assembly's temporary storage. Three files conflicted and are resolved by hand: the source-bounds manifest keeps the cache work's entries and takes main's three new entries under fresh ids (the cache work already uses the ids main took for its own new entries), with the open unreviewed ceiling and the gate test's pinned open count both set to the manifest's 1344 unreviewed plus 184 pending entries; docs/pages/memory-management.md keeps the cache wording and takes main's line numbers for ScratchFile::open and kCacheBytes in the rewritten scratch_file.hpp. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
2 parents a5dad8a + 1a7593b commit 645e8a3

22 files changed

Lines changed: 3910 additions & 96 deletions

‎ci/cr150-source-bounds.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ceilings:
8080
# These entries remain OPEN.
8181
# The literal-vector proof form cannot express a caller's fixed byte policy.
8282
# Two feed-projection builder entries: the resident one-page provider and the directory string.
83-
unreviewed: 1341
83+
unreviewed: 1344
8484
pending-flat-memory: 184
8585
owners:
8686
- {name: "generated-cpp", globs: ["tutorial/**"]}
@@ -1304,6 +1304,8 @@ entries:
13041304
- {id: "U1254", file: "include/pineforge/detail/scratch_file.hpp", symbol: "directory_", ops: ["assign", "decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 50}
13051305
- {id: "U1255", file: "include/pineforge/detail/scratch_file.hpp", symbol: "name", ops: ["append", "decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 137}
13061306
- {id: "U1256", file: "include/pineforge/detail/scratch_file.hpp", symbol: "refusal", ops: ["decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 135}
1307+
- {id: "U1649", file: "include/pineforge/detail/scratch_file.hpp", symbol: "quota_", ops: ["alloc", "grow"], container: "unresolved by the index: quota_.reserve(...)", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 53}
1308+
- {id: "U1650", file: "include/pineforge/detail/scratch_file.hpp", symbol: "reservation", ops: ["grow"], container: "unresolved by the index: reservation.emplace(...)", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 298}
13071309
- {id: "U1257", file: "include/pineforge/detail/scratch_sequence.hpp", symbol: "<temp:const_iterator>", ops: ["temp"], container: "unresolved by the index: const_iterator", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 26}
13081310
- {id: "U1258", file: "include/pineforge/detail/scratch_sequence.hpp", symbol: "begin", ops: ["decl"], container: "const_iterator", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 91}
13091311
- {id: "U1259", file: "include/pineforge/detail/scratch_sequence.hpp", symbol: "directory_", ops: ["assign", "decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 52}
@@ -1364,6 +1366,7 @@ entries:
13641366
- {id: "U1317", file: "src/command_scratch_production.cpp", symbol: "budget", ops: ["alloc"], container: "std::shared_ptr<CommandScratchByteBudget>", owner: "engine-core", phase: "unclassified", state: "unreviewed", note: "Setup creates one shared byte-budget control when the weak environment registration is absent or has a different limit. Factory now takes resident_bytes and cache_bytes. The budget control is fixed-size; the admitted backing byte limit is not an optional cache capacity or a proof of a population bound.", line: 416}
13651367
- {id: "U1318", file: "src/command_scratch_production.cpp", symbol: "budget_", ops: ["grow"], container: "unresolved by the index: budget_.reserve(...)", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 175}
13661368
- {id: "U1319", file: "src/command_scratch_production.cpp", symbol: "make_unique", ops: ["alloc"], container: "command cache decorator and arena/file backing controls", owner: "engine-core", phase: "unclassified", state: "unreviewed", note: "Four setup identities move into the three-argument factory: arena decorator/inner and file decorator/inner, mutually exclusive pairs. Each construction allocates one control object; cache/prefix bytes are U1316, mandatory scratch workspace and backing extent are separately owned. All four ordinals remain OPEN.", line: 425}
1369+
- {id: "U1651", file: "src/command_scratch_production.cpp", symbol: "quota_", ops: ["alloc"], container: "unresolved by the index: make_unique", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 232}
13671370
- {id: "U1320", file: "src/command_scratch_production.cpp", symbol: "path", ops: ["append", "decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 226}
13681371
- {id: "U1321", file: "src/command_scratch_production.cpp", symbol: "refusal", ops: ["decl"], container: "std::string", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 224}
13691372
- {id: "U1322", file: "src/command_scratch_production.cpp", symbol: "set_command_scratch_byte_cap", ops: ["alloc"], container: "unresolved by the index: make_shared", owner: "engine-core", phase: "unclassified", state: "unreviewed", line: 368}

‎ci/cr150-source-sites.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,6 +2141,31 @@
21412141
"spelling": "message + = . . .",
21422142
"ordinal": 5
21432143
},
2144+
{
2145+
"file": "include/pineforge/detail/scratch_file.hpp",
2146+
"symbol": "quota_",
2147+
"scope": [
2148+
"namespace pineforge :: detail #1",
2149+
"class ScratchFileQuota #1",
2150+
"public : explicit ScratchFileQuota ( QuotaArtifact artifact ) : quota_ ( RunQuota :: from_environment ( ) ) , artifact_ ( artifact ) #1"
2151+
],
2152+
"cls": "grow",
2153+
"spelling": "quota_ . reserve ( . . . )",
2154+
"ordinal": 1
2155+
},
2156+
{
2157+
"file": "include/pineforge/detail/scratch_file.hpp",
2158+
"symbol": "quota_",
2159+
"scope": [
2160+
"namespace pineforge :: detail #1",
2161+
"class ScratchFileQuota #1",
2162+
"class Growth #1",
2163+
"public : Growth ( ScratchFileQuota & owner , std :: uint64_t requested_end ) : owner_ ( owner ) , realized_ ( owner . extent_ ) #1"
2164+
],
2165+
"cls": "grow",
2166+
"spelling": "quota_ . reserve ( . . . )",
2167+
"ordinal": 1
2168+
},
21442169
{
21452170
"file": "include/pineforge/detail/scratch_file.hpp",
21462171
"symbol": "directory_",
@@ -2166,6 +2191,18 @@
21662191
"spelling": "directory_ = . . .",
21672192
"ordinal": 1
21682193
},
2194+
{
2195+
"file": "include/pineforge/detail/scratch_file.hpp",
2196+
"symbol": "reservation",
2197+
"scope": [
2198+
"namespace pineforge :: detail #1",
2199+
"class ScratchFile #1",
2200+
"void truncate ( std :: uint64_t bytes ) #1"
2201+
],
2202+
"cls": "grow",
2203+
"spelling": "reservation . emplace ( . . . )",
2204+
"ordinal": 1
2205+
},
21692206
{
21702207
"file": "include/pineforge/detail/scratch_file.hpp",
21712208
"symbol": "refusal",
@@ -2226,6 +2263,56 @@
22262263
"spelling": "name + = . . .",
22272264
"ordinal": 3
22282265
},
2266+
{
2267+
"file": "include/pineforge/detail/scratch_file.hpp",
2268+
"symbol": "quota_",
2269+
"scope": [
2270+
"namespace pineforge :: detail #1",
2271+
"class ScratchFile #1",
2272+
"void open ( const char * prefix ) #1",
2273+
"if ( mode ( ) = = QuotaMode :: managed ) #1"
2274+
],
2275+
"cls": "alloc",
2276+
"spelling": "make_unique",
2277+
"ordinal": 1
2278+
},
2279+
{
2280+
"file": "include/pineforge/detail/scratch_file.hpp",
2281+
"symbol": "reservation",
2282+
"scope": [
2283+
"namespace pineforge :: detail #1",
2284+
"class ScratchFile #1",
2285+
"void ensure_size ( std :: uint64_t bytes , std :: uint64_t needed_bytes_lower_bound = 0 ) #1"
2286+
],
2287+
"cls": "grow",
2288+
"spelling": "reservation . emplace ( . . . )",
2289+
"ordinal": 1
2290+
},
2291+
{
2292+
"file": "include/pineforge/detail/scratch_file.hpp",
2293+
"symbol": "reservation",
2294+
"scope": [
2295+
"namespace pineforge :: detail #1",
2296+
"class ScratchFile #1",
2297+
"ssize_t write_some ( std :: uint64_t offset , const void * data , std :: size_t length ) #1",
2298+
"else #1"
2299+
],
2300+
"cls": "grow",
2301+
"spelling": "reservation . emplace ( . . . )",
2302+
"ordinal": 1
2303+
},
2304+
{
2305+
"file": "include/pineforge/detail/scratch_file.hpp",
2306+
"symbol": "reservation",
2307+
"scope": [
2308+
"namespace pineforge :: detail #1",
2309+
"class ScratchFile #1",
2310+
"void write ( std :: uint64_t offset , const void * data , std :: size_t length ) #1"
2311+
],
2312+
"cls": "grow",
2313+
"spelling": "reservation . emplace ( . . . )",
2314+
"ordinal": 1
2315+
},
22292316
{
22302317
"file": "include/pineforge/detail/scratch_file.hpp",
22312318
"symbol": "directory_",
@@ -13321,6 +13408,19 @@
1332113408
"spelling": "path + = . . .",
1332213409
"ordinal": 2
1332313410
},
13411+
{
13412+
"file": "src/command_scratch_production.cpp",
13413+
"symbol": "quota_",
13414+
"scope": [
13415+
"namespace pineforge :: detail #1",
13416+
"namespace #2",
13417+
"class CommandScratchFile final : public ScratchBacking #1",
13418+
"public : CommandScratchFile ( std :: size_t size , ScratchIoObserver observer ) : ScratchBacking ( ScratchBackingKind :: disk , size , observer ) #1"
13419+
],
13420+
"cls": "alloc",
13421+
"spelling": "make_unique",
13422+
"ordinal": 1
13423+
},
1332413424
{
1332513425
"file": "src/command_scratch_production.cpp",
1332613426
"symbol": "set_command_scratch_byte_cap",

0 commit comments

Comments
 (0)