- Se agrega una planta de prueba (usando Simulator).

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

diff --git a/Server/src/runnable.cpp b/Server/src/runnable.cpp
index 66579acda263b663cd45a67c7e237e3162de3ff7..68296e4442e7762e6bc3493cf25eaa5a63a2d6ab 100644 (file)
--- a/Server/src/runnable.cpp
+++ b/Server/src/runnable.cpp
@@ -26,40 +26,51 @@
 //
 
 #include "plaqui/server/runnable.h"
 //
 
 #include "plaqui/server/runnable.h"

-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>

 #include <glibmm/thread.h>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 #include <glibmm/thread.h>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::Runnable::Runnable(void): thread(0), stop(false) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Runnable::~Runnable(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": destructor(this = " << this << ")"
+               << endl;
+#endif // DEBUG

 }
 
 }
 

-void PlaQui::Server::Runnable::static_run(PlaQui::Server::Runnable* runner) {
+Runnable::Runnable(void): thread(0), stop(false) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": runner = " << runner << std::endl;
+       cerr << __FILE__ << ": constructor." << endl;
+#endif // DEBUG
+}
+
+void Runnable::static_run(Runnable* runner) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": static_run(runner = " << runner << ")"
+               << endl;

 #endif // DEBUG
        runner->real_run();
 #endif // DEBUG
        runner->real_run();

-       runner->signal_finished().emit();
+       runner->finished();

        delete runner;
 }
 
        delete runner;
 }
 

-void PlaQui::Server::Runnable::run(bool detach) {
+void Runnable::run(bool detach) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        // Si vamos a correr la tarea en un thread.
        if (detach) {
 #endif // DEBUG
        // Si vamos a correr la tarea en un thread.
        if (detach) {

-               // Nos aseguramos de tener threads.
-               if (!Glib::thread_supported()) {
-                       Glib::thread_init();
-               }

                // Corremos el thread en una funcion estática para poder destruirlo al
                // finalizar, pasandole el puntero al objeto.
                thread = Glib::Thread::create(
                // Corremos el thread en una funcion estática para poder destruirlo al
                // finalizar, pasandole el puntero al objeto.
                thread = Glib::Thread::create(

-                               SigC::bind<Runnable*>(
-                                       SigC::slot(&PlaQui::Server::Runnable::static_run),
-                                       this),
+                               SigC::bind<Runnable*>(SigC::slot(&Runnable::static_run), this),

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


@@ -68,19 +79,21 @@ void PlaQui::Server::Runnable::run(bool detach) {
                
 }
 
                
 }
 

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

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

-       // TODO - necesita un mutex?

        stop = true;
        if (attach) {
                thread->join();
        }
 }
 
        stop = true;
        if (attach) {
                thread->join();
        }
 }
 

-PlaQui::Server::Runnable::SignalFinished&
-PlaQui::Server::Runnable::signal_finished(void) {
+Runnable::SignalFinished& Runnable::signal_finished(void) {

        return finished;
 }
 
        return finished;
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+