Remove HTList and add signals (#3291)

neuronsimulator · Dec 15, 2024 · 6ab042f · 6ab042f
1 parent bf6a457
commit 6ab042f
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 256 deletions.
diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -156,7 +156,6 @@ set(IVOC_FILE_LIST
     grglyph.cpp
     grmanip.cpp
     hocmark.cpp
-    htlist.cpp
     idraw.cpp
     ivoc.cpp
     ivocmain.cpp

diff --git a/src/ivoc/htlist.cpp b/src/ivoc/htlist.cpp
diff --git a/src/ivoc/htlist.h b/src/ivoc/htlist.h
diff --git a/src/nrncvode/cvodeobj.cpp b/src/nrncvode/cvodeobj.cpp
@@ -23,7 +23,6 @@ extern int hoc_return_type_code;
 #include "nrnpy.h"
 #include "tqueue.hpp"
 #include "mymath.h"
-#include "htlist.h"
 #include <nrnmutdec.h>
 
 #if NRN_ENABLE_THREADS

diff --git a/src/nrncvode/cvodeobj.h b/src/nrncvode/cvodeobj.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <list>
+
 #include "nrnmpi.h"
 #include "nrnneosm.h"
 //#include "shared/nvector_serial.h"
@@ -16,7 +18,6 @@ struct BAMech;
 struct NrnThread;
 class PlayRecord;
 class STEList;
-class HTList;
 namespace neuron {
 struct model_sorted_token;
 }
@@ -72,7 +73,7 @@ class CvodeThreadData {
     Node** v_node_;
     Node** v_parent_;
     PreSynList* psl_th_;  // with a threshold
-    HTList* watch_list_;
+    std::list<WatchCondition*>* watch_list_;
     std::vector<neuron::container::data_handle<double>> pv_, pvdot_;
     int nvoffset_;              // beginning of this threads states
     int nvsize_;                // total number of states for this thread

diff --git a/src/nrncvode/netcon.h b/src/nrncvode/netcon.h
@@ -2,12 +2,12 @@
 
 #undef check
 
-#include "htlist.h"
 #include "neuron/container/data_handle.hpp"
 #include "nrnmpi.h"
 #include "nrnneosm.h"
 #include "pool.hpp"
 #include "tqitem.hpp"
+#include "utils/signal.hpp"
 
 #include <InterViews/observe.h>
 
@@ -212,7 +212,7 @@ class ConditionEvent: public DiscreteEvent {
     static unsigned long deliver_qthresh_;
 };
 
-class WatchCondition: public ConditionEvent, public HTList {
+class WatchCondition: public ConditionEvent {
   public:
     WatchCondition(Point_process*, double (*)(Point_process*));
     virtual ~WatchCondition();
@@ -242,16 +242,17 @@ class WatchCondition: public ConditionEvent, public HTList {
 
     static unsigned long watch_send_;
     static unsigned long watch_deliver_;
+
+    signal_<WatchCondition*> unregister;
 };
 
 class STECondition: public WatchCondition {
   public:
     STECondition(Point_process*, double (*)(Point_process*) = NULL);
-    virtual ~STECondition();
-    virtual void deliver(double, NetCvode*, NrnThread*);
-    virtual void pgvts_deliver(double t, NetCvode*);
-    virtual double value();
-    virtual NrnThread* thread();
+    void deliver(double, NetCvode*, NrnThread*) override;
+    void pgvts_deliver(double t, NetCvode*) override;
+    double value() override;
+    NrnThread* thread() override;
 
     STETransition* stet_;
 };