Manually revert #3291. WatchCondition never uses a freed watch_list_. (#3496)

Author: nrnhines

cmake/NeuronFileLists.cmake

@@ -259,6 +259,7 @@ set(NRNCVODE_FILE_LIST
     cvodeobj.cpp
     cvodestb.cpp
     cvtrset.cpp
+    htlist.cpp
     netcvode.cpp
     nrndaspk.cpp
     occvode.cpp

src/nrncvode/cvodeobj.h

@@ -1,14 +1,13 @@
 #pragma once
 
-#include <list>
-
 #include "nrnmpi.h"
 #include "nrnneosm.h"
 //#include "shared/nvector_serial.h"
 #include "shared/nvector.h"
 #include "membfunc.h"
 #include "netcon.h"
 #include "tqitem.hpp"
+#include "htlist.h"
 
 class NetCvode;
 class Daspk;
@@ -82,7 +81,7 @@ class CvodeThreadData {
     int vnode_end_index_;
 
     PreSynList* psl_th_;  // with a threshold
-    std::list<WatchCondition*>* watch_list_;
+    HTList* watch_list_;
     // since scatter/gather are hot loops, don't want to use data_handle
     // std::vector<neuron::container::data_handle<double>> pv_, pvdot_;
     std::vector<double*> pv_, pvdot_;

src/nrncvode/htlist.cpp

@@ -0,0 +1,121 @@
+#ifdef HAVE_CONFIG_H
+#include <../../nrnconf.h>
+#endif
+/*
+Based on Unidraw UList but UList changed to HTList (head tail list)
+for fast insertion, deletion, iteration
+*/
+
+/*
+ * Copyright (c) 1990, 1991 Stanford University
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Stanford not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Stanford makes no representations about
+ * the suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * STANFORD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * HTList implementation.
+ */
+
+#include <stdio.h>
+#include <OS/enter-scope.h>
+#include <htlist.h>
+
+/*****************************************************************************/
+
+HTList::HTList(void* p) {
+    _next = this;
+    _prev = this;
+    _object = p;
+}
+
+HTList::~HTList() {
+    HTList* next = _next;
+    if (next != this && next != NULL) {
+        Remove(this);
+        delete next;
+    }
+}
+
+void HTList::Append(HTList* e) {
+    _prev->_next = e;
+    e->_prev = _prev;
+    e->_next = this;
+    _prev = e;
+}
+
+void HTList::Prepend(HTList* e) {
+    _next->_prev = e;
+    e->_prev = this;
+    e->_next = _next;
+    _next = e;
+}
+
+void HTList::Remove(HTList* e) {
+    e->_prev->_next = e->_next;
+    e->_next->_prev = e->_prev;
+    e->_prev = e->_next = NULL;
+}
+
+void HTList::Remove() {
+    if (_prev) {
+        _prev->_next = _next;
+    }
+    if (_next) {
+        _next->_prev = _prev;
+    }
+    _prev = _next = NULL;
+}
+void HTList::RemoveAll() {
+    while (!IsEmpty()) {
+        Remove(First());
+    }
+}
+void HTList::Delete(void* p) {
+    HTList* e;
+
+    e = Find(p);
+    if (e != NULL) {
+        Remove(e);
+        delete e;
+    }
+}
+
+HTList* HTList::Find(void* p) {
+    HTList* e;
+
+    for (e = _next; e != this; e = e->_next) {
+        if (e->_object == p) {
+            return e;
+        }
+    }
+    return NULL;
+}
+
+HTList* HTList::operator[](int count) {
+    HTList* pos = First();
+    int i;
+
+    for (i = 1; i < count && pos != End(); ++i) {
+        pos = pos->Next();
+    }
+    if (i == count) {
+        return pos;
+    }
+    return NULL;
+}

src/nrncvode/htlist.h

@@ -0,0 +1,86 @@
+/*
+from Unidraw but UList changed to HTList (head tail list)
+for fast insertion, deletion, iteration
+*/
+
+/*
+ * Copyright (c) 1990, 1991 Stanford University
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Stanford not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Stanford makes no representations about
+ * the suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * STANFORD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * UList - list object.
+ */
+
+#pragma once
+
+class HTList {
+  public:
+    HTList(void* = NULL);
+    virtual ~HTList();
+
+    bool IsEmpty();
+    void Append(HTList*);
+    void Prepend(HTList*);
+    void Remove(HTList*);
+    void Remove();
+    void RemoveAll();
+    void Delete(void*);
+    HTList* Find(void*);
+    HTList* First();
+    HTList* Last();
+    HTList* End();
+    HTList* Next();
+    HTList* Prev();
+
+    void* vptr();
+    void* operator()();
+    HTList* operator[](int count);
+
+  protected:
+    void* _object;
+    HTList* _next;
+    HTList* _prev;
+};
+
+inline bool HTList::IsEmpty() {
+    return _next == this;
+}
+inline HTList* HTList::First() {
+    return _next;
+}
+inline HTList* HTList::Last() {
+    return _prev;
+}
+inline HTList* HTList::End() {
+    return this;
+}
+inline HTList* HTList::Next() {
+    return _next;
+}
+inline HTList* HTList::Prev() {
+    return _prev;
+}
+inline void* HTList::operator()() {
+    return _object;
+}
+inline void* HTList::vptr() {
+    return _object;
+}

src/nrncvode/netcon.h

@@ -7,7 +7,7 @@
 #include "nrnneosm.h"
 #include "pool.hpp"
 #include "tqitem.hpp"
-#include "utils/signal.hpp"
+#include "htlist.h"
 
 #include <InterViews/observe.h>
 
@@ -212,7 +212,7 @@ class ConditionEvent: public DiscreteEvent {
     static unsigned long deliver_qthresh_;
 };
 
-class WatchCondition: public ConditionEvent {
+class WatchCondition: public ConditionEvent, public HTList {
   public:
     WatchCondition(Point_process*, double (*)(Point_process*));
     virtual ~WatchCondition();
@@ -242,8 +242,6 @@ class WatchCondition: public ConditionEvent {
 
     static unsigned long watch_send_;
     static unsigned long watch_deliver_;
-
-    signal_<WatchCondition*> unregister;
 };
 
 class STECondition: public WatchCondition {