Deprecate session manager's Done()

src/RunState.cc

@@ -385,7 +385,7 @@ void finish_run(int drain_events) {
         event_mgr.Drain();
 
         if ( session_mgr )
-            session_mgr->Done();
+            session_mgr->Clear();
     }
 
 #ifdef DEBUG

src/fuzzers/fuzzer-setup.h

@@ -88,7 +88,7 @@ void fuzzer_cleanup_one_input() {
     zeek::event_mgr.Drain();
     zeek::session_mgr->Drain();
     zeek::event_mgr.Drain();
-    zeek::session_mgr->Done();
+    zeek::session_mgr->Clear();
     run_state::terminating = false;
 }
 

src/session/Manager.cc

@@ -82,9 +82,10 @@ Manager::Manager() {
     });
 }
 
-Manager::~Manager() { delete stats; }
+Manager::~Manager() {
-
+    Clear();
-void Manager::Done() { Clear(); }
+    delete stats;
+}
 
 Connection* Manager::FindConnection(Val* v) {
     zeek::detail::ConnKey conn_key(v);

src/session/Manager.h

@@ -59,7 +59,8 @@ public:
     Manager();
     ~Manager();
 
-    void Done(); // call to drain events before destructing
+    [[deprecated("Remove in v8.1 - no functionality. Use Drain() and Clear().")]]
+    void Done() {};
 
     // Looks up the connection referred to by the given Val,
     // which should be a conn_id record.  Returns nil if there's