Changeset 3046 for trunk

Timestamp:

08/07/15 17:55:07 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-7764

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description:

Release GIL in some time-consuming functions. Currently the following functions releases GIL:

• MSFiller::fill
• MSWriter::write
• Scantable::applyBaselineTable
• Scantable::subBaseline
• CalibrationManager::calibrate
• CalibrationManager::apply

Location:

trunk/src

Files:

• CalibrationManagerWrapper.h (added)
• GILHandler.h (added)
• MSFillerWrapper.h (modified) (2 diffs)
• MSWriterWrapper.h (modified) (2 diffs)
• ScantableWrapper.h (modified) (2 diffs)
• python_CalibrationManager.cpp (modified) (2 diffs)

trunk/src/MSFillerWrapper.h

@@ -24 +24 @@
 #include "ScantableWrapper.h"
 #include "MSFiller.h" 
+#include "GILHandler.h"
 
 namespace asap
@@ -63 +64 @@
   void fill()
   {
+    GILHandler scopedRelease;
+
     if ( attached_ ) {
       filler_->fill() ;

trunk/src/MSWriterWrapper.h

@@ -24 +24 @@
 #include "ScantableWrapper.h"
 #include "MSWriter.h" 
+#include "GILHandler.h"
 
 namespace asap
@@ -39 +40 @@
   void write(const std::string& filename, const casa::Record& rec) 
   {
+    GILHandler scopedRelease;
+
     casa::File file( filename ) ;
     writer_ = new MSWriter( stable_ ) ;

trunk/src/ScantableWrapper.h

@@ -24 +24 @@
 #include "STFit.h"
 #include "STFitEntry.h"
+#include "GILHandler.h"
 
 namespace asap {
@@ -291 +292 @@
 
   std::vector<std::string> applyBaselineTable(const std::string& bltable, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
-  { return table_->applyBaselineTable(bltable, returnfitresult, outbltable, outbltableexists, overwrite); }
+  {
+    GILHandler scopedRelease;
+    return table_->applyBaselineTable(bltable, returnfitresult, outbltable, outbltableexists, overwrite);
+  }
   std::vector<std::string> subBaseline(const std::vector<std::string>& blinfo, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
-  { return table_->subBaseline(blinfo, returnfitresult, outbltable, outbltableexists, overwrite); }
+  {
+    GILHandler scopedRelease;
+    return table_->subBaseline(blinfo, returnfitresult, outbltable, outbltableexists, overwrite);
+  }
   void polyBaseline(const std::vector<bool>& mask, int order, float clipthresh, int clipniter, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="", const std::string& bltable="")
   { table_->polyBaseline(mask, order, clipthresh, clipniter, getresidual, showprogress, outlog, blfile, bltable); }

trunk/src/python_CalibrationManager.cpp

@@ -8 +8 @@
 #include <vector>
 
-#include "CalibrationManager.h"
+#include "CalibrationManagerWrapper.h"
 #include "ScantableWrapper.h"
 
@@ -17 +17 @@
 
 void python_CalibrationManager() {
-  class_<CalibrationManager>("_calmanager")
+  class_<CalibrationManagerWrapper>("_calmanager")
     .def( init <> () )
-    .def("set_data", &CalibrationManager::setScantable)
-    .def("set_data", &CalibrationManager::setScantableByName)
-    .def("add_applytable", &CalibrationManager::addApplyTable)
-    .def("add_skytable", &CalibrationManager::addSkyTable)
-    .def("add_tsystable", &CalibrationManager::addTsysTable)
-    .def("set_calmode", &CalibrationManager::setMode)
-    .def("set_time_interpolation", &CalibrationManager::setTimeInterpolation,
+    .def("set_data", &CalibrationManagerWrapper::setScantable)
+    .def("set_data", &CalibrationManagerWrapper::setScantableByName)
+    .def("add_applytable", &CalibrationManagerWrapper::addApplyTable)
+    .def("add_skytable", &CalibrationManagerWrapper::addSkyTable)
+    .def("add_tsystable", &CalibrationManagerWrapper::addTsysTable)
+    .def("set_calmode", &CalibrationManagerWrapper::setMode)
+    .def("set_time_interpolation", &CalibrationManagerWrapper::setTimeInterpolation,
          (boost::python::arg("interp"),
           boost::python::arg("order")=-1))
-    .def("set_freq_interpolation", &CalibrationManager::setFrequencyInterpolation,
+    .def("set_freq_interpolation", &CalibrationManagerWrapper::setFrequencyInterpolation,
          (boost::python::arg("interp"),
           boost::python::arg("order")=-1))
-    .def("set_calibration_options", &CalibrationManager::setCalibrationOptions)
-    .def("reset", &CalibrationManager::reset)
-    .def("set_tsys_spw", &CalibrationManager::setTsysSpw)
-    .def("set_tsys_spw_withrange", &CalibrationManager::setTsysSpwWithRange,
+    .def("set_calibration_options", &CalibrationManagerWrapper::setCalibrationOptions)
+    .def("reset", &CalibrationManagerWrapper::reset)
+    .def("set_tsys_spw", &CalibrationManagerWrapper::setTsysSpw)
+    .def("set_tsys_spw_withrange", &CalibrationManagerWrapper::setTsysSpwWithRange,
          (boost::python::arg("spwlist"),
           boost::python::arg("average")=false))
-    .def("set_tsys_transfer", &CalibrationManager::setTsysTransfer)
-    .def("calibrate", &CalibrationManager::calibrate)
-    .def("apply", &CalibrationManager::apply,
+    .def("set_tsys_transfer", &CalibrationManagerWrapper::setTsysTransfer)
+    .def("calibrate", &CalibrationManagerWrapper::calibrate)
+    .def("apply", &CalibrationManagerWrapper::apply,
          (boost::python::arg("insitu")=false,
           boost::python::arg("filltsys")=true))
-    .def("save_caltable", &CalibrationManager::saveCaltable)
-    .def("split", &CalibrationManager::split)
+    .def("save_caltable", &CalibrationManagerWrapper::saveCaltable)
+    .def("split", &CalibrationManagerWrapper::split)
     ;