git-svn-id: svn://imanolbarba.net/PAD@23 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent bbe83807
Showing 10 changed files with 163 additions and 24 deletions
JChatServer/bin/pad/prac2/JChat.class
JChatServer/bin/pad/prac2/MyServerSocket.class
JChatServer/bin/pad/prac2/MySocket.class
JChatServer/bin/pad/prac2/Server.class
JChatServer/bin/pad/prac2/Worker.class
JChatServer/src/pad/prac2/JChat.java
JChatServer/src/pad/prac2/MyServerSocket.java
JChatServer/src/pad/prac2/MySocket.java
JChatServer/src/pad/prac2/Server.java
JChatServer/src/pad/prac2/Worker.java
@@ -7,13 +7,22 @@ public class JChat
 	public static void main(String[] args)
 	{
 		String ip;
-		int port;
+		int port, roomSize;
 		Scanner in = new Scanner(System.in);
 		System.out.print("IP: ");
 		ip = in.nextLine();
 		System.out.print("Port: ");
 		port = in.nextInt();
+		System.out.print("Size of chatroom: ");
+		roomSize = in.nextInt();
 		in.close();
-		Server serv = new Server(ip,port);
+		Server serv = new Server(ip,port,roomSize);
+		serv.startServer();
 	}
+	/*
+	 * TODO
+	 * 
+	 * capture SIGINT
+	 * 
+	 */
 }
 package pad.prac2;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.SocketAddress;
 public class MyServerSocket extends ServerSocket
 {
-	private PrintWriter output;
-	private BufferedReader input;
-	
-	public MyServerSocket(PrintWriter o, BufferedReader i) throws IOException
+	public MyServerSocket() throws IOException
 	{
 		super();
-		output = o;
-		input = i;
 	}
 	public MySocket accept()
 	{
-		MySocket incoming = accept();
-		return incoming;
+		try
+		{
+			MySocket incoming = (MySocket)super.accept();
+			return incoming;
+		}
+		catch(IOException ioExc)
+		{
+			System.out.println("TCP: Error accepting connection");
+			return null;
+		}
 	}
 	public void bind(String ip, int port)
@@ -70,7 +70,20 @@ public class MySocket extends Socket
 		catch(IOException ioExc)
 		{
 			System.out.println("TCP: Error retrieving data from remote endpoint");
-			return "";
+			return null;
+		}
+	}
+	
+	public String readLine()
+	{
+		try
+		{
+			return input.readLine();
+		}
+		catch(IOException ioExc)
+		{
+			System.out.println("TCP: Error retrieving data from remote endpoint");
+			return null;
 		}
 	}
@@ -4,21 +4,73 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
 public class Server
 {
 	private MyServerSocket ss;
+	private BufferedReader stdin;
+	private PrintWriter stdout;
+	private int roomSize;
+	private boolean run;
-	public Server(String ip, int port)
+	private Worker[] rWorkerPool;
+	private Worker[] wWorkerPool;
+	
+	private ConcurrentHashMap<String,MySocket> activeConnections;
+	
+	public Server(String ip, int port, int rS)
 	{
 		try
 		{
-			ss = new MyServerSocket(new PrintWriter(System.out),new BufferedReader(new InputStreamReader(System.in)));
+			ss = new MyServerSocket();
+			stdout = new PrintWriter(System.out);
+			stdin = new BufferedReader(new InputStreamReader(System.in));
+			roomSize = rS;
+			rWorkerPool = new Worker[roomSize];
+			wWorkerPool = new Worker[roomSize];
 		}
 		catch(IOException ioExc)
 		{
 			System.out.println("TCP: Error initializating server socket");
 		}
 	}
-
+	
+	public void startServer()
+	{
+		
+	}
+	
+	public void startWorker(Worker r, Worker w, MySocket s)
+	{
+		if(r == null)
+		{
+			r = new Worker(s,null,stdout);
+		}
+		r.awake();
+		if(w == null)
+		{
+			w = new Worker(s,stdin,null);
+		}
+		w.awake();
+	}
+	
+	public void finishWorkers()
+	{
+		Collection<Worker> worerke= activeConnections.values();
+		Iterator<MySocket> it = sockets.iterator();
+		while(it.hasNext())
+		{
+			it.next().close();
+		}
+	}
+	
+	public void killServer()
+	{
+		run = false;
+		ss.close();
+		finishWorkers();
+	}
 }
 package pad.prac2;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.PrintWriter;
 public class Worker extends Thread
@@ -8,24 +9,87 @@ public class Worker extends Thread
 	private PrintWriter output;
 	private BufferedReader input;
 	private MySocket sock;
+	private boolean run;
+	private boolean kill;
+	private boolean sleep;
+	private Server serv;
-	public Worker(MySocket s, PrintWriter o, BufferedReader i)
+	public Worker(Server srv, MySocket s, BufferedReader i, PrintWriter o)
 	{
 		sock = s;
 		output = o;
 		input = i;
+		run = false;
+		kill = false;
+		sleep = true;
+		serv = srv;
+	}
+	
+	public void finish()
+	{
+		kill = true;
+		run = false;
+		sleep = false;
+		sock.close();
 	}
 	public void run()
 	{
-		if(output == null)
-		{
-			
-		}
-		else if(input == null)
+		while(!kill)
 		{
-			
+			while(sleep)
+			{
+				try
+				{
+					wait();
+				} 
+				catch (InterruptedException e)
+				{
+					e.printStackTrace();
+				}
+			}
+			while(run)
+			{
+				if(output == null && input != null)
+				{
+					String str, length;
+					while(true)
+					{
+						try
+						{
+							str = input.readLine();
+							length = new Integer(str.length()).toString();
+							sock.write(length, length.length());
+							sock.write(str, str.length());
+						}
+						catch(IOException ioExc)
+						{
+							run = false;
+							sleep = true;
+							break;
+						}
+					}
+				}
+				else if(input == null && output != null)
+				{
+					String len, str;
+					while((len = sock.readLine()) != null)
+					{
+						int length = Integer.parseInt(len);
+						str = sock.read(length);
+						output.println(str);
+					}
+					run = false;
+					sleep = true;
+				}
+			}
 		}
 	}
-
+	
+	public void awake()
+	{
+		run = true;
+		sleep = false;
+		this.notify();
+	}
 }