make MutexLock fimex-internal

 * the size of MutexType depends on _OPENMP, so it might be better
   not to let NcmlCDMReader have a member of type "MutexType"

(cherry picked from commit 829eec8)

include/fimex/NcmlCDMReader.h

@@ -30,13 +30,14 @@
 #include "fimex/CDMReader.h"
 #include "fimex/CDMDataType.h"
 #include "fimex/XMLInput.h"
-#include "fimex/MutexLock.h"
 #include <map>
+#include <memory>
 
 namespace MetNoFimex
 {
 /* forward declarations */
 class XMLDoc;
+class MutexType;
 
 /**
  * The NcmlCDMReader can be used as both standard reader of a data and
@@ -141,7 +142,7 @@ class NcmlCDMReader: public MetNoFimex::CDMReader
 
     std::string configId;
     boost::shared_ptr<XMLDoc> doc;
-    MutexType mutex_;
+    std::auto_ptr<MutexType> mutex_;
     boost::shared_ptr<CDMReader> dataReader;
     /*
      * maps containing the changes. The key will reflect

src/CDMTimeInterpolator.cc

@@ -34,7 +34,7 @@
 #include "fimex/Data.h"
 #include "fimex/interpolation.h"
 #include "fimex/Logger.h"
-#include "fimex/MutexLock.h"
+#include "fimex/Utils.h"
 
 namespace MetNoFimex
 {
@@ -85,7 +85,6 @@ CDMTimeInterpolator::~CDMTimeInterpolator()
 {
 }
 
-MutexType staticMutex;
 DataPtr CDMTimeInterpolator::getDataSlice(const std::string& varName, size_t unLimDimPos)
 {
     std::string timeAxis = getTimeAxis(coordSystems_, getCDM(), varName);

src/FeltCDMReader2.h

@@ -48,7 +48,7 @@
 #include "fimex/ReplaceStringObject.h"
 #include "fimex/XMLInput.h"
 #include <boost/date_time/posix_time/posix_time_types.hpp>
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 
 
 namespace MetNoFelt {

src/GribCDMReader.cc

@@ -47,7 +47,7 @@
 #include <map>
 #include <algorithm>
 #include <stdexcept>
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include <boost/math/special_functions/round.hpp>
 
 namespace MetNoFimex

src/MetGmCDMReader.cc

@@ -25,7 +25,7 @@
 #include "fimex/MetGmCDMReader.h"
 #undef MIFI_IO_READER_SUPPRESS_DEPRECATED
 #include <fimex/CDM.h>
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 
 // private implementation details
 #include "./metgm/MetGmCDMReaderImpl.h"

include/fimex/MutexLock.h → src/MutexLock.h

@@ -29,12 +29,14 @@
 
 #include <boost/noncopyable.hpp>
 
+#ifdef _OPENMP
+# include <omp.h>
+#endif
+
 namespace MetNoFimex
 {
 
-
 #ifdef _OPENMP
-# include <omp.h>
 struct MutexType : boost::noncopyable
 {
     MutexType() {omp_init_lock(&lock_);}

src/NcmlCDMReader.cc

@@ -25,6 +25,7 @@
  */
 
 #include "fimex/NcmlCDMReader.h"
+#include "MutexLock.h"
 #include "NcmlAggregationReader.h"
 #include "fimex/XMLDoc.h"
 #include <libxml/tree.h>
@@ -50,6 +51,7 @@ static LoggerPtr logger = getLogger("fimex/NcmlCDMReader");
 
 NcmlCDMReader::NcmlCDMReader(const XMLInput& configXML)
     : configId(configXML.id())
+    , mutex_(new MutexType())
 {
 #ifdef HAVE_NETCDF_H
     setConfigDoc(configXML);
@@ -78,7 +80,9 @@ NcmlCDMReader::NcmlCDMReader(const XMLInput& configXML)
 }
 
 NcmlCDMReader::NcmlCDMReader(const boost::shared_ptr<CDMReader> dataReader, const XMLInput& configXML)
-    : configId(configXML.id()), dataReader(dataReader)
+    : configId(configXML.id())
+    , mutex_(new MutexType())
+    , dataReader(dataReader)
 {
     setConfigDoc(configXML);
     init();
@@ -475,7 +479,7 @@ void NcmlCDMReader::initAttributeNameChange()
 
 DataPtr NcmlCDMReader::getDataSlice(const std::string& varName, size_t unLimDimPos)
 {
-    ScopedCritical sc(mutex_);
+    ScopedCritical sc(*mutex_);
     LOG4FIMEX(logger, Logger::DEBUG, "getDataSlice(var,unlimDimPos): (" << varName << ", " << unLimDimPos << ")");
     // return unchanged data from this CDM
     const CDMVariable& variable = cdm_->getVariable(varName);
@@ -562,7 +566,7 @@ DataPtr NcmlCDMReader::getDataSlice(const std::string& varName, size_t unLimDimP
 
 DataPtr NcmlCDMReader::getDataSlice(const std::string& varName, const SliceBuilder& sb)
 {
-    ScopedCritical sc(mutex_);
+    ScopedCritical sc(*mutex_);
     LOG4FIMEX(logger, Logger::DEBUG, "getDataSlice(var,sb): (" << varName << ", sb)");
     // return unchanged data from this CDM
     const CDMVariable& variable = cdm_->getVariable(varName);

src/NetCDF_CDMWriter.cc

@@ -54,8 +54,6 @@ extern "C" {
 #include "fimex/NcmlCDMReader.h"
 #include "fimex/Data.h"
 #include "NetCDF_Utils.h"
-#include "fimex/MutexLock.h" // also includes omp.h
-
 
 namespace MetNoFimex
 {

src/NetCDF_Utils.cc

@@ -25,7 +25,7 @@
 #include "fimex/Data.h"
 #include "fimex/CDMException.h"
 #include "fimex/Logger.h"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include <boost/scoped_array.hpp>
 #include <functional>
 #include <numeric>
@@ -63,9 +63,8 @@ Nc::~Nc()
    }
 }
 
-static MutexType mt;
 MutexType& Nc::getMutex() {
-    return mt;
+    return ncMutex;
 }
 
 nc_type cdmDataType2ncType(CDMDataType dt) {

src/NetCDF_Utils.h

@@ -27,7 +27,7 @@
 #include <boost/shared_ptr.hpp>
 #include "fimex/CDMDataType.h"
 #include "fimex/DataDecl.h"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 extern "C" {
 #include "netcdf.h"
 }

src/Null_CDMWriter.cc

@@ -27,7 +27,7 @@
 #include "fimex/CDMDataType.h"
 #include "fimex/Utils.h"
 #include "fimex/Data.h"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include "fimex/Logger.h"
 
 #include "../config.h"

src/ProradXMLCDMReader.cc

@@ -24,7 +24,7 @@
  *      Author: Heiko Klein
  */
 #include <ProradXMLCDMReader.h>
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include "fimex/Logger.h"
 #include "fimex/CDM.h"
 #include "fimex/coordSys/LatitudeLongitudeProjection.h"

src/TimeUnit.cc

@@ -23,7 +23,7 @@
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "fimex/TimeUnit.h"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include "fimex/Utils.h"
 #include <limits>
 

src/Units.cc

@@ -27,7 +27,7 @@
 #include "fimex/Logger.h"
 
 #include "boost/shared_ptr.hpp"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include "../config.h"
 #ifdef HAVE_UDUNITS2_H
 #include "udunits2.h"

src/WdbCDMReader.cc

@@ -40,7 +40,7 @@
 #include "fimex/CDM.h"
 #include "fimex/Data.h"
 #include "fimex/Logger.h"
-#include "fimex/MutexLock.h"
+#include "MutexLock.h"
 #include "wdb/Wdb2CdmBuilder.h"
 #include "wdb/WdbIndex.h"
 #include "wdb/config/GlobalWdbConfiguration.h"