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

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

diff --git a/Server/src/receiver.cpp b/Server/src/receiver.cpp
index 0f9f32cde3ebf476ce3e9e762cba738d9915d7b4..9667e8c4b326b9d1ef178cadd304c3ab7fe543f1 100644 (file)
--- a/Server/src/receiver.cpp
+++ b/Server/src/receiver.cpp
@@ -25,17 +25,31 @@
 // $Id$
 //
 
 // $Id$
 //
 

-#include "receiver.h"
+#include "plaqui/server/receiver.h"
+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG

 
 

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

 
 

-Receiver::Receiver(int port, std::string host):
-               Connection(sockbuf::sock_dgram) {
+PlaQui::Server::Receiver::Receiver(int port, std::string host):
+               ServerConnection(sockbuf::sock_dgram) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": port = " << port
+               << " | host = " << host << std::endl;
+#endif // DEBUG

        // FIXME - deberia ir en run().
        socket->bind(port);
 }
 
        // FIXME - deberia ir en run().
        socket->bind(port);
 }
 

-void Receiver::run(void) {
+void PlaQui::Server::Receiver::real_run(void) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": real_run." << std::endl;
+#endif // 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() <<