From e966b70ef93d8414533713ecbea10c28118fc5b8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 22 Mar 2013 21:22:47 +0000
Subject: [PATCH] revert loop on subclients for now until we find a better way
to clean up the servers
---
Fltk/gmshLocalNetworkClient.h | 3 ++
Fltk/onelabGroup.cpp | 87 ++++++++++++++++-------------------
2 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/Fltk/gmshLocalNetworkClient.h b/Fltk/gmshLocalNetworkClient.h
index aeabcc7b22..0d86b25b52 100644
--- a/Fltk/gmshLocalNetworkClient.h
+++ b/Fltk/gmshLocalNetworkClient.h
@@ -12,6 +12,9 @@
class gmshLocalNetworkClient : public onelab::localNetworkClient{
private:
+ // a gmsh local network client can launch subclients (this is typical for a
+ // metamodel that calls several underlying models); _clients keeps track of
+ // the master (this) and the subclients.
std::vector<gmshLocalNetworkClient*> _clients;
public:
gmshLocalNetworkClient(const std::string &name, const std::string &executable,
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index fbc33abb94..a1275eccfc 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -61,7 +61,6 @@ class onelabGmshServer : public GmshServer{
~onelabGmshServer(){}
int NonBlockingSystemCall(const char *str)
{
- //std::cout << "System call: " << str << std::endl;
return SystemCall(str);
}
int NonBlockingWait(double waitint, double timeout, int socket)
@@ -169,7 +168,6 @@ std::string getNextToken(const std::string &msg,
bool gmshLocalNetworkClient::receiveMessage()
{
- bool showMessages = false;
double timer = GetTimeInSeconds();
if(!getGmshServer()){
@@ -182,16 +180,12 @@ bool gmshLocalNetworkClient::receiveMessage()
Msg::Error("Abnormal server termination (did not receive message header)");
return false;
}
- else if(showMessages)
- std::cout << "Received header: " << type << " from " << getName() << std::endl;
std::string message(length, ' ');
if(!getGmshServer()->ReceiveMessage(length, &message[0])){
Msg::Error("Abnormal server termination (did not receive message body)");
return false;
}
- // else if(showMessages)
- // std::cout << "Received message: " << message << " from " << getName() << std::endl;
switch (type) {
case GmshSocket::GMSH_START:
@@ -352,8 +346,7 @@ bool gmshLocalNetworkClient::receiveMessage()
std::string::size_type first = 0;
std::string clientName = getNextToken(message, first);
std::string command = getNextToken(message, first);
-
- gmshLocalNetworkClient* subClient =
+ gmshLocalNetworkClient* subClient =
new gmshLocalNetworkClient(clientName, command);
onelabGmshServer *server = new onelabGmshServer(subClient);
subClient->setPid(0);
@@ -368,8 +361,6 @@ bool gmshLocalNetworkClient::receiveMessage()
subClient->setGmshServer(server);
addClient(subClient);
std::cout << "Gmsh has " << getNumClients() << " clients\n";
- // std::string reply = "Connected !!";
- // getGmshServer()->SendMessage(GmshSocket::GMSH_CONNECT, reply.size(), &reply[0]);
}
}
break;
@@ -415,66 +406,68 @@ bool gmshLocalNetworkClient::run()
Msg::StatusBar(true, "Running '%s'...", _name.c_str());
setGmshServer(server);
- int i = 0;
+
while(1) {
// loop on all the clients (usually only one, but can be more if we spawned
// subclients; in that case we might want to start from the one after the
// one we read from last, for better load balancing)
bool stop = false, haveData = false;
gmshLocalNetworkClient *c = 0;
-
+
if(getExecutable().empty() && !CTX::instance()->solver.listen){
// we stopped listening to the special "Listen" client
stop = true;
break;
}
- c = getClient(i);
- //std::cout << "client " << i << "/" << getNumClients() << " pid= " << c->getPid();
-
- if(c->getPid() < 0){
- if(c == this){ // the "master" client stopped
- stop = true;
- }
- else{ // this subclient is not active anymore
- std::string reply = c->getName();
- getGmshServer()->SendMessage(GmshSocket::GMSH_OPTION_1, reply.size(), &reply[0]);
- onelab::server::instance()->unregisterClient(c);
- removeClient(c);
- Msg::StatusBar(true, "Done running '%s'", c->getName().c_str());
- i=0; // start over with the only client that surely exists
- continue;
+ for(int i = 0; i < getNumClients(); i++){
+ if(getExecutable().empty() && !CTX::instance()->solver.listen){
+ // we stopped listening to the special "Listen" client
+ stop = true;
+ break;
}
- }
- GmshServer *s = c->getGmshServer();
- if(!s){
- Msg::Error("Abnormal server termination (no valid server)");
- stop = true;
- }
- else{
- int ret = s->NonBlockingWait(0.001, -1.);
- //std::cout << " ret = " << ret << std::endl;
- if(ret == 0){
- haveData = true; // we have data from this particular client
+ c = getClient(i);
+ if(c->getPid() < 0){
+ if(c == this){ // the "master" client stopped
+ stop = true;
+ break;
+ }
+ else{ // this subclient is not active anymore
+ continue;
+ }
}
- else if(ret == 3){
- //pass on to the next client
+ GmshServer *s = c->getGmshServer();
+ if(!s){
+ Msg::Error("Abnormal server termination (no valid server)");
+ stop = true;
+ break;
}
- else{ // an error occurred
- stop = true;
+ else{
+ int ret = s->NonBlockingWait(0.001, -1.);
+ if(ret == 0){
+ // we have data from this particular client
+ haveData = true;
+ break;
+ }
+ else if(ret == 3){
+ // pass to the next client
+ continue;
+ }
+ else{ // an error occurred
+ stop = true;
+ break;
+ }
}
}
if(stop) break;
if(haveData && !c->receiveMessage()) break;
if(c == this && c->getPid() < 0) break;
-
- i++;
- if(i >= getNumClients()) i = 0;
}
// we are done running the (master) client: delete the servers and the
- // subclients, if any. We do not delete the servers when we disconnect to make
- // sure we always delete them, even when we disconnect "uncleanly"
+ // subclients, if any. The servers are not deleted upon GMSH_STOP in
+ // receiveMessage() to make sure we always delete them, even when the
+ // disconnect was not clean.
for(int i = 0; i < getNumClients(); i++){
gmshLocalNetworkClient *c = getClient(i);
GmshServer *s = c->getGmshServer();
--
GitLab