finish

Makefile

@@ -0,0 +1,2 @@
+clean:
+	${MAKE} -C src clean

README.md

@@ -1,2 +1,14 @@
 # ChatServer
 A project for JAD22fall
+
+### Requirements
+
+实现一个多客户端的纯文本聊天服务器，能同时接受多个客户端的连接，并将任意一个客户端发送的文本向所有客户端（包括发送方）转发。
+
+### How to Run
+
+VSCode
+
+在终端运行 jar 文件: java -jar ./ChatServer.jar
+
+### Progress

src/Makefile

@@ -0,0 +1,2 @@
+clean:
+	del *.class

src/Server.java

@@ -20,6 +20,7 @@ interface ClientListener {
 public class Server implements ClientListener, Runnable {
   public static final int PORT = 3936;
   public static final int SUBSELNUM = 3;
+  private static Server theServer = new Server();
   LinkedList<Client> lstClient = new LinkedList<Client>();
   private Queue<String> msgQueue = new ArrayDeque<String>();
   private ExecutorService executer = Executors.newCachedThreadPool();
@@ -44,28 +45,24 @@ private Server() { // MainReactor
       e.printStackTrace();
     }
   }
-  private static Server theServer = new Server();
 
   protected static Server getServer() {
     return theServer;
   }
   synchronized void sendMsg(String msg) {
-    // for (Client c : lstClient) {
-    //   c.sendMsg(msg);
-    // }
     msgQueue.add(msg);
     this.notify();
   }
 
   @Override
   public void msgRcvd(String msg) {
-      sendMsg(msg);
+    sendMsg(msg);
   }
 
   @Override
-  public void clientQuit(Client c) {
-      lstClient.remove(c);
-      // c.stopRx();
+  synchronized public void clientQuit(Client c) {
+    lstClient.remove(c);
+    // c.stopRx();
   }
 
   void go() throws IOException {
@@ -129,7 +126,9 @@ public void run() {
               Client c = new Client(subSelectors[next], sc);
               if (++next == subSelectors.length) next = 0;
               c.addMsgListener(theServer);
-              lstClient.add(c);
+              synchronized (theServer) {
+                lstClient.add(c);
+              }
               // executer.submit(c);
             }
         } catch(IOException ex) {}