Skip to content

split run configuration to Runmode and Base, add buffering and compression to monitoring and logging #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brichards64 merged 10 commits into from
Mar 19, 2026
Merged

split run configuration to Runmode and Base, add buffering and compression to monitoring and logging #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
433ff65
remove SendRootPlotMulticast
superkanalysis Feb 26, 2026
fd26588
uncomment functinality of LoadConfig1 as we now have it
Mar 14, 2026
2d6e427
replace gmtime with thread-safe version
Mar 15, 2026
e37a9a2
updates to configuration handling
Mar 17, 2026
6dddb20
don't prepend leading 'z' for compressed messages, it complicates things
Mar 18, 2026
b558e25
missing +1
Mar 18, 2026
87c450d
bugfix; comma needed when not first
Mar 18, 2026
c5b0d69
bugfix for compressed zmq messaages in ServicesBackend, add verbosity…
Mar 18, 2026
64d1c2f
orderign
Mar 18, 2026
05b9a93
Update ToolDAQChain.cpp
marc1uk Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ else
CXXFLAGS+= -O3
endif

ZMQLib= -L ../zeromq-4.0.7/lib -lzmq
ZMQInclude= -I ../zeromq-4.0.7/include/
ZMQLib= -L ../zeromq-4.0.7/lib -lzmq
ZMQInclude= -I ../zeromq-4.0.7/include/

BoostLib= -L ../boost_1_66_0/install/lib -lboost_date_time -lboost_serialization -lboost_iostreams
BoostInclude= -isystem ../boost_1_66_0/install/include/
Expand All @@ -21,14 +21,13 @@ TempDataModelLib =
TempToolsInclude =
TempToolsLib =


Includes= -I $(ToolFrameworkDIR)/include/ -I $(SOURCEDIR)/include/ -I $(SOURCEDIR)/tempinclude/ $(ZMQInclude) $(BoostInclude)
Libs=-L $(SOURCEDIR)/lib/ -lTempDAQDataModel -lTempDAQTools -lToolDAQChain -lServiceDiscovery -lDAQDataModelBase -lDAQStore -lDAQLogging $(BoostLib) $(ZMQLib) -L $(ToolFrameworkDIR)/lib/ -lToolChain -lTempDAQTools -lDataModelBase -lpthread -lLogging -lStore
LIBRARIES=lib/libDAQStore.so lib/libDAQLogging.so lib/libToolDAQChain.so lib/libDAQDataModelBase.so lib/libTempDAQDataModel.so lib/libTempDAQTools.so lib/libServiceDiscovery.so
HEADERS:=$(patsubst %.h, include/%.h, $(filter %.h, $(subst /, ,$(wildcard src/*/*.h) )))
TempDataModelHEADERS:=$(patsubst %.h, tempinclude/%.h, $(filter %.h, $(subst /, , $(wildcard DataModel/*.h))))
TempToolHEADERS:=$(patsubst %.h, tempinclude/%.h, $(filter %.h, $(subst /, , $(wildcard UserTools/*/*.h) $(wildcard UserTools/*.h))))
SOURCEFILES:=$(patsubst %.cpp, %.o, $(wildcard */*.cpp) $(wildcard */*/*.cpp))
SOURCEFILES:=$(patsubst %.cpp, %.o, $(wildcard */*.cpp) $(wildcard */*/*.cpp)) $(patsubst %.c, %.o, $(wildcard */*.c) $(wildcard */*/*.c))

#.SECONDARY: $(%.o)

Expand All @@ -49,35 +48,39 @@ tempinclude/%.h:
@echo -e "\e[38;5;87m\n*************** sym linking headers ****************\e[0m"
ln -s $(SOURCEDIR)/$(filter %$(strip $(patsubst tempinclude/%.h, /%.h, $@)), $(wildcard DataModel/*.h) $(wildcard UserTools/*/*.h) $(wildcard UserTools/*.h)) $@

src/%.o : src/%.cpp $(HEADERS)
src/%.o : src/%.cpp $(HEADERS)
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes)

src/%.o : src/%.c $(HEADERS)
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes)

UnitTests/%.o : UnitTests/%.cpp $(HEADERS)
UnitTests/%.o : UnitTests/%.cpp $(HEADERS)
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes)

UserTools/%.o : UserTools/%.cpp $(HEADERS) $(TempDataModelHEADERS) UserTools/%.h
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes) $(TempDataModelInclude) $(TempToolsInclude)

UserTools/Factory/Factory.o : UserTools/Factory/Factory.cpp $(HEADERS) $(TempDataModelHEADERS)
UserTools/Factory/Factory.o : UserTools/Factory/Factory.cpp $(HEADERS) $(TempDataModelHEADERS)
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes) $(TempDataModelInclude) $(TempToolsInclude)

DataModel/%.o : DataModel/%.cpp DataModel/%.h $(HEADERS) $(TempDataModelHEADERS)
@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) -c $< -o $@ $(Includes) $(TempDataModelInclude)

lib/libDAQStore.so: $(patsubst %.cpp, %.o , $(wildcard src/Store/*.cpp)) | $(HEADERS)
lib/libDAQStore.so: $(patsubst %.cpp, %.o , $(wildcard src/Store/*.cpp)) | $(HEADERS)
@echo -e "\e[38;5;201m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) --shared $^ -o $@ $(Includes)

lib/libDAQLogging.so: $(patsubst %.cpp, %.o , $(wildcard src/DAQLogging/*.cpp)) | $(HEADERS)
lib/libDAQLogging.so: $(patsubst %.cpp, %.o , $(wildcard src/DAQLogging/*.cpp)) | $(HEADERS)
@echo -e "\e[38;5;201m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) --shared $^ -o $@ $(Includes)

lib/libServiceDiscovery.so: $(patsubst %.cpp, %.o , $(wildcard src/ServiceDiscovery/*.cpp)) | $(HEADERS)
lib/libServiceDiscovery.so: $(patsubst %.cpp, %.o , $(wildcard src/ServiceDiscovery/*.cpp)) $(patsubst %.c, %.o , $(wildcard src/ServiceDiscovery/*.c)) | $(HEADERS)
@echo -e "\e[38;5;201m\n*************** Making " $@ "****************\e[0m"
g++ $(CXXFLAGS) --shared $^ -o $@ $(Includes)

Expand Down
Loading
Loading