Skip to content

Fix matlabserver shutdown behavior #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arokem merged 1 commit into from
Apr 24, 2015
Merged

Fix matlabserver shutdown behavior #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pymatbridge/matlab/matlabserver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ function matlabserver(socket_address)
json_startup
messenger('init', socket_address);

c=onCleanup(@()exit);

while(1)
msg_in = messenger('listen');
req = json_load(msg_in);
Expand All @@ -16,7 +18,6 @@ function matlabserver(socket_address)

case {'exit'}
messenger('exit');
clear mex;
break;

case {'eval'}
Expand Down
3 changes: 1 addition & 2 deletions pymatbridge/pymatbridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ def _execute_flag(self): # pragma: no cover
def _run_server(self):
code = self._preamble_code()
code.extend([
"matlabserver('%s')" % self.socket_addr,
'exit'
"matlabserver('%s')" % self.socket_addr
])
command = '%s %s %s "%s"' % (self.executable, self.startup_options,
self._execute_flag(), ','.join(code))
Expand Down