Merge pull request #3202 from STEllAR-GROUP/fixing_config_entry

Making sure resource partitioner is not accessed if its not valid
STEllAR-GROUP · Mar 7, 2018 · 58d8a85 · msimberg · Mar 9, 2018 · msimberg
2 parents b43ec23 + 549be5a
commit 58d8a85
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/hpx/runtime/resource/partitioner_fwd.hpp b/hpx/runtime/resource/partitioner_fwd.hpp
@@ -34,6 +34,7 @@ namespace hpx
         // May be used anywhere in code and returns a reference to the single,
         // global resource partitioner.
         HPX_EXPORT detail::partitioner& get_partitioner();
+        HPX_EXPORT bool is_partitioner_valid();
 
         // resource_partitioner mode
         enum partitioner_mode

diff --git a/src/runtime.cpp b/src/runtime.cpp
@@ -789,6 +789,10 @@ namespace hpx
         {
             return get_runtime().get_config().get_entry(key, dflt);
         }
+        if (!resource::is_partitioner_valid())
+        {
+            return dflt;
+        }
         return resource::get_partitioner()
             .get_command_line_switches().rtcfg_.get_entry(key, dflt);
     }
@@ -799,6 +803,10 @@ namespace hpx
         {
             return get_runtime().get_config().get_entry(key, dflt);
         }
+        if (!resource::is_partitioner_valid())
+        {
+            return std::to_string(dflt);
+        }
         return resource::get_partitioner()
             .get_command_line_switches().rtcfg_.get_entry(key, dflt);
     }
@@ -808,22 +816,28 @@ namespace hpx
     {
         if (get_runtime_ptr() != nullptr)
         {
-            return get_runtime_ptr()->get_config().add_entry(key, value);
+            get_runtime_ptr()->get_config().add_entry(key, value);
+        }
+        if (resource::is_partitioner_valid())
+        {
+            resource::get_partitioner()
+                .get_command_line_switches().rtcfg_.add_entry(key, value);
         }
-        return resource::get_partitioner()
-            .get_command_line_switches().rtcfg_.add_entry(key, value);
     }
 
     void set_config_entry(std::string const& key, std::size_t value)
     {
         if (get_runtime_ptr() != nullptr)
         {
-            return get_runtime_ptr()->get_config().add_entry(
+            get_runtime_ptr()->get_config().add_entry(
                 key, std::to_string(value));
         }
-        return resource::get_partitioner()
-            .get_command_line_switches().rtcfg_.
-                add_entry(key, std::to_string(value));
+        if (resource::is_partitioner_valid())
+        {
+            resource::get_partitioner()
+                .get_command_line_switches().rtcfg_.
+                    add_entry(key, std::to_string(value));
+        }
     }
 
     void set_config_entry_callback(std::string const& key,
@@ -832,12 +846,15 @@ namespace hpx
     {
         if (get_runtime_ptr() != nullptr)
         {
-            return get_runtime_ptr()->get_config().add_notification_callback(
+            get_runtime_ptr()->get_config().add_notification_callback(
                 key, callback);
         }
-        return resource::get_partitioner()
-            .get_command_line_switches()
-            .rtcfg_.add_notification_callback(key, callback);
+        if (resource::is_partitioner_valid())
+        {
+            return resource::get_partitioner()
+                .get_command_line_switches()
+                .rtcfg_.add_notification_callback(key, callback);
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////

diff --git a/src/runtime/resource/partitioner.cpp b/src/runtime/resource/partitioner.cpp
@@ -155,6 +155,16 @@ namespace hpx { namespace resource
     {
         std::unique_ptr<detail::partitioner>& rp = detail::get_partitioner();
 
+        if (!rp)
+        {
+            // if the resource partitioner is not accessed for the first time
+            // if the command-line parsing has not yet been done
+            throw std::invalid_argument(
+                "hpx::resource::get_partitioner() can be called only after "
+                "the resource partitioner has been initialized and before it "
+                "has been deleted");
+        }
+
         if (!rp->cmd_line_parsed())
         {
             if (get_runtime_ptr() != nullptr)
@@ -178,6 +188,11 @@ namespace hpx { namespace resource
         return *rp;
     }
 
+    bool is_partitioner_valid()
+    {
+        return bool(detail::get_partitioner());
+    }
+
     namespace detail
     {
         detail::partitioner &create_partitioner(