Changeset 3046 for trunk/src/ScantableWrapper.h

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

File:

• trunk/src/ScantableWrapper.h (modified) (2 diffs)

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); }