mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 17:41:45 +00:00
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3c1723fc54 | ||
|
c3418cc7b8 | ||
|
cc00c5a6f1 | ||
|
e6bb14f535 | ||
|
b18d60372c | ||
|
7ceccdeaa6 | ||
|
d1c99f7e15 | ||
|
bfc665d76e |
21
.github/workflows/codemeta_validate.yaml
vendored
Normal file
21
.github/workflows/codemeta_validate.yaml
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
name: validate codemeta
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- codemeta.json
|
||||
- .github/workflows/codemeta_validate.yaml
|
||||
pull_request:
|
||||
paths:
|
||||
- codemeta.json
|
||||
- .github/workflows/codemeta_validate.yaml
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitlab-registry.in2p3.fr/escape2020/wp3/eossr:v1.0
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: validate codemeta
|
||||
run: eossr-metadata-validator codemeta.json
|
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"creators": [
|
||||
{
|
||||
"orcid": "0000-0002-8071-4497",
|
||||
"name": "Al-Turany, Mohammad"
|
||||
},
|
||||
{
|
||||
|
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -93,8 +93,8 @@ pipeline{
|
||||
[os: 'fedora', ver: '36', arch: 'x86_64', compiler: 'gcc-12'],
|
||||
[os: 'fedora', ver: '37', arch: 'x86_64', compiler: 'gcc-12'],
|
||||
[os: 'fedora', ver: '38', arch: 'x86_64', compiler: 'gcc-13'],
|
||||
[os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-13', extra: '-DHAS_ASIO=ON'],
|
||||
[os: 'macos', ver: '12', arch: 'arm64', compiler: 'apple-clang-13', extra: '-DHAS_ASIO=ON'],
|
||||
[os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-14'],
|
||||
[os: 'macos', ver: '13', arch: 'arm64', compiler: 'apple-clang-14'],
|
||||
])
|
||||
|
||||
def all_debug = "-DCMAKE_BUILD_TYPE=Debug"
|
||||
|
@@ -98,6 +98,7 @@ On command line:
|
||||
* `-DBUILD_TESTING=OFF` disables building of tests.
|
||||
* `-DBUILD_EXAMPLES=OFF` disables building of examples.
|
||||
* `-DBUILD_DOCS=ON` enables building of API docs.
|
||||
* `-DFAIRMQ_CHANNEL_DEFAULT_AUTOBIND=OFF` disable channel `autoBind` by default
|
||||
* You can hint non-system installations for dependent packages, see the #installation-from-source section above
|
||||
|
||||
After the `find_package(FairMQ)` call the following CMake variables are defined:
|
||||
|
@@ -96,7 +96,10 @@ endmacro()
|
||||
|
||||
macro(fairmq_summary_compile_definitions)
|
||||
message(STATUS " ")
|
||||
message(STATUS " ${Cyan}COMPILE DEFINITION VALUE${CR}")
|
||||
message(STATUS " ${BWhite}FAIRMQ_HAS_STD_FILESYSTEM${CR} ${FAIRMQ_HAS_STD_FILESYSTEM} (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_FILESYSTEM=0|1${CR})")
|
||||
message(STATUS " ${BWhite}FAIRMQ_HAS_STD_PMR${CR} ${FAIRMQ_HAS_STD_PMR} (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_PMR=0|1${CR})")
|
||||
message(STATUS " ${Cyan}COMPILE DEFINITION VALUE${CR}")
|
||||
message(STATUS " ${BWhite}FAIRMQ_HAS_STD_FILESYSTEM${CR} ${FAIRMQ_HAS_STD_FILESYSTEM} (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_FILESYSTEM=0|1${CR})")
|
||||
message(STATUS " ${BWhite}FAIRMQ_HAS_STD_PMR${CR} ${FAIRMQ_HAS_STD_PMR} (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_PMR=0|1${CR})")
|
||||
if(DEFINED FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
|
||||
message(STATUS " ${BWhite}FAIRMQ_CHANNEL_DEFAULT_AUTOBIND${CR} ${FAIRMQ_CHANNEL_DEFAULT_AUTOBIND}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
@@ -7,11 +7,20 @@
|
||||
"datePublished": "2018-04-15",
|
||||
"developmentStatus": "active",
|
||||
"codeRepository": "https://github.com/FairRootGroup/FairMQ/",
|
||||
"readme": "https://github.com/FairRootGroup/FairMQ/#readme",
|
||||
"issueTracker": "https://github.com/FairRootGroup/FairMQ/issues",
|
||||
"identifier": "https://doi.org/10.5281/zenodo.1689985",
|
||||
"maintainer": [
|
||||
{
|
||||
"@type": "ResearchOrganisation",
|
||||
"@id": "https://ror.org/02k8cbn47",
|
||||
"name": "GSI Helmholtz Centre for Heavy Ion Research"
|
||||
}
|
||||
],
|
||||
"author": [
|
||||
{
|
||||
"@type": "Person",
|
||||
"@id": "https://orcid.org/0000-0002-8071-4497",
|
||||
"givenName": "Mohammad",
|
||||
"familyName": "Al-Turany"
|
||||
},
|
||||
|
@@ -174,6 +174,15 @@ if(BUILD_FAIRMQ)
|
||||
FAIRMQ_HAS_STD_FILESYSTEM=${FAIRMQ_HAS_STD_FILESYSTEM}
|
||||
FAIRMQ_HAS_STD_PMR=${FAIRMQ_HAS_STD_PMR}
|
||||
)
|
||||
if(DEFINED FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
|
||||
# translate CMake boolean (TRUE, FALSE, 0, 1, OFF, ON) into C++ boolean literal (true, false)
|
||||
if(FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
|
||||
set(value "true")
|
||||
else()
|
||||
set(value "false")
|
||||
endif()
|
||||
target_compile_definitions(${target} PUBLIC FAIRMQ_CHANNEL_DEFAULT_AUTOBIND=${value})
|
||||
endif()
|
||||
|
||||
|
||||
#######################
|
||||
|
@@ -379,7 +379,11 @@ class Channel
|
||||
static constexpr int DefaultRateLogging = 1;
|
||||
static constexpr int DefaultPortRangeMin = 22000;
|
||||
static constexpr int DefaultPortRangeMax = 23000;
|
||||
#ifdef FAIRMQ_CHANNEL_DEFAULT_AUTOBIND
|
||||
static constexpr bool DefaultAutoBind = FAIRMQ_CHANNEL_DEFAULT_AUTOBIND;
|
||||
#else
|
||||
static constexpr bool DefaultAutoBind = true;
|
||||
#endif
|
||||
|
||||
friend std::ostream& operator<<(std::ostream& os, const Channel& ch)
|
||||
{
|
||||
|
@@ -288,7 +288,7 @@ void Device::AttachChannels(vector<Channel*>& chans)
|
||||
// remove the channel from the uninitialized container
|
||||
itr = chans.erase(itr);
|
||||
} else {
|
||||
LOG(error) << "failed to attach channel " << (*itr)->fName << " (" << (*itr)->fMethod << ")";
|
||||
LOG(error) << "failed to attach channel " << (*itr)->fName << " (" << (*itr)->fMethod << " on " << (*itr)->fAddress << ")";
|
||||
++itr;
|
||||
}
|
||||
} else {
|
||||
|
@@ -310,7 +310,9 @@ try {
|
||||
|
||||
void StateMachine::SubscribeToStateChange(const string& key, function<void(const State)> callback)
|
||||
{
|
||||
static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignalsMap.insert({key, static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignal.connect(callback)});
|
||||
// Check if the key has a integer value as prefix, if yes, decode it.
|
||||
int i = strtol(key.c_str(), nullptr, 10);
|
||||
static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignalsMap.insert({key, static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignal.connect(i, callback)});
|
||||
}
|
||||
|
||||
void StateMachine::UnsubscribeFromStateChange(const string& key)
|
||||
|
Reference in New Issue
Block a user