Skip to content

Commit 9a567e6

Browse files
sawenzelclaude
andcommitted
Move the o2-sim device implementations into source files
This moves the implementation of the o2-sim primary server, worker and hit merger devices out of their headers. - The three device headers defined all member functions and several non-inline free functions. - Each header now declares its class; the definitions are in O2PrimaryServerDevice.cxx, O2SimDevice.cxx and O2HitMerger.cxx, compiled into their runners. - querySimConfig moves from O2SimDevice to PrimaryServerState.cxx, so the hit merger no longer includes the worker and macro/o2sim.C. - The helpers in SimPublishChannelHelper.h are now inline, and PrimStateToString is inline constexpr. - The unused nested TMessageWrapper of the hit merger and CustomCleanup of the worker are removed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 64771ff commit 9a567e6

11 files changed

Lines changed: 2160 additions & 1934 deletions

‎run/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ add_library(internal::allsim ALIAS allsim)
5555

5656
o2_add_executable(device-runner
5757
COMPONENT_NAME sim
58-
SOURCES O2SimDeviceRunner.cxx
58+
SOURCES O2SimDeviceRunner.cxx O2SimDevice.cxx PrimaryServerState.cxx
5959
PUBLIC_LINK_LIBRARIES internal::allsim)
6060

6161
o2_add_executable(serial
@@ -80,7 +80,7 @@ o2_add_executable(sim
8080

8181
o2_add_executable(primary-server-device-runner
8282
COMPONENT_NAME sim
83-
SOURCES O2PrimaryServerDeviceRunner.cxx
83+
SOURCES O2PrimaryServerDeviceRunner.cxx O2PrimaryServerDevice.cxx
8484
PUBLIC_LINK_LIBRARIES internal::allsim
8585
TARGETVARNAME simexe)
8686
if(ENABLE_UPGRADES)
@@ -105,7 +105,7 @@ endif()
105105

106106
o2_add_executable(hit-merger-runner
107107
COMPONENT_NAME sim
108-
SOURCES O2HitMergerRunner.cxx
108+
SOURCES O2HitMergerRunner.cxx O2HitMerger.cxx PrimaryServerState.cxx
109109
PUBLIC_LINK_LIBRARIES internal::allsim)
110110

111111
o2_add_executable(g4-determine-unknown-pdg-properties

0 commit comments

Comments
 (0)