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

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

diff --git a/Server/src/tcpserver.cpp b/Server/src/tcpserver.cpp
index c00a8b6457455bc8396120ade7bbf55eafbffd0b..d2bb7fd58eed54a78be5b1a5ded52a25fbbf08d8 100644 (file)
--- a/Server/src/tcpserver.cpp
+++ b/Server/src/tcpserver.cpp
@@ -31,6 +31,8 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

+const unsigned PlaQui::Server::TCPServer::MAX_PENDING_CONNECTIONS = 5;
+

 PlaQui::Server::TCPServer::~TCPServer(void) {
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": destructor." << std::endl;
 PlaQui::Server::TCPServer::~TCPServer(void) {
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": destructor." << std::endl;


@@ -47,7 +49,7 @@ PlaQui::Server::TCPServer::TCPServer(int port):
        std::cerr << __FILE__ <<  ": escuchando en " << socket.localhost()
                << ":" << socket.localport() << "." << std::endl;
 #endif // DEBUG
        std::cerr << __FILE__ <<  ": escuchando en " << socket.localhost()
                << ":" << socket.localport() << "." << std::endl;
 #endif // DEBUG

-       socket.listen();
+       socket.listen(MAX_PENDING_CONNECTIONS);

 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": [despues de listen()] escuchando en "
                << socket.localhost() << ":" << socket.localport() << "." << std::endl;
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": [despues de listen()] escuchando en "
                << socket.localhost() << ":" << socket.localport() << "." << std::endl;


@@ -55,36 +57,57 @@ PlaQui::Server::TCPServer::TCPServer(int port):
 }
 
 void PlaQui::Server::TCPServer::on_connection_finished(
 }
 
 void PlaQui::Server::TCPServer::on_connection_finished(

-               PlaQui::Server::Connection* connection) {
+               Connection* connection) {

 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": on_connection_finished(connection = "
                << connection << ")" << std::endl;
 #endif // DEBUG
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": on_connection_finished(connection = "
                << connection << ")" << std::endl;
 #endif // DEBUG

-       // TODO: poner lock.
+       connections_mutex.lock();
+       // FIXME pruebo el mutex.
+       sleep(5);

        connections.remove(connection);
        connections.remove(connection);

-       // TODO: sacar lock.
+#ifdef DEBUG
+       std::cerr << __FILE__ <<  ": lista de conexiones" << std::endl;
+       for (ConnectionList::const_iterator i = connections.begin();
+                       i != connections.end(); i++) {
+               std::cerr << "\t " << *i << std::endl;
+       }
+#endif // DEBUG
+       connections_mutex.unlock();

 }
 
 }
 

+/// \todo TODO: ver tema de timeout o como salir de un accept().

 void PlaQui::Server::TCPServer::real_run(void) {
 #ifdef DEBUG
 void PlaQui::Server::TCPServer::real_run(void) {
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": real_run" << std::endl;
+       std::cerr << __FILE__ <<  ": real_run()" << std::endl;

 #endif // DEBUG
 #endif // DEBUG

-       PlaQui::Server::Connection* conn;
+       Connection* connection;

        while (!stop) {
        while (!stop) {

-               // TODO: ver tema de timeout o como salir de un accept().

                // Forma grasa de salir del accept: crear conexion que salga al toque.
                // Forma grasa de salir del accept: crear conexion que salga al toque.

-               conn = new_connection(socket.accept());
-               // TODO: poner lock.
-               connections.push_back(conn);
-               // TODO: sacar lock.
-               // TODO: esto va en Server::new_connection()
+               connection = new_connection(socket.accept());
+#ifdef DEBUG
+               std::cerr << __FILE__ <<  ": real_run(): connection = " << connection
+                       << std::endl;
+#endif // DEBUG
+               connections_mutex.lock();
+               // FIXME pruebo el mutex.
+               sleep(5);
+               connections.push_back(connection);
+#ifdef DEBUG
+               std::cerr << __FILE__ <<  ": real_run(): lista de conexiones" << std::endl;
+               for (ConnectionList::const_iterator i = connections.begin();
+                               i != connections.end(); i++) {
+                       std::cerr << "\t " << *i << std::endl;
+               }
+#endif // DEBUG
+               connections_mutex.unlock();

                // Conecto la señal para cuando termina una conexión, borrarla.
                // Conecto la señal para cuando termina una conexión, borrarla.

-               conn->signal_finished().connect(
-                               SigC::bind<PlaQui::Server::Connection*>(
+               connection->signal_finished().connect(
+                               SigC::bind<Connection*>(

                                        SigC::slot_class(*this,
                                        SigC::slot_class(*this,

-                                               &PlaQui::Server::TCPServer::on_connection_finished),
-                                       conn));
-               conn->run();
+                                               &TCPServer::on_connection_finished),
+                                       connection));
+               connection->run();

        }
 }
 
        }
 }