From b3fa4f6e7ef56819d6e0643d5782e1e47528882f Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 1 Sep 2022 15:35:53 +0200 Subject: [PATCH 1/6] build: Add config for zenodo.org import --- .zenodo.json | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 .zenodo.json diff --git a/.zenodo.json b/.zenodo.json new file mode 100644 index 00000000..00289c59 --- /dev/null +++ b/.zenodo.json @@ -0,0 +1,83 @@ +{ + "creators": [ + { + "name": "Al-Turany, Mohammad" + }, + { + "name": "Klein, Dennis" + }, + { + "name": "Kollegger, Thorsten" + }, + { + "name": "Rybalchenko, Alexey" + }, + { + "name": "Winckler, Nicolas" + } + ], + "contributors": [ + { + "type": "Other", + "name": "Aphecetche, Laurent" + }, + { + "type": "Other", + "name": "Binet, Sebastien" + }, + { + "type": "Other", + "name": "Eulisse, Giulio" + }, + { + "type": "Other", + "name": "Karabowicz, Radoslaw" + }, + { + "type": "Other", + "name": "Kretz, Matthias" + }, + { + "type": "Other", + "name": "Krzewicki, Mikolaj" + }, + { + "type": "Other", + "name": "Lebedev, Andrey" + }, + { + "type": "Other", + "name": "Mrnjavac, Teo" + }, + { + "type": "Other", + "name": "Neskovic, Gvozden" + }, + { + "type": "Other", + "name": "Richter, Matthias" + }, + { + "type": "Other", + "name": "Tacke, Christian" + }, + { + "type": "Other", + "name": "Uhlig, Florian" + }, + { + "type": "Other", + "name": "Wenzel, Sandro" + } + ], + "description": "C++ Message Queuing Library and Framework", + "related_identifiers": [ + { + "identifier": "https://github.com/FairRootGroup/FairMQ/", + "relation": "isSupplementTo", + "resource_type": "software", + "scheme": "url" + } + ], + "title": "FairMQ" +} From 06b2b9b01fc79a5734f3b2d1a16d89cefdd3056f Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 1 Sep 2022 15:59:28 +0200 Subject: [PATCH 2/6] build: Add license hint to zenodo.org config --- .zenodo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 00289c59..87bd9ce0 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -79,5 +79,6 @@ "scheme": "url" } ], - "title": "FairMQ" + "title": "FairMQ", + "license": "LGPL-3.0-only" } From d478e050baf6bebde8b53a99f3541d7c966102a0 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 1 Sep 2022 16:24:41 +0200 Subject: [PATCH 3/6] build: HTML-Format desc field in zenodo.org config --- .zenodo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 87bd9ce0..bdcb9734 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -70,7 +70,7 @@ "name": "Wenzel, Sandro" } ], - "description": "C++ Message Queuing Library and Framework", + "description": "

C++ Message Queuing Library and Framework

", "related_identifiers": [ { "identifier": "https://github.com/FairRootGroup/FairMQ/", From 9031029d2c0579511b0a685851deba568f101728 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 1 Sep 2022 17:25:25 +0200 Subject: [PATCH 4/6] build: Add ORCID for Dennis Klein --- .zenodo.json | 1 + AUTHORS | 2 +- codemeta.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index bdcb9734..3fc47b5a 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -4,6 +4,7 @@ "name": "Al-Turany, Mohammad" }, { + "orcid": "0000-0003-3787-1910", "name": "Klein, Dennis" }, { diff --git a/AUTHORS b/AUTHORS index 17eddcf0..f0cb5bcd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ Al-Turany, Mohammad -Klein, Dennis +Klein, Dennis [https://orcid.org/0000-0003-3787-1910] Kollegger, Thorsten Rybalchenko, Alexey Winckler, Nicolas diff --git a/codemeta.json b/codemeta.json index 2da3b3c9..c0bd6ec6 100644 --- a/codemeta.json +++ b/codemeta.json @@ -18,7 +18,8 @@ { "@type": "Person", "givenName": "Dennis", - "familyName": "Klein" + "familyName": "Klein", + "@id": "https://orcid.org/0000-0003-3787-1910" }, { "@type": "Person", From 3aae5bae5853b4318ad60676d3e5123318e447f7 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 1 Sep 2022 17:44:16 +0200 Subject: [PATCH 5/6] build: Add ORCID for Christian Tacke --- .zenodo.json | 1 + CONTRIBUTORS | 4 ++-- codemeta.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 3fc47b5a..1cb20b7c 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -60,6 +60,7 @@ }, { "type": "Other", + "orcid": "0000-0002-5321-8404", "name": "Tacke, Christian" }, { diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 50695c78..057de678 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3,11 +3,11 @@ Binet, Sebastien Eulisse, Giulio Karabowicz, Radoslaw Kretz, Matthias -Krzewicki, Mikolaj +Krzewicki, Mikolaj Lebedev, Andrey Mrnjavac, Teo Neskovic, Gvozden Richter, Matthias -Tacke, Christian +Tacke, Christian [https://orcid.org/0000-0002-5321-8404] Uhlig, Florian Wenzel, Sandro diff --git a/codemeta.json b/codemeta.json index c0bd6ec6..6be56f9d 100644 --- a/codemeta.json +++ b/codemeta.json @@ -93,7 +93,8 @@ { "@type": "Person", "givenName": "Christian", - "familyName": "Tacke" + "familyName": "Tacke", + "@id": "https://orcid.org/0000-0002-5321-8404" }, { "@type": "Person", From d105960444ab7c36625aa24875d6a163ecac986a Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Mon, 5 Sep 2022 22:46:38 +0200 Subject: [PATCH 6/6] fix(shm): Fix incorrect parameters when mapping regions --- fairmq/shmem/Manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h index 21404369..279188de 100644 --- a/fairmq/shmem/Manager.h +++ b/fairmq/shmem/Manager.h @@ -540,7 +540,7 @@ class Manager if (info.event == RegionEvent::created) { RegionConfig cfg; cfg.id = info.id; - cfg.creationFlags = info.id; + cfg.creationFlags = regionInfo.fCreationFlags; cfg.path = regionInfo.fPath.c_str(); regionCfgs.emplace(info.id, cfg); // fill the ptr+size info after shmLock is released, to avoid constructing local region under it