Increase thread-safety of Subscriptor

diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h
index bdff40fa325bdb1c2dd7ccd99d4a80aa10ba5ded..ee03ae5f672ecac0a0bdeaff291b7927dbfaa56a 100644 (file)
--- a/include/deal.II/base/logstream.h
+++ b/include/deal.II/base/logstream.h
@@ -20,6 +20,7 @@
 
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/smartpointer.h>
+#include <deal.II/base/subscriptor.h>
 #include <deal.II/base/thread_local_storage.h>
 
 #include <cmath>

diff --git a/include/deal.II/base/smartpointer.h b/include/deal.II/base/smartpointer.h
index 8dc4065ebbfdfc2e8a98728b0ef15caebf6dcdf5..82066b872a94666d5cb3da5a679ef3e1df5b64a5 100644 (file)
--- a/include/deal.II/base/smartpointer.h
+++ b/include/deal.II/base/smartpointer.h
@@ -19,7 +19,10 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/subscriptor.h>
+#include <deal.II/base/exceptions.h>
+
+#include <atomic>
+#include <typeinfo>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -203,7 +206,7 @@ private:
    * The Smartpointer is invalidated when the object pointed to is destroyed
    * or moved from.
    */
-  bool pointed_to_object_is_alive;
+  std::atomic<bool> pointed_to_object_is_alive;
 };
 
 

diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h
index 5648ac9afcf0d5bdb2a376d6f472e178dad24ff5..e1d4baca6ecb116f3de968411db0cc764eee03b6 100644 (file)
--- a/include/deal.II/base/subscriptor.h
+++ b/include/deal.II/base/subscriptor.h
@@ -107,7 +107,8 @@ public:
    * subscriber may be identified by text supplied as @p identifier.
    */
   void
-  subscribe(bool *const validity, const char *identifier = nullptr) const;
+  subscribe(std::atomic<bool> *const validity,
+            const char *             identifier = nullptr) const;
 
   /**
    * Unsubscribes a user from the object.
@@ -116,7 +117,8 @@ public:
    * the one supplied to subscribe().
    */
   void
-  unsubscribe(bool *const validity, const char *identifier = nullptr) const;
+  unsubscribe(std::atomic<bool> *const validity,
+              const char *             identifier = nullptr) const;
 
   /**
    * Return the present number of subscriptions to this object. This allows to
@@ -227,7 +229,7 @@ private:
    * In this vector, we store pointers to the validity bool in the SmartPointer
    * objects that subscribe to this class.
    */
-  mutable std::vector<bool *> validity_pointers;
+  mutable std::vector<std::atomic<bool> *> validity_pointers;
 
   /**
    * Pointer to the typeinfo object of this object, from which we can later

diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h
index 389033a034ab6c3ac5e9f9f8776305b7fe57de36..f483aa27480e35bfdd883fc7cad2ffd17947ab62 100644 (file)
--- a/include/deal.II/lac/precondition_selector.h
+++ b/include/deal.II/lac/precondition_selector.h
@@ -20,6 +20,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/smartpointer.h>
+#include <deal.II/base/subscriptor.h>
 
 #include <string>
 

diff --git a/source/base/subscriptor.cc b/source/base/subscriptor.cc
index eed36ac147fb2291c4d0e5aa70321caebed0708a..1f8204c89559dd807bc4f728745063ac52c9c7a5 100644 (file)
--- a/source/base/subscriptor.cc
+++ b/source/base/subscriptor.cc
@@ -153,7 +153,7 @@ Subscriptor::operator=(Subscriptor &&s) noexcept
 
 
 void
-Subscriptor::subscribe(bool *const validity, const char *id) const
+Subscriptor::subscribe(std::atomic<bool> *const validity, const char *id) const
 {
   std::lock_guard<std::mutex> lock(mutex);
 
@@ -175,7 +175,8 @@ Subscriptor::subscribe(bool *const validity, const char *id) const
 
 
 void
-Subscriptor::unsubscribe(bool *const validity, const char *id) const
+Subscriptor::unsubscribe(std::atomic<bool> *const validity,
+                         const char *             id) const
 {
   const char *name = (id != nullptr) ? id : unknown_subscriber;
   AssertNothrow(counter > 0, ExcNoSubscriber(object_info->name(), name));

diff --git a/tests/base/unsubscribe_subscriptor.cc b/tests/base/unsubscribe_subscriptor.cc
index ec51969fb02f67137020defc5dd145998b2abe2a..271f3badd93a12a547efe796940a8ed7811d098f 100644 (file)
--- a/tests/base/unsubscribe_subscriptor.cc
+++ b/tests/base/unsubscribe_subscriptor.cc
@@ -36,8 +36,8 @@ main()
 
   initlog();
 
-  Subscriptor subscriptor;
-  bool        dummy_a;
+  Subscriptor       subscriptor;
+  std::atomic<bool> dummy_a;
   subscriptor.subscribe(&dummy_a, "a");
   subscriptor.unsubscribe(&dummy_a, "b");
   subscriptor.unsubscribe(&dummy_a, "a");

diff --git a/tests/base/unsubscribe_subscriptor.debug.output b/tests/base/unsubscribe_subscriptor.debug.output
index f9eabb1aa75e1adae7a452a5dc2e7b49a4b51e08..e0f38759735b0cbfffd7aa4d547a7d3fc3e26788 100644 (file)
--- a/tests/base/unsubscribe_subscriptor.debug.output
+++ b/tests/base/unsubscribe_subscriptor.debug.output
@@ -3,7 +3,7 @@ DEAL::Exception: ExcNoSubscriber(object_info->name(), name)
 DEAL::
 --------------------------------------------------------
 An error occurred in file <subscriptor.cc> in function
-    void dealii::Subscriptor::unsubscribe(bool*, const char*) const
+    void dealii::Subscriptor::unsubscribe(std::atomic<bool>*, const char*) const
 The violated condition was: 
     it != counter_map.end()
 Additional information: 
@@ -14,7 +14,7 @@ DEAL::Exception: ExcMessage( "This Subscriptor object does not know anything abo
 DEAL::
 --------------------------------------------------------
 An error occurred in file <subscriptor.cc> in function
-    void dealii::Subscriptor::unsubscribe(bool*, const char*) const
+    void dealii::Subscriptor::unsubscribe(std::atomic<bool>*, const char*) const
 The violated condition was: 
     validity_ptr_it != validity_pointers.end()
 Additional information: 

diff --git a/tests/base/unsubscribe_subscriptor.debug.output.clang-6 b/tests/base/unsubscribe_subscriptor.debug.output.clang-6
new file mode 100644 (file)
index 0000000..5c2e16e
--- /dev/null
+++ b/tests/base/unsubscribe_subscriptor.debug.output.clang-6
@@ -0,0 +1,23 @@
+
+DEAL::Exception: ExcNoSubscriber(object_info->name(), name)
+DEAL::
+--------------------------------------------------------
+An error occurred in file <subscriptor.cc> in function
+    void dealii::Subscriptor::unsubscribe(std::atomic<bool> *const, const char *) const
+The violated condition was: 
+    it != counter_map.end()
+Additional information: 
+    No subscriber with identifier <b> subscribes to this object of class N6dealii11SubscriptorE. Consequently, it cannot be unsubscribed.
+--------------------------------------------------------
+
+DEAL::Exception: ExcMessage( "This Subscriptor object does not know anything about the supplied pointer!")
+DEAL::
+--------------------------------------------------------
+An error occurred in file <subscriptor.cc> in function
+    void dealii::Subscriptor::unsubscribe(std::atomic<bool> *const, const char *) const
+The violated condition was: 
+    validity_ptr_it != validity_pointers.end()
+Additional information: 
+    This Subscriptor object does not know anything about the supplied pointer!
+--------------------------------------------------------
+