Replace options listener infrastructure (#4764)

This replaces the old options listener infrastructure with the OptionsManager introduced in cb8d041.

It eliminates a "beforeSearchListener", which was a custom way of some options throwing a modal exception if they were set after initialization. Now all options are consistent: no option can be set after initialization.

It also moves managed ostream objects to the OptionsManager.

@mpreiner The next step will be to remove the "notifies" field from the Options build system and then proceed with cleaning src/options/.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h
index 57a227d7b..6a9b3e2bf 100644
--- a/src/util/resource_manager.h
+++ b/src/util/resource_manager.h
@@ -162,12 +162,10 @@ class CVC4_PUBLIC ResourceManager
   static uint64_t getFrequencyCount() { return s_resourceCount; }
 
   /**
-   * Registers a listener that is notified on a resource out.
-   *
-   * This Registration must be destroyed by the user before this
-   * ResourceManager.
+   * Registers a listener that is notified on a resource out or (per-call)
+   * timeout.
    */
-  ListenerCollection::Registration* registerListener(Listener* listener);
+  void registerListener(Listener* listener);
 
  private:
   /** The per-call wall clock timer. */
@@ -201,7 +199,7 @@ class CVC4_PUBLIC ResourceManager
   static const uint64_t s_resourceCount;
 
   /** Receives a notification on reaching a limit. */
-  ListenerCollection d_listeners;
+  std::vector<Listener*> d_listeners;
 
   void spendResource(unsigned amount);