P3 follow-up: move occ/ under cc/#42
Merged
Merged
Conversation
occ/ was the only CC implementation still sitting at the repo root after
the rest moved to cc/. It uses a plain Makefile on the legacy uint64-key
API and is not wired into CMake, so it's a cosmetic move — not a
functional change — but worth doing so cc/ contains every protocol.
- git mv occ -> cc/occ
- Relative includes shifted to account for the extra depth:
.cc files at cc/occ/: "../include/..." -> "../../include/..."
headers at cc/occ/include/: "../../include/..." -> "../../../include/..."
- Makefile relative paths adjusted similarly (REL, -I, masstree include,
clean target).
- Doc references in CLAUDE.md and docs/protocols.md updated.
The Makefile still references include/MakefileForMasstreeUse which is
not in the tree, so the build was already broken before this move; not
in scope to fix here. Porting cc/occ/ to ccbench_add_protocol(...) is
the natural follow-up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to #41 —
occ/was the only CC implementation still sitting at the repo root after the rest moved tocc/. It uses a plain Makefile on the legacy uint64-key API and is not wired into CMake, so this is a cosmetic / consistency move rather than a functional change.git mv occ -> cc/occ.ccfiles atcc/occ/:"../include/..."→"../../include/..."cc/occ/include/:"../../include/..."→"../../../include/..."cc/occ/Makefilerelative paths (REL,-I, the masstree include,cleantarget) adjusted similarly.CLAUDE.mdanddocs/protocols.mdreferences updated.Caveat
cc/occ/Makefilestill referencesinclude/MakefileForMasstreeUse, which is not in the tree, so the build was already broken before this move — not in scope to fix here. Portingcc/occ/toccbench_add_protocol(...)is the natural follow-up.Test plan
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug && cmake --build build -jstill succeeds (34 binaries —occis not part of the CMake tree)occ/inCLAUDE.md,README.md,docs/,CMakeLists.txt