BF: lab.separate() now works

Author: brunobeltran

pymatbridge/matlab/matlabserver.m

@@ -31,6 +31,7 @@ function matlabserver(socket_address, exit_when_done)
 
         case {'separate'}
             desktop; %no-op if desktop is already up
+            exit_when_done = false;
             break;
 
         otherwise
@@ -40,14 +41,16 @@ function matlabserver(socket_address, exit_when_done)
 end
 
 if nargin > 1 && exit_when_done
-    c.task();
+    %c.task(); % already executed by "finish"
     exit;
 end
 
 end %matlabserver
 
 function stop_messenger()
-    messenger('exit');
+    if messenger('check')
+        messenger('exit');
+    end
 end
 
 function initialize_environment()

pymatbridge/messenger/mexa64/messenger.mexa64

@@ -71,7 +71,7 @@ void mexFunction(int nlhs, mxArray *plhs[],
     /* we'll return true on completion of valid command, else false */
     plhs[0] = mxCreateLogicalMatrix(1, 1);
     p = mxGetLogicals(plhs[0]);
-    p[0] = 0;
+    p[0] = false;
     /* Initialize a new server session */
     if (strcmp(cmd, "init") == 0) {
         char *socket_addr;
@@ -84,7 +84,7 @@ void mexFunction(int nlhs, mxArray *plhs[],
         }
         if (!initialized) {
             if (!initialize(socket_addr)) {
-                p[0] = 1;
+                p[0] = true;
                 mexPrintf("Socket created at: %s\n", socket_addr);
             } else {
                 mexErrMsgTxt("Socket creation failed.");
@@ -116,12 +116,11 @@ void mexFunction(int nlhs, mxArray *plhs[],
             sprintf(recv_buffer, "Failed to receive a message due to ZMQ error %s", strerror(errno));
             mexErrMsgTxt(recv_buffer);
         }
-        p[0] = 1;
+        p[0] = true;
     /* Send a message out */
     } else if (strcmp(cmd, "respond") == 0) {
         size_t msglen;
         char *msg_out;
-        mxLogical *p;
 
         /* Check if the input format is valid */
         if (nrhs != 2) {
@@ -133,25 +132,23 @@ void mexFunction(int nlhs, mxArray *plhs[],
         msglen = mxGetNumberOfElements(prhs[1]);
         msg_out = mxArrayToString(prhs[1]);
 
-        plhs[0] = mxCreateLogicalMatrix(1, 1);
-        p = mxGetLogicals(plhs[0]);
-
         if (msglen == (size_t) zmq_send(socket_ptr, msg_out, msglen, 0)) {
-            p[0] = 1;
+            p[0] = true;
         } else {
             mexErrMsgTxt("Failed to send message due to ZMQ error");
         }
     /* Close the socket and context */
     } else if (strcmp(cmd, "exit") == 0) {
         if (initialized) {
             cleanup();
-            p[0] = 1;
+            p[0] = true;
+            initialized = 0;
         } else {
             mexErrMsgTxt("No open socket to exit.");
         }
     } else if (strcmp(cmd, "check") == 0) {
         if (initialized) {
-            p[0] = 1;
+            p[0] = true;
         }
     } else {
         mexErrMsgTxt("Unidentified command");