X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/00cffd5f7c35a915c09d55e6292775e9e01bdeec..cd6078479123cd2cfe62df2d838633c143649edf:/Server/src/tcpserver.cpp

diff --git a/Server/src/tcpserver.cpp b/Server/src/tcpserver.cpp
index 82f1577..861b6ee 100644
--- a/Server/src/tcpserver.cpp
+++ b/Server/src/tcpserver.cpp
@@ -26,11 +26,15 @@
 //
 
 #include "plaqui/server/tcpserver.h"
-#include <sigc++/class_slot.h> // FIXME
+#include <sigc++/class_slot.h>
+// FIXME - para probar mutex
+#include <glibmm/timer.h>
 #ifdef DEBUG
 #	include <iostream>
 #endif // DEBUG
 
+const unsigned PlaQui::Server::TCPServer::MAX_PENDING_CONNECTIONS = 10;
+
 PlaQui::Server::TCPServer::~TCPServer(void) {
 #ifdef DEBUG
 	std::cerr << __FILE__ <<  ": destructor." << std::endl;
@@ -47,7 +51,7 @@ PlaQui::Server::TCPServer::TCPServer(int port):
 	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;
@@ -55,36 +59,53 @@ PlaQui::Server::TCPServer::TCPServer(int port):
 }
 
 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
-	// TODO: poner lock.
+	Glib::Mutex::Lock lock(connections_mutex);
 	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
 }
 
+/// \todo TODO: ver tema de timeout o como salir de un accept().
 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
-	PlaQui::Server::Connection* conn;
+	Connection* connection;
 	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.
-		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
+		Glib::Mutex::Lock lock(connections_mutex);
+		// XXX connections_mutex.lock();
+		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
+		// XXX connections_mutex.unlock(); // Si pongo el mutex antes del run(), muere.
 		// 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,
-						&PlaQui::Server::TCPServer::on_connection_finished),
-					conn));
-		conn->run();
+						&TCPServer::on_connection_finished),
+					connection));
+		connection->run();
 	}
 }