Skip to content
Snippets Groups Projects
Commit 81a612f9 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

No commit message

No commit message
parent ba3d52b6
No related branches found
No related tags found
No related merge requests found
...@@ -326,7 +326,7 @@ class GmshServer : public GmshSocket{ ...@@ -326,7 +326,7 @@ class GmshServer : public GmshSocket{
public: public:
GmshServer() : GmshSocket(), _portno(-1) {} GmshServer() : GmshSocket(), _portno(-1) {}
virtual ~GmshServer(){} virtual ~GmshServer(){}
virtual int NonBlockingSystemCall(const char *exe, const char *args) = 0; virtual int NonBlockingSystemCall(const std::string &exe, const std::string &args) = 0;
virtual int NonBlockingWait(double waitint, double timeout, int socket=-1) = 0; virtual int NonBlockingWait(double waitint, double timeout, int socket=-1) = 0;
// start the client by launching "exe args" (args is supposed to contain // start the client by launching "exe args" (args is supposed to contain
// '%s' where the socket name should appear) // '%s' where the socket name should appear)
......
...@@ -37,7 +37,7 @@ class onelabGmshServer : public GmshServer{ ...@@ -37,7 +37,7 @@ class onelabGmshServer : public GmshServer{
onelabGmshServer(onelab::localNetworkClient *client) onelabGmshServer(onelab::localNetworkClient *client)
: GmshServer(), _client(client) {} : GmshServer(), _client(client) {}
~onelabGmshServer(){} ~onelabGmshServer(){}
int NonBlockingSystemCall(const char *exe, const char *args) int NonBlockingSystemCall(const std::string &exe, const std::string &args)
{ {
return SystemCallExe(exe, args); return SystemCallExe(exe, args);
} }
...@@ -399,7 +399,8 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master) ...@@ -399,7 +399,8 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
it != onelab::server::instance()->lastClient(); it++){ it != onelab::server::instance()->lastClient(); it++){
reply.append(it->second->getName() + " "); reply.append(it->second->getName() + " ");
} }
Msg::Error("Skipping already existing client <%s> - Registered clients are < %s>",clientName.c_str(),reply.c_str()); Msg::Error("Skipping already existing client <%s> - Registered clients are < %s>",
clientName.c_str(), reply.c_str());
getGmshServer()->SendMessage getGmshServer()->SendMessage
(GmshSocket::GMSH_STOP, reply.size(), &reply[0]); // reply is dummy (GmshSocket::GMSH_STOP, reply.size(), &reply[0]); // reply is dummy
} }
......
...@@ -1434,7 +1434,7 @@ namespace onelab{ ...@@ -1434,7 +1434,7 @@ namespace onelab{
const std::string &getExecutable(){ return _executable; } const std::string &getExecutable(){ return _executable; }
void setExecutable(const std::string &s){ _executable = s; } void setExecutable(const std::string &s){ _executable = s; }
const std::string &getRemoteLogin(){ return _remoteLogin; } const std::string &getRemoteLogin(){ return _remoteLogin; }
const bool treatExecutableAsFullCommandLine() bool treatExecutableAsFullCommandLine() const
{ {
return _treatExecutableAsFullCommandLine; return _treatExecutableAsFullCommandLine;
} }
......
...@@ -30,9 +30,9 @@ class onelabMetaModelServer : public GmshServer{ ...@@ -30,9 +30,9 @@ class onelabMetaModelServer : public GmshServer{
: GmshServer(), _client(client) {} : GmshServer(), _client(client) {}
~onelabMetaModelServer(){} ~onelabMetaModelServer(){}
int NonBlockingSystemCall(const char *exe, const char *args){ int NonBlockingSystemCall(const std::string &exe, const std::string &args){
std::cout << "Calling now : " << exe << " " << args << std::endl; std::cout << "Calling now : " << exe << " " << args << std::endl;
return SystemCall(exe, args); return SystemCallExe(exe, args);
} }
int NonBlockingWait(double waitint, double timeout, int socket) int NonBlockingWait(double waitint, double timeout, int socket)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment