X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/c0e0cf58ce033421d125afb813636f102456592c..c5c8d16a2d8c4a0ec1a8d3e83104f73512c91001:/Server/src/plant.cpp diff --git a/Server/src/plant.cpp b/Server/src/plant.cpp index e46e692..f3a0a98 100644 --- a/Server/src/plant.cpp +++ b/Server/src/plant.cpp @@ -27,10 +27,8 @@ #include "plaqui/server/plant.h" #include -#include +#include #include -#include -#include #ifdef DEBUG # include #endif // DEBUG @@ -43,74 +41,108 @@ namespace Server { Plant::~Plant(void) { #ifdef DEBUG - cerr << __FILE__ << ": destructor." << endl; + 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__ << ": constructor. filename = " << filename << endl; + 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__ << ": real_run." << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": real_run." << endl; #endif // DEBUG - while (!stop) { - simulator_mutex.lock(); - simulator.simulate(); - simulator_mutex.unlock(); - transmissions_mutex.lock(); - for (TransmitterList::iterator i = transmissions.begin(); - i != transmissions.end(); i++) { - (*i)->send(simulator.get_state_as_xml()); + 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); } } bool Plant::transmission_start(string& host, Connection::Port& port) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": transmission_start(host = " << host << + ", port = " << port << ")." << endl; +#endif // DEBUG Glib::Mutex::Lock lock(transmissions_mutex); for (TransmitterList::iterator i = transmissions.begin(); i != transmissions.end(); i++) { if (((*i)->get_host() == host) && ((*i)->get_port() == port)) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": transmission_start ERROR: ya existe." + << endl; +#endif // DEBUG return false; } } Transmitter* trans; try { trans = new Transmitter(host, port); - } catch (...) { // TODO - Hace mas selectivo el catch? - delete trans; + } catch (const sockerr& e) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": transmission_start ERROR (" << e.serrno() + << "): " << e.errstr() << endl; +#endif // DEBUG return false; } transmissions.push_back(trans); + trans->signal_finished().connect(SigC::bind( + SigC::slot_class(*this, &Plant::on_transmission_finished), + trans)); trans->run(); + host = trans->get_host(); + port = trans->get_port(); return true; } bool Plant::transmission_stop(const string& host, const Connection::Port& port) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": transmission_stop(host = " << host << + ", port = " << port << ")." << endl; +#endif // DEBUG Glib::Mutex::Lock lock(transmissions_mutex); for (TransmitterList::iterator i = transmissions.begin(); i != transmissions.end(); i++) { @@ -122,46 +154,57 @@ bool Plant::transmission_stop(const string& host, return false; // No la encontró. } +void Plant::on_transmission_finished(Transmitter* transmission) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": on_transmission_finished(transmission = " + << transmission << ")" << endl; +#endif // DEBUG + Glib::Mutex::Lock lock(transmissions_mutex); + transmissions.remove(transmission); +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": lista de conexiones" << endl; + for (TransmitterList::const_iterator i = transmissions.begin(); + i != transmissions.end(); i++) { + cerr << "\t " << *i << endl; + } +#endif // DEBUG +} + bool Plant::set_open(const std::string& element, bool open) { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": set_open(element = " << element << + ", open = " << open << ")." << endl; +#endif // DEBUG Glib::Mutex::Lock lock(simulator_mutex); return simulator.set_open(element, open); } const string Plant::get_xml(void) const { +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": get_xml()." << endl; +#endif // DEBUG ostringstream oss; - try { - ifstream ifs(filename.c_str()); - ifs >> noskipws; - copy(istream_iterator(ifs), istream_iterator(), - ostream_iterator(oss)); - } catch (...) { // TODO hacerlo mas selectivo? - return ""; - } + ifstream ifs(filename.c_str()); + // FIXME Saco la línea de definición de 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_name(void) const { -// return name; -//} - -/// \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