Skip to content

GCC 12 compatibility #172

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
cuveland merged 4 commits into from
Jan 26, 2023
Merged

GCC 12 compatibility #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99abc4a
Ignore a warning in Boost.Lockfree which occurs when using GCC 12
cuveland Jan 25, 2023
863f6f4
Change CMakeLists.txt files to comply with newer CMake policies
cuveland Jan 25, 2023
6400fcc
Fix an issue that caused a warning in recent versions of CMake
cuveland Jan 25, 2023
0e24836
Add a check to prevent a -Wnull-dereference warning from GCC 12
cuveland Jan 26, 2023
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ endforeach()
# Boost
# Inherit FairMQ Boost deps and add ours
set(Boost_COMPONENTS ${FairMQ_Boost_COMPONENTS})
list(INSERT Boost_COMPONENTS
range
list(APPEND Boost_COMPONENTS
filesystem
iostreams
unit_test_framework
Expand Down
8 changes: 4 additions & 4 deletions src/ReadoutEmulator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
## \brief cmake for ReadoutEmulator

set(EXE_EMU_SOURCES
CruMemoryHandler
CruEmulator
ReadoutDevice
runReadoutEmulatorDevice
CruMemoryHandler.cxx
CruEmulator.cxx
ReadoutDevice.cxx
runReadoutEmulatorDevice.cxx
)

add_executable(ReadoutEmulator ${EXE_EMU_SOURCES})
Expand Down
6 changes: 3 additions & 3 deletions src/StfBuilder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
## \brief cmake for StfBuilder

set(EXE_STFB_SOURCES
StfBuilderInput
StfBuilderDevice
runStfBuilderDevice
StfBuilderInput.cxx
StfBuilderDevice.cxx
runStfBuilderDevice.cxx
)

add_library(StfBuilder_lib OBJECT ${EXE_STFB_SOURCES})
Expand Down
12 changes: 6 additions & 6 deletions src/StfSender/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
## \brief cmake for StfSender

set(EXE_STFS_SOURCES
StfSenderDevice
StfSenderOutput
StfSenderOutputFairMQ
StfSenderOutputUCX
StfSenderRpc
runStfSenderDevice
StfSenderDevice.cxx
StfSenderOutput.cxx
StfSenderOutputFairMQ.cxx
StfSenderOutputUCX.cxx
StfSenderRpc.cxx
runStfSenderDevice.cxx
)

add_library(StfSender_lib OBJECT ${EXE_STFS_SOURCES})
Expand Down
8 changes: 7 additions & 1 deletion src/StfSender/StfSenderOutputUCX.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,13 @@ bool StfSenderOutputUCX::disconnectTfBuilder(const std::string &pTfBuilderId)
}
return true;
}
lConnInfo = std::move(mOutputMap.extract(lIt).mapped());
auto lConnInfoNode = mOutputMap.extract(lIt);
if (lConnInfoNode.empty()) {
// this should never happen, but the check makes the static analyzer happy
EDDLOG("StfSenderOutputUCX::disconnectTfBuilder: Internal error. tfb_id={}", pTfBuilderId);
return true;
}
lConnInfo = std::move(lConnInfoNode.mapped());
}

// Transport is only closed when other side execute close as well. Execute async
Expand Down
12 changes: 6 additions & 6 deletions src/TfBuilder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
## \brief cmake for TfBuilder

set(EXE_TFB_SOURCES
TfBuilderDevice
TfBuilderInput
TfBuilderInputFairMQ
TfBuilderInputUCX
TfBuilderRpc
runTfBuilderDevice
TfBuilderDevice.cxx
TfBuilderInput.cxx
TfBuilderInputFairMQ.cxx
TfBuilderInputUCX.cxx
TfBuilderRpc.cxx
runTfBuilderDevice.cxx
)

add_library(TfBuilder_lib OBJECT ${EXE_TFB_SOURCES})
Expand Down
16 changes: 8 additions & 8 deletions src/TfScheduler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
## \brief cmake for TfScheduler

set(EXE_TFS_SOURCES
TfSchedulerDevice
TfSchedulerInstance
TfSchedulerInstanceRpc
TfSchedulerConnManager
TfSchedulerTfBuilderInfo
TfSchedulerStfInfo
TfSchedulerTokenManager
runTfScheduler
TfSchedulerDevice.cxx
TfSchedulerInstance.cxx
TfSchedulerInstanceRpc.cxx
TfSchedulerConnManager.cxx
TfSchedulerTfBuilderInfo.cxx
TfSchedulerStfInfo.cxx
TfSchedulerTokenManager.cxx
runTfScheduler.cxx
)

add_library(TfScheduler_lib OBJECT ${EXE_TFS_SOURCES})
Expand Down
3 changes: 3 additions & 0 deletions src/TfScheduler/TfSchedulerTokenManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
#include <thread>
#include <shared_mutex>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnull-dereference"
#include <boost/lockfree/stack.hpp>
#pragma GCC diagnostic pop
#include <boost/lockfree/queue.hpp>

namespace o2::DataDistribution
Expand Down
20 changes: 10 additions & 10 deletions src/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ if(UCX_FOUND)
endif()

set (LIB_COMMON_SOURCES
ReadoutDataModel
SubTimeFrameBuilder
SubTimeFrameDataModel
SubTimeFrameVisitors
SubTimeFrameFile
SubTimeFrameFileWriter
SubTimeFrameFileSink
SubTimeFrameFileReader
SubTimeFrameFileSource
SubTimeFrameDPL
ReadoutDataModel.cxx
SubTimeFrameBuilder.cxx
SubTimeFrameDataModel.cxx
SubTimeFrameVisitors.cxx
SubTimeFrameFile.cxx
SubTimeFrameFileWriter.cxx
SubTimeFrameFileSink.cxx
SubTimeFrameFileReader.cxx
SubTimeFrameFileSource.cxx
SubTimeFrameDPL.cxx
)

add_library(common OBJECT ${LIB_COMMON_SOURCES})
Expand Down
4 changes: 2 additions & 2 deletions src/common/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#-------------------------------------------------------------------------------
set (LIB_BASE_SOURCES
DataDistLogger
FilePathUtils
DataDistLogger.cxx
FilePathUtils.cxx
)

add_library(base OBJECT ${LIB_BASE_SOURCES})
Expand Down
2 changes: 1 addition & 1 deletion src/common/discovery/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#-------------------------------------------------------------------------------

set (LIB_DISCOVERY_SOURCES
ConfigConsul
ConfigConsul.cxx
)

set (LIB_DISCOVERY_PROTOS
Expand Down
2 changes: 1 addition & 1 deletion src/common/fmqtools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#-------------------------------------------------------------------------------
set (LIB_FMQTOOLS_SOURCES
FmqUtilities
FmqUtilities.cxx
)

add_library(fmqtools OBJECT ${LIB_FMQTOOLS_SOURCES})
Expand Down
2 changes: 1 addition & 1 deletion src/common/monitoring/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#-------------------------------------------------------------------------------
set (LIB_MON_SOURCES
DataDistMonitoring
DataDistMonitoring.cxx
)

add_library(monitoring OBJECT ${LIB_MON_SOURCES})
Expand Down
4 changes: 2 additions & 2 deletions src/common/rpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#-------------------------------------------------------------------------------
set (LIB_BASE_SOURCES
StfSenderRpcClient
TfSchedulerRpcClient
StfSenderRpcClient.cxx
TfSchedulerRpcClient.cxx
)

add_library(rpc OBJECT ${LIB_BASE_SOURCES})
Expand Down
2 changes: 1 addition & 1 deletion src/common/ucxtools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#-------------------------------------------------------------------------------
set (LIB_UCXTOOLS_SOURCES
UCXUtilities
UCXUtilities.cxx
)

add_library(ucxtools OBJECT ${LIB_UCXTOOLS_SOURCES})
Expand Down
8 changes: 4 additions & 4 deletions src/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# Unit test for FilePathUtils class

set(TEST_FILE_PATH_SOURCES
test_FilePathUtils
../common/base/FilePathUtils
test_FilePathUtils.cxx
../common/base/FilePathUtils.cxx
)
add_executable(test_FilePathUtils ${TEST_FILE_PATH_SOURCES})

Expand All @@ -38,7 +38,7 @@ add_test(NAME FilePathUtils_test COMMAND test_FilePathUtils)


set(TEST_FMT_PATTERNS_SOURCES
test_FmtPatterns
test_FmtPatterns.cxx
)
add_executable(test_FmtPatterns ${TEST_FMT_PATTERNS_SOURCES})
target_compile_definitions(test_FmtPatterns PRIVATE "BOOST_TEST_DYN_LINK=1")
Expand All @@ -53,7 +53,7 @@ add_test(NAME FmtPatterns_test COMMAND test_FmtPatterns)


set(TEST_BITMAP_SOURCES
test_Bitmap
test_Bitmap.cxx
)
add_executable(test_Bitmap ${TEST_BITMAP_SOURCES})
target_compile_definitions(test_Bitmap PRIVATE "BOOST_TEST_DYN_LINK=1")
Expand Down