X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/e46a2c7e43af9156a434d9cf41c2beb5b25b36d1..954b8556b4bf52226085867069af83e63614a7c6:/Server/src/plant.cpp

diff --git a/Server/src/plant.cpp b/Server/src/plant.cpp
index b020e21..f3a0a98 100644
--- a/Server/src/plant.cpp
+++ b/Server/src/plant.cpp
@@ -44,50 +44,56 @@ Plant::~Plant(void) {
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<< ": destructor." << endl;
 #endif // DEBUG
-	// Termino transmisiones.
-	Glib::Mutex::Lock lock(transmissions_mutex);
-	for (TransmitterList::iterator trans = transmissions.end();
+	// Mando a terminar todas las transmisiones.
+	transmissions_mutex.lock();
+	for (TransmitterList::iterator trans = transmissions.begin();
 			trans != transmissions.end(); trans++) {
-		(*trans)->finish(true);
+		(*trans)->finish();
+	}
+	TransmitterList::size_type count = transmissions.size();
+	transmissions_mutex.unlock();
+	// Espero que terminen realmente.
+	while (count) {
+		Glib::usleep(10000); // 10 milisegundos
+		transmissions_mutex.lock();
+		count = transmissions.size();
+		transmissions_mutex.unlock();
 	}
 }
 
-Plant::Plant(const string& filename): simulator(filename), filename(filename) {
+Plant::Plant(const string& filename): simulator(filename), filename(filename),
+		wait_time(DEFAULT_WAIT_TIME), paused(true) {
 #ifdef DEBUG
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<< ": constructor. filename = " << filename << endl;
 #endif // DEBUG
-	// TODO plant
-/*	simulator.add_pump("bomba1");
-	simulator.add_conduct("c");
-	simulator.add_conduct("c1");
-	simulator.add_drainage("d");
-	simulator.add_tank("tanque");
-	
-	simulator.connect("bomba1", "c", Model::IConector::OUT);
-	simulator.connect("c", "tanque", Model::IConector::OUT);
-	simulator.connect("tanque", "c1", Model::IConector::OUT);
-	simulator.connect("c1", "d", Model::IConector::OUT);
-*/	
 }
 
-void Plant::real_run(void) {
+void Plant::real_run(void) throw() {
 #ifdef DEBUG
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<< ": real_run." << endl;
 #endif // DEBUG
-	while (!stop) {
-		simulator_mutex.lock();
-		simulator.simulate();
-		string plantstatus = simulator.get_state_as_xml();
-		simulator_mutex.unlock();
-		transmissions_mutex.lock();
-		for (TransmitterList::iterator i = transmissions.begin();
-				i != transmissions.end(); i++) {
-			(*i)->send(plantstatus);
+	unsigned wait;
+	while (!stop()) {
+		if (paused) { // Si está pausada, espera un tiempo sin simular.
+			Glib::usleep(DEFAULT_WAIT_TIME);
+		} else { // Si está andando, simula y manda estado.
+			simulator_mutex.lock();
+			simulator.simulate();
+			string plantstatus = simulator.get_state_as_xml();
+			simulator_mutex.unlock();
+			transmissions_mutex.lock();
+			for (TransmitterList::iterator i = transmissions.begin();
+					i != transmissions.end(); i++) {
+				(*i)->send(plantstatus);
+			}
+			transmissions_mutex.unlock();
+			wait_time_mutex.lock();
+			wait = wait_time;
+			wait_time_mutex.unlock();
+			Glib::usleep(wait);
 		}
-		transmissions_mutex.unlock();
-		Glib::usleep(1000000);
 	}
 }
 
@@ -112,25 +118,16 @@ bool Plant::transmission_start(string& host, Connection::Port& port) {
 	Transmitter* trans;
 	try {
 		trans = new Transmitter(host, port);
-	} catch (const sockerr& e) { // TODO - Hace mas selectivo el catch?
+	} catch (const sockerr& e) {
 #ifdef DEBUG
 		cerr << __FILE__ << "(" << __LINE__ << ")"
 			<< ": transmission_start ERROR (" << e.serrno()
 			<< "): " << e.errstr() << endl;
 #endif // DEBUG
-		//delete trans;
 		return false;
-//	} catch (...) { // TODO - Hace mas selectivo el catch?
-//#ifdef DEBUG
-//		cerr << __FILE__ << "(" << __LINE__ << ")"
-//			<< ": transmission_start ERROR: desconocido."
-//			<< endl;
-//#endif // DEBUG
-//		//delete trans;
-//		return false;
 	}
 	transmissions.push_back(trans);
-	trans->signal_finished().connect(SigC::bind<Transmitter*>(
+	trans->signal_finished().connect(SigC::bind(
 				SigC::slot_class(*this, &Plant::on_transmission_finished),
 				trans));
 	trans->run();
@@ -192,32 +189,22 @@ const string Plant::get_xml(void) const {
 #endif // DEBUG
 	ostringstream oss;
 	ifstream ifs(filename.c_str());
+	// FIXME Saco la línea de definición de XML (<?xml ?>), ver si esta hecho muy
+	// feo.
+	ifs.ignore(50, '\n'); // Ignora 50 caracteres o hasta un enter.
 	ifs >> oss.rdbuf();
 	return oss.str();
 }
 
-/*
-bool Plant::transmission_exists(const string& host,
-		const Connection::Port& port) {
-	Glib::Mutex::Lock lock(transmissions_mutex);
-	for (TransmitterList::const_iterator i = transmissions.begin();
-			i != transmissions.end(); i++) {
-		if (((*i)->get_host() == host) && ((*i)->get_oprt() == port)) {
-			return true;
-		}
-	}
-	return false; // No la encontró.
+void Plant::set_frequency(unsigned hz) {
+	Glib::Mutex::Lock lock(wait_time_mutex);
+	wait_time = hz ? (1000000u/hz) : DEFAULT_WAIT_TIME;
 }
-*/
 
-//const std::string& Plant::get_filename(void) const {
-//	return filename;
-//}
-
-/// \todo FIXME esto deberia estar protegido por un mutex.
-//Plant::SignalUpdated& Plant::signal_updated(void) {
-//	return updated;
-//}
+void Plant::set_paused(bool paused_) {
+	Glib::Mutex::Lock lock(paused_mutex);
+	paused = paused_;
+}
 
 } // namespace Server