Merge pull request #297 from JeffersonLab/nbrei_issue295

Bugfixes for EICrecon
JeffersonLab · May 1, 2024 · 94f9792 · 94f9792
2 parents 56d1719 + be3d29d
commit 94f9792
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/examples/TimesliceExample/MyFileReader.h b/src/examples/TimesliceExample/MyFileReader.h
@@ -21,7 +21,7 @@ struct MyFileReader : public JEventSource {
 
     void Close() override { }
 
-    Result Emit(JEvent&) override {
+    Result Emit(JEvent& event) override {
 
         auto event_nr = event.GetEventNumber();
 

diff --git a/src/libraries/JANA/JApplication.cc b/src/libraries/JANA/JApplication.cc
@@ -124,12 +124,12 @@ void JApplication::Initialize() {
     // Attach all plugins
     plugin_loader->attach_plugins(component_manager.get());
 
-    // Resolve all event sources now that all plugins have been loaded
-    component_manager->resolve_event_sources();
-
     // Give all components a JApplication pointer and a logger
     component_manager->configure_components();
 
+    // Resolve all event sources now that all plugins have been loaded
+    component_manager->resolve_event_sources();
+
     // Set desired nthreads. We parse the 'nthreads' parameter two different ways for backwards compatibility.
     m_desired_nthreads = 1;
     m_params->SetDefaultParameter("nthreads", m_desired_nthreads, "Desired number of worker threads, or 'Ncores' to use all available cores.");

diff --git a/src/libraries/JANA/Services/JPluginLoader.cc b/src/libraries/JANA/Services/JPluginLoader.cc
@@ -219,8 +219,9 @@ void JPluginLoader::attach_plugin(std::string soname) {
     // Open shared object
     void* handle = dlopen(soname.c_str(), RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
     if (!handle) {
-        LOG_DEBUG(m_logger) << dlerror() << LOG_END;
-        throw JException("Plugin dlopen() failed: %s", dlerror());
+        std::string err = dlerror();
+        LOG_DEBUG(m_logger) << "Plugin dlopen() failed: " << err << LOG_END;
+        throw JException("Plugin dlopen() failed: %s", err.c_str());
     }
 
     // Look for an InitPlugin symbol

diff --git a/src/plugins/JTestRoot/JTestRootEventSource.h b/src/plugins/JTestRoot/JTestRootEventSource.h
@@ -12,7 +12,7 @@
 class JTestRootEventSource : public JEventSource {
 
 public:
-    JTestRootEventSource(std::string resource_name, JApplication* app);
+    JTestRootEventSource();
     virtual ~JTestRootEventSource() = default;
 
     Result Emit(JEvent& event) override;

diff --git a/src/plugins/JTestRoot/JTestRootProcessor.cc b/src/plugins/JTestRoot/JTestRootProcessor.cc
@@ -19,7 +19,7 @@ JTestRootProcessor::JTestRootProcessor() {
     SetCallbackStyle(CallbackStyle::ExpertMode);
 }
 
-void JTestRootProcessor::Process(const JEvent&) {
+void JTestRootProcessor::Process(const JEvent& event) {
     // Get the cluster objects
     auto clusters = event.Get<Cluster>();