P3 follow-up: move occ/ under cc/

CLAUDE.md

@@ -74,7 +74,7 @@ The support matrix is **auto-generated** at configure time from the `WORKLOADS`
 | `cc/d2pl/`   | — | — | ✓ | sBoMB + dBoMB |
 
 **Not built by default** ([CMakeLists.txt](CMakeLists.txt) keeps the line commented):
-- `cc/occ/` — present in tree but uses a plain Makefile, not wired into the CMake tree.
+- [cc/occ/](cc/occ/) — present in tree but uses a plain Makefile on the legacy uint64-key API, not wired into the CMake tree.
 
 `cc/si/` is a fresh implementation derived from `cc/ermia/` by stripping the SSN (Serial Safety Net) layer; the original legacy `si/` (uint64-key API) was replaced. `cc/d2pl/` deliberately doesn't support TPC-C — its deterministic locking model needs pre-declared `lock_entries_`, which the optimistic-style TPC-C templates don't provide.
 

occ/Makefile → cc/occ/Makefile

@@ -1,7 +1,7 @@
 PROG1 = occ.exe
 SV_FORMAT_SRCS1 := occ.cc transaction.cc util.cc result.cc
 
-REL := ../common/
+REL := ../../common/
 include $(REL)Makefile
 SV_FORMAT_ALLSRC = $(SV_FORMAT_SRCS1) $(SRCS2) $(wildcard include/*.hh)
 
@@ -35,15 +35,15 @@ CFLAGS = -c -pipe -g -O3 -std=c++17 -march=native \
 				 -DWAL=$(WAL) \
 
 INCLUDE = -I/usr/include \
-					-I../third_party/ \
+					-I../../third_party/ \
 
 LDLIBS = -lpthread -lboost_filesystem -lboost_system -lgflags -lglog
 
 OBJS1 = $(SV_FORMAT_SRCS1:.cc=.o)
 
 all: $(PROG1)
 
-include ../include/MakefileForMasstreeUse
+include ../../include/MakefileForMasstreeUse
 $(PROG1) : $(OBJS1) $(MASSOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(INCLUDE)
 
@@ -55,5 +55,5 @@ format:
 
 clean:
 	rm -f *~ *.o *.exe *.stackdump
-	rm -f ../common/*~ ../common/*.o ../common/*.exe ../common/*.stackdump
+	rm -f ../../common/*~ ../../common/*.o ../../common/*.exe ../../common/*.stackdump
 	rm -rf .deps

occ/include/atomic_tool.hh → cc/occ/include/atomic_tool.hh

@@ -2,7 +2,7 @@
 
 #include "common.hh"
 
-#include "../../include/inline.hh"
+#include "../../../include/inline.hh"
 
 INLINE uint64_t atomicLoadGE();
 

occ/include/common.hh → cc/occ/include/common.hh

@@ -6,9 +6,9 @@
 
 #include "tuple.hh"
 
-#include "../../include/cache_line_size.hh"
-#include "../../include/int64byte.hh"
-#include "../../include/masstree_wrapper.hh"
+#include "../../../include/cache_line_size.hh"
+#include "../../../include/int64byte.hh"
+#include "../../../include/masstree_wrapper.hh"
 
 #include "gflags/gflags.h"
 #include "glog/logging.h"

occ/include/occ_op_element.hh → cc/occ/include/occ_op_element.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../include/op_element.hh"
+#include "../../../include/op_element.hh"
 
 template <typename T>
 class ReadElement : public OpElement<T> {

occ/include/result.hh → cc/occ/include/result.hh

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "../../include/result.hh"
+#include "../../../include/result.hh"
 
 extern std::vector<Result> OccResult;
 

occ/include/transaction.hh → cc/occ/include/transaction.hh

@@ -4,10 +4,10 @@
 #include <set>
 #include <vector>
 
-#include "../../include/fileio.hh"
-#include "../../include/procedure.hh"
-#include "../../include/result.hh"
-#include "../../include/string.hh"
+#include "../../../include/fileio.hh"
+#include "../../../include/procedure.hh"
+#include "../../../include/result.hh"
+#include "../../../include/string.hh"
 #include "common.hh"
 #include "log.hh"
 #include "occ_op_element.hh"

occ/include/tuple.hh → cc/occ/include/tuple.hh

@@ -6,7 +6,7 @@
 #include <atomic>
 #include <cstdint>
 
-#include "../../include/cache_line_size.hh"
+#include "../../../include/cache_line_size.hh"
 
 class Tuple {
  public:

occ/occ.cc → cc/occ/occ.cc

@@ -19,18 +19,18 @@
 #include "include/transaction.hh"
 #include "include/util.hh"
 
-#include "../include/atomic_wrapper.hh"
-#include "../include/backoff.hh"
-#include "../include/cpu.hh"
-#include "../include/debug.hh"
-#include "../include/fileio.hh"
-#include "../include/masstree_wrapper.hh"
-#include "../include/random.hh"
-#include "../include/result.hh"
-#include "../include/rwlock.hh"
-#include "../include/tsc.hh"
-#include "../include/util.hh"
-#include "../include/zipf.hh"
+#include "../../include/atomic_wrapper.hh"
+#include "../../include/backoff.hh"
+#include "../../include/cpu.hh"
+#include "../../include/debug.hh"
+#include "../../include/fileio.hh"
+#include "../../include/masstree_wrapper.hh"
+#include "../../include/random.hh"
+#include "../../include/result.hh"
+#include "../../include/rwlock.hh"
+#include "../../include/tsc.hh"
+#include "../../include/util.hh"
+#include "../../include/zipf.hh"
 
 using namespace std;
 

occ/result.cc → cc/occ/result.cc

@@ -1,8 +1,8 @@
 #include "include/result.hh"
 #include "include/common.hh"
 
-#include "../include/cache_line_size.hh"
-#include "../include/result.hh"
+#include "../../include/cache_line_size.hh"
+#include "../../include/result.hh"
 
 using namespace std;
 

occ/transaction.cc → cc/occ/transaction.cc

@@ -12,12 +12,12 @@
 #include "include/log.hh"
 #include "include/transaction.hh"
 
-#include "../include/backoff.hh"
-#include "../include/debug.hh"
-#include "../include/fileio.hh"
-#include "../include/masstree_wrapper.hh"
-#include "../include/tsc.hh"
-#include "../include/util.hh"
+#include "../../include/backoff.hh"
+#include "../../include/debug.hh"
+#include "../../include/fileio.hh"
+#include "../../include/masstree_wrapper.hh"
+#include "../../include/tsc.hh"
+#include "../../include/util.hh"
 
 extern void displayDB();
 

occ/util.cc → cc/occ/util.cc

@@ -19,15 +19,15 @@
 #include "include/tuple.hh"
 #include "include/util.hh"
 
-#include "../include/cache_line_size.hh"
-#include "../include/config.hh"
-#include "../include/debug.hh"
-#include "../include/masstree_wrapper.hh"
-#include "../include/procedure.hh"
-#include "../include/random.hh"
-#include "../include/tsc.hh"
-#include "../include/util.hh"
-#include "../include/zipf.hh"
+#include "../../include/cache_line_size.hh"
+#include "../../include/config.hh"
+#include "../../include/debug.hh"
+#include "../../include/masstree_wrapper.hh"
+#include "../../include/procedure.hh"
+#include "../../include/random.hh"
+#include "../../include/tsc.hh"
+#include "../../include/util.hh"
+#include "../../include/zipf.hh"
 
 void chkArg() {
   displayParameter();

docs/protocols.md

@@ -27,8 +27,8 @@ build).
 
 | Directory | Notes |
 |---|---|
-| `cc/occ/` (not yet moved) | K&R OCC (Kung & Robinson, 1981). Uses a plain Makefile, not wired into the CMake tree. |
+| [cc/occ](../cc/occ/) | K&R OCC (Kung & Robinson, 1981). Uses a plain Makefile (on the legacy uint64-key API), not wired into the CMake tree. |
 
-To enable, add it to the `foreach(_proto …)` loop in the top-level
-[CMakeLists.txt](../CMakeLists.txt) once it has a `ccbench_add_protocol(...)`
-entry under `cc/`.
+To enable, port `cc/occ/` to a `ccbench_add_protocol(...)` entry and add
+it to the `foreach(_proto …)` loop in the top-level
+[CMakeLists.txt](../CMakeLists.txt).