Drop MUT* macros and C support. (#685)

The MUT* macros were only used in one place, and the 0 in
MUTCONSTRUCT(0) meant that the mutex was never actually used.

Author: olupton

coreneuron/apps/main1.cpp

@@ -32,7 +32,6 @@
 #include "coreneuron/utils/memory_utils.h"
 #include "coreneuron/apps/corenrn_parameters.hpp"
 #include "coreneuron/io/prcellstate.hpp"
-#include "coreneuron/utils/nrnmutdec.h"
 #include "coreneuron/utils/nrn_stats.h"
 #include "coreneuron/io/reports/nrnreport.hpp"
 #include "coreneuron/io/reports/binary_report_handler.hpp"

coreneuron/io/nrn_setup.cpp

@@ -20,7 +20,7 @@
 #include "coreneuron/sim/fast_imem.hpp"
 #include "coreneuron/network/multisend.hpp"
 #include "coreneuron/utils/nrn_assert.h"
-#include "coreneuron/utils/nrnmutdec.h"
+#include "coreneuron/utils/nrnmutdec.hpp"
 #include "coreneuron/utils/memory.h"
 #include "coreneuron/utils/utils.hpp"
 #include "coreneuron/mpi/nrnmpi.h"

coreneuron/io/output_spikes.cpp

@@ -20,7 +20,7 @@
 #include "coreneuron/io/output_spikes.hpp"
 #include "coreneuron/mpi/nrnmpi.h"
 #include "coreneuron/mpi/core/nrnmpi.hpp"
-#include "coreneuron/utils/nrnmutdec.h"
+#include "coreneuron/utils/nrnmutdec.hpp"
 #include "coreneuron/mpi/nrnmpidec.h"
 #include "coreneuron/utils/string_utils.h"
 #include "coreneuron/apps/corenrn_parameters.hpp"

coreneuron/io/phase1.hpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "coreneuron/io/nrn_filehandler.hpp"
-#include "coreneuron/utils/nrnmutdec.h"
+#include "coreneuron/utils/nrnmutdec.hpp"
 
 namespace coreneuron {
 

coreneuron/io/phase2.cpp

@@ -19,6 +19,10 @@
 #include "coreneuron/io/mem_layout_util.hpp"
 #include "coreneuron/io/setup_fornetcon.hpp"
 
+#if defined(_OPENMP)
+#include <omp.h>
+#endif
+
 int (*nrn2core_get_dat2_1_)(int tid,
                             int& ngid,
                             int& n_real_gid,

coreneuron/network/netcvode.hpp

@@ -9,6 +9,7 @@
 #ifndef netcvode_h
 #define netcvode_h
 
+#include "coreneuron/utils/nrnmutdec.hpp"
 #include "coreneuron/network/tqueue.hpp"
 
 #define PRINT_EVENT 0

coreneuron/network/tqueue.hpp

@@ -33,7 +33,6 @@
 #include <vector>
 #include <map>
 #include <utility>
-#include "coreneuron/utils/nrnmutdec.h"
 
 namespace coreneuron {
 #define STRCMP(a, b) (a - b)
@@ -172,7 +171,6 @@ class TQueue {
     TQPair make_TQPair(TQItem* p) {
         return TQPair(p->t_, p);
     }
-    MUTDEC
 };
 }  // namespace coreneuron
 #include "coreneuron/network/tqueue.ipp"

coreneuron/network/tqueue.ipp

@@ -31,7 +31,6 @@ of struct _spblk, we are really using TQItem
 
 template <container C>
 TQueue<C>::TQueue() {
-    MUTCONSTRUCT(0)
     nshift_ = 0;
     sptree_ = new SPTREE;
     spinit(sptree_);
@@ -66,18 +65,14 @@ TQueue<C>::~TQueue() {
         delete pq_que_.top().second;
         pq_que_.pop();
     }
-
-    MUTDESTRUCT
 }
 
 template <container C>
 TQItem* TQueue<C>::enqueue_bin(double td, void* d) {
-    MUTLOCK
     TQItem* i = new TQItem;
     i->data_ = d;
     i->t_ = td;
     binq_->enqueue(td, i);
-    MUTUNLOCK
     return i;
 }
 
@@ -115,7 +110,6 @@ inline void TQueue<pq_que>::move_least_nolock(double tnew) {
 /// Splay tree priority queue implementation
 template <>
 inline void TQueue<spltree>::move(TQItem* i, double tnew) {
-    MUTLOCK
     if (i == least_) {
         move_least_nolock(tnew);
     } else if (tnew < least_->t_) {
@@ -128,13 +122,11 @@ inline void TQueue<spltree>::move(TQItem* i, double tnew) {
         i->t_ = tnew;
         spenq(i, sptree_);
     }
-    MUTUNLOCK
 }
 
 /// STL priority queue implementation
 template <>
 inline void TQueue<pq_que>::move(TQItem* i, double tnew) {
-    MUTLOCK
     if (i == least_) {
         move_least_nolock(tnew);
     } else if (tnew < least_->t_) {
@@ -153,13 +145,11 @@ inline void TQueue<pq_que>::move(TQItem* i, double tnew) {
         i->t_ = -1.;
         pq_que_.push(make_TQPair(qmove));
     }
-    MUTUNLOCK
 }
 
 /// Splay tree priority queue implementation
 template <>
 inline TQItem* TQueue<spltree>::insert(double tt, void* d) {
-    MUTLOCK
     TQItem* i = new TQItem;
     i->data_ = d;
     i->t_ = tt;
@@ -177,14 +167,12 @@ inline TQItem* TQueue<spltree>::insert(double tt, void* d) {
     } else {
         spenq(i, sptree_);
     }
-    MUTUNLOCK
     return i;
 }
 
 /// STL priority queue implementation
 template <>
 inline TQItem* TQueue<pq_que>::insert(double tt, void* d) {
-    MUTLOCK
     TQItem* i = new TQItem;
     i->data_ = d;
     i->t_ = tt;
@@ -202,14 +190,12 @@ inline TQItem* TQueue<pq_que>::insert(double tt, void* d) {
     } else {
         pq_que_.push(make_TQPair(i));
     }
-    MUTUNLOCK
     return i;
 }
 
 /// Splay tree priority queue implementation
 template <>
 inline void TQueue<spltree>::remove(TQItem* q) {
-    MUTLOCK
     if (q) {
         if (q == least_) {
             if (sptree_->root) {
@@ -222,13 +208,11 @@ inline void TQueue<spltree>::remove(TQItem* q) {
         }
         delete q;
     }
-    MUTUNLOCK
 }
 
 /// STL priority queue implementation
 template <>
 inline void TQueue<pq_que>::remove(TQItem* q) {
-    MUTLOCK
     if (q) {
         if (q == least_) {
             if (pq_que_.size()) {
@@ -241,14 +225,12 @@ inline void TQueue<pq_que>::remove(TQItem* q) {
             q->t_ = -1.;
         }
     }
-    MUTUNLOCK
 }
 
 /// Splay tree priority queue implementation
 template <>
 inline TQItem* TQueue<spltree>::atomic_dq(double tt) {
     TQItem* q = nullptr;
-    MUTLOCK
     if (least_ && least_->t_ <= tt) {
         q = least_;
         if (sptree_->root) {
@@ -257,15 +239,13 @@ inline TQItem* TQueue<spltree>::atomic_dq(double tt) {
             least_ = nullptr;
         }
     }
-    MUTUNLOCK
     return q;
 }
 
 /// STL priority queue implementation
 template <>
 inline TQItem* TQueue<pq_que>::atomic_dq(double tt) {
     TQItem* q = nullptr;
-    MUTLOCK
     if (least_ && least_->t_ <= tt) {
         q = least_;
         //        int qsize = pq_que_.size();
@@ -284,7 +264,6 @@ inline TQItem* TQueue<pq_que>::atomic_dq(double tt) {
             least_ = nullptr;
         }
     }
-    MUTUNLOCK
     return q;
 }
 }  // namespace coreneuron

coreneuron/utils/ivocvect.hpp

@@ -11,7 +11,6 @@
 
 #include <cstdio>
 #include <utility>
-#include "coreneuron/utils/nrnmutdec.h"
 
 namespace coreneuron {
 template <typename T>