Se termina de poner prolijo Runnable:

[z.facultad/75.42/plaqui.git] / Server / src / runnable.cpp

diff --git a/Server/src/runnable.cpp b/Server/src/runnable.cpp
index 68296e4442e7762e6bc3493cf25eaa5a63a2d6ab..9587fd9e6691088d5e815a2dedd666fdb8850630 100644 (file)
--- a/Server/src/runnable.cpp
+++ b/Server/src/runnable.cpp
@@ -40,38 +40,42 @@ namespace Server {
 
 Runnable::~Runnable(void) {
 #ifdef DEBUG
 
 Runnable::~Runnable(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor(this = " << this << ")"
-               << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor(this = " << this << ")." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-Runnable::Runnable(void): thread(0), stop(false) {
+Runnable::Runnable(void): _thread(NULL), _stop(false) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": constructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": constructor(this = " << this << ")." << endl;

 #endif // DEBUG
 }
 
 void Runnable::static_run(Runnable* runner) {
 #ifdef DEBUG
 #endif // DEBUG
 }
 
 void Runnable::static_run(Runnable* runner) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": static_run(runner = " << runner << ")"
-               << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": static_run(runner = " << runner << ")" << endl;

 #endif // DEBUG
 #endif // DEBUG

+       // Corre tarea.

        runner->real_run();
        runner->real_run();

-       runner->finished();
+       // Manda señal de tarea finalizada
+       runner->_finished();

        delete runner;
 }
 
 void Runnable::run(bool detach) {
 #ifdef DEBUG
        delete runner;
 }
 
 void Runnable::run(bool detach) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": run(detach = " << detach << ")" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": run(detach = " << detach << ")" << endl;

 #endif // DEBUG
        // Si vamos a correr la tarea en un thread.
        if (detach) {
                // Corremos el thread en una funcion estática para poder destruirlo al
                // finalizar, pasandole el puntero al objeto.
 #endif // DEBUG
        // Si vamos a correr la tarea en un thread.
        if (detach) {
                // Corremos el thread en una funcion estática para poder destruirlo al
                // finalizar, pasandole el puntero al objeto.

-               thread = Glib::Thread::create(
+               _thread = Glib::Thread::create(

                                SigC::bind<Runnable*>(SigC::slot(&Runnable::static_run), this),
                                SigC::bind<Runnable*>(SigC::slot(&Runnable::static_run), this),

-                               true);
+                               false);

        // Si no corremos la tarea normalmente.
        } else {
                real_run();
        // Si no corremos la tarea normalmente.
        } else {
                real_run();


@@ -79,18 +83,33 @@ void Runnable::run(bool detach) {
                
 }
 
                
 }
 

-void Runnable::finish(bool attach) {
+void Runnable::finish(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": finish(attach = " << attach << ")" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": finish();" << endl;

 #endif // DEBUG
 #endif // DEBUG

-       stop = true;
-       if (attach) {
-               thread->join();
-       }
+       stop(true);
+}
+
+bool Runnable::stop(void) {
+       Glib::Mutex::Lock lock(stop_mutex);
+       bool tmp = _stop;
+       return tmp;
+}
+
+bool Runnable::stop(bool stop) {
+       Glib::Mutex::Lock lock(stop_mutex);
+       bool tmp = _stop;
+       _stop = stop;
+       return tmp;

 }
 
 Runnable::SignalFinished& Runnable::signal_finished(void) {
 }
 
 Runnable::SignalFinished& Runnable::signal_finished(void) {

-       return finished;
+       return _finished;
+}
+
+Runnable::SignalError& Runnable::signal_error(void) {
+       return _error;

 }
 
 } // namespace Server
 }
 
 } // namespace Server