send job compiles

Author: dcwhite

src/Modules/Legacy/Matlab/Interface/InterfaceWithMatlab.cc

@@ -674,11 +674,11 @@ bool InterfaceWithMatlabImpl::send_matlab_job()
   std::string mfilename = mfile_.substr(0,mfile_.size()-2); // strip the .m
   std::string remotefile = file_transfer_->remote_file(mfilename);
 #ifndef USE_MATLAB_ENGINE_LIBRARY
-  IComPacketHandle packet = new IComPacket;
+  IComPacketHandle packet(new IComPacket);
 
-  if (packet.get_rep() == 0)
+  if (!packet)
   {
-    error("InterfaceWithMatlab: Could not create packet");
+    module_->error("InterfaceWithMatlab: Could not create packet");
     return(false);
   }
 
@@ -693,26 +693,27 @@ bool InterfaceWithMatlabImpl::send_matlab_job()
   thread_info_->dolock();
   if (!thread_info_->code_done_)
   {
-    thread_info_->wait_code_done_.wait(thread_info_->lock);
+    UniqueLock lock(thread_info_->lock_.get());
+    thread_info_->wait_code_done_.wait(lock);
   }
   bool success = thread_info_->code_success_;
   bool exitcond = thread_info_->exit_;
   if (!success)
   {
     if (exitcond)
     {
-      error("InterfaceWithMatlab: the matlab engine crashed or did not start: "+ thread_info_->code_error_);
-      error("InterfaceWithMatlab: possible causes are:");
-      error("(1) matlab code failed in such a way that the engine was no able to catch the error (e.g. failure mex of code)");
-      error("(2) matlab crashed and the matlab engine detected an end of communication of the matlab process");
-      error("(3) temparory files could not be created or are corrupted");
-      error("(4) improper matlab version, use matlab V5 or higher, currently matlab V5-V7 are supported");
+      module_->error("InterfaceWithMatlab: the matlab engine crashed or did not start: "+ thread_info_->code_error_);
+      module_->error("InterfaceWithMatlab: possible causes are:");
+      module_->error("(1) matlab code failed in such a way that the engine was no able to catch the error (e.g. failure mex of code)");
+      module_->error("(2) matlab crashed and the matlab engine detected an end of communication of the matlab process");
+      module_->error("(3) temparory files could not be created or are corrupted");
+      module_->error("(4) improper matlab version, use matlab V5 or higher, currently matlab V5-V7 are supported");
     }
     else
     {
-      error("InterfaceWithMatlab: matlab code failed: "+thread_info_->code_error_);
-      error("InterfaceWithMatlab: Detected an error in the Matlab code, the matlab engine is still running and caught the exception");
-      error("InterfaceWithMatlab: Please check the matlab code in the GUI and try again. The output window in the GUI should contain the reported error message generated by matlab");
+      module_->error("InterfaceWithMatlab: matlab code failed: "+thread_info_->code_error_);
+      module_->error("InterfaceWithMatlab: Detected an error in the Matlab code, the matlab engine is still running and caught the exception");
+      module_->error("InterfaceWithMatlab: Please check the matlab code in the GUI and try again. The output window in the GUI should contain the reported error message generated by matlab");
     }
     thread_info_->code_done_ = false;
     thread_info_->unlock();