Se mueve el mutex a la clase que tiene el recurso a proteger.

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

diff --git a/Server/src/transmitter.cpp b/Server/src/transmitter.cpp
index 37113cc1b8f2147bfe4d0755b4fd8362e05d7701..75f622d018e1d6bc831c470fb18647f46b6141d7 100644 (file)
--- a/Server/src/transmitter.cpp
+++ b/Server/src/transmitter.cpp
@@ -28,16 +28,30 @@
 #include "plaqui/server/transmitter.h"
 #include <socket++/sockinet.h>
 #include <string>
 #include "plaqui/server/transmitter.h"
 #include <socket++/sockinet.h>
 #include <string>

+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG

 
 

-using namespace PlaQui::Server;
+PlaQui::Server::Transmitter::~Transmitter(void) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": destructor." << std::endl;
+#endif // DEBUG
+}

 
 

-Transmitter::Transmitter(std::string host, int port):
+/// \todo debría conectarse en real_run() (?)
+PlaQui::Server::Transmitter::Transmitter(std::string host, int port):

                Connection(sockbuf::sock_dgram) {
                Connection(sockbuf::sock_dgram) {

+#ifdef DEBUG
+       std::cerr << __FILE__ << ": host = " << host
+               << " | port = " << port << std::endl;
+#endif // DEBUG

        // FIXME - deberia ir en run().
        socket->connect(host.c_str(), port);
 }
 
        // FIXME - deberia ir en run().
        socket->connect(host.c_str(), port);
 }
 

-void Transmitter::real_run(void) {
+/// \todo debría dar una excepción (?)
+void PlaQui::Server::Transmitter::real_run(void) {
+#ifdef DEBUG

        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
                std::cerr << "No se pudo conectar a " << socket->peerhost() <<
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
                std::cerr << "No se pudo conectar a " << socket->peerhost() <<


@@ -46,5 +60,6 @@ void Transmitter::real_run(void) {
                std::cerr << "Conectado a " << socket->peerhost() <<
                        ":" << socket->peerport() << "." << std::endl;
        }
                std::cerr << "Conectado a " << socket->peerhost() <<
                        ":" << socket->peerport() << "." << std::endl;
        }

+#endif // DEBUG

 }
 
 }