X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/7e74b790d290cd7d776349503bb361c47933c01f..1767eccd7e3ea6de4101d6d29c1d29ac0fba2a51:/Server/src/server.cpp?ds=sidebyside

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 340c2f0..32b23e5 100644
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -29,6 +29,7 @@
 #include "plaqui/server/connection.h"
 #include "plaqui/server/controlserver.h"
 #include <sigc++/class_slot.h>
+#include <glibmm/timer.h>
 #include <sstream>
 #include <exception>
 #ifdef DEBUG
@@ -47,10 +48,19 @@ Server::~Server(void) {
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<<  ": destructor." << endl;
 #endif // DEBUG
-	// Termino plantas.
-	Glib::Mutex::Lock lock(plants_mutex);
-	for (PlantList::iterator i = plants.end(); i != plants.end(); i++) {
-		i->second->finish(true);
+	// Mando a terminar todas las plantas.
+	plants_mutex.lock();
+	for (PlantList::iterator i = plants.begin(); i != plants.end(); i++) {
+		i->second->finish();
+	}
+	PlantList::size_type count = plants.size();
+	plants_mutex.unlock();
+	// Espero que terminen realmente.
+	while (count) {
+		Glib::usleep(10000); // 10 milisegundos
+		plants_mutex.lock();
+		count = plants.size();
+		plants_mutex.unlock();
 	}
 }
 
@@ -60,13 +70,12 @@ Server::Server(const string& plant_filename, const Connection::Port& port)
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<<  ": port = " << port << endl;
 #endif // DEBUG
-	// FIXME
+	// FIXME - hacer que se puedan cargar mas plantas bien.
 	Glib::Mutex::Lock lock(plants_mutex);
 	plants["default"] = new Plant(plant_filename);
-	plants["default"]->signal_finished().connect(
-			SigC::bind<const char*>(
-				SigC::slot_class(*this, &Server::on_plant_finished),
-				"default"));
+	plants["default"]->signal_finished().connect(SigC::bind(
+			SigC::slot_class(*this, &Server::on_plant_finished),
+			"default"));
 	plants["default"]->run();
 }
 
@@ -78,10 +87,9 @@ Connection* Server::new_connection(const sockbuf::sockdesc& sd) {
 #endif // DEBUG
 	ControlServer* connection = new ControlServer(sd);
 	// TODO verificar si el new se hace bien? no creo.
-	connection->signal_command_received().connect(
-			SigC::bind<ControlServer*>(
-				SigC::slot_class(*this, &Server::on_control_command_received),
-				connection));
+	connection->signal_command_received().connect(SigC::bind(
+			SigC::slot_class(*this, &Server::on_control_command_received),
+			connection));
 	// TODO: 
 	return connection;
 }
@@ -111,9 +119,15 @@ void Server::on_control_command_received(const Command& command,
 		if (command.get_command() == "status") {
 			response = cmd_server_status();
 		} else if (command.get_command() == "stop") {
-			finish();
 			response = new HTTPResponse(HTTPMessage::OK,
 					"<response desc=\"El server se apagará en instantes...\" />");
+			// XXX - Sin mandar la respuesta enseguida podría ser que el server
+			// cierre la conexión antes de mandar la respuesta.
+			//response->headers["Content-Type"] = "text/xml; charset=iso-8859-1";
+			//controlserver->send(*response);
+			//delete response;
+			finish();
+			//return;
 		} else {
 			response = new HTTPResponse(HTTPMessage::NOT_FOUND,
 					"<response desc=\"Invalid command for 'server' taget!\" />");