Merge pull request #1 from m0ver/master

m0ver · web-flow · commit 1ed4e2667ca7 · 2017-05-16T15:25:26.000+08:00
Bring fork up to date
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 <img src="https://raw.githubusercontent.com/tinystruct/tinystruct2.0/master/favicon.png" title="tinystruct2.0" /> 
+
 tinystruct2.0
 =========
 [![Build Status](https://travis-ci.org/m0ver/tinystruct2.0.svg?branch=master)](https://travis-ci.org/m0ver/tinystruct2.0)
diff --git a/WEB-INF/lib/struct-2.0.jar b/WEB-INF/lib/struct-2.0.jar
diff --git a/src/tinystruct/examples/reading.java b/src/tinystruct/examples/reading.java
@@ -38,7 +38,7 @@
 import org.tinystruct.dom.Element;
 import org.tinystruct.system.Authentication;
 import org.tinystruct.system.util.Base64;
-import org.tinystruct.system.util.URLFileLoader;
+import org.tinystruct.system.util.URLResourceLoader;
 
 import custom.objects.User;
 import custom.objects.article;
@@ -583,7 +583,7 @@ public static void main(String[]args) throws ApplicationException, IOException{
 
 		while(p <= 47) {
 			URL url = new URL("http://www.old-gospel.net/viewthread.php?tid=446&extra=page%3D1&page="+(p++));
-			URLFileLoader file = new URLFileLoader(url);
+			URLResourceLoader file = new URLResourceLoader(url);
 			file.setCharset("gbk");
 			String content = file.getContent().toString();
 			Matcher m = pattern.matcher(content);
diff --git a/src/tinystruct/examples/smalltalk.java b/src/tinystruct/examples/smalltalk.java
@@ -14,6 +14,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.servlet.ServletException;
@@ -61,31 +62,23 @@ public talk index() {
     }
 
     List<String> session_ids;
-    synchronized (this.meetings) {
-      final String sessionId = request.getSession().getId();
-      if (this.meetings.get(meetingCode) == null) {
-        this.meetings.put(meetingCode.toString(), new ConcurrentLinkedQueue<Builder>());
-      }
-
-      // If the current user is not in the list of the sessions, we create a default session list for the meeting generated.
-      if((session_ids = this.sessions.get(meetingCode)) == null)
-      {
-        this.sessions.put(meetingCode.toString(), session_ids = new ArrayList<String>());
-      }
-
-      if(!session_ids.contains(sessionId))
-      session_ids.add(sessionId);
+    final String sessionId = request.getSession().getId();
+    if (this.meetings.get(meetingCode) == null) {
+      this.meetings.put(meetingCode.toString(), new ArrayBlockingQueue<Builder>(DEFAULT_MESSAGE_POOL_SIZE));
+    }
 
-      this.meetings.notifyAll();
+    // If the current user is not in the list of the sessions, we create a default session list for the meeting generated.
+    if((session_ids = this.sessions.get(meetingCode)) == null)
+    {
+      this.sessions.put(meetingCode.toString(), session_ids = new ArrayList<String>());
     }
+
+    if(!session_ids.contains(sessionId))
+    session_ids.add(sessionId);
     
-    synchronized (this.list) {
-      final String sessionId = request.getSession().getId();
-      if(!this.list.containsKey(sessionId))
-      {
-        this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
-      }
-      this.list.notifyAll();
+    if(!this.list.containsKey(sessionId))
+    {
+      this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
     }
 
     this.setVariable("meeting_code", meetingCode.toString());
@@ -308,13 +301,10 @@ public void sessionCreated(HttpSessionEvent arg0) {
       System.out.println("New meeting generated by HttpSessionListener:" + meetingCode);
     }
 
-    synchronized (this.list) {
-      final String sessionId = arg0.getSession().getId();
-      if(!this.list.containsKey(sessionId))
-      {
-        this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
-      }
-      this.list.notifyAll();
+    final String sessionId = arg0.getSession().getId();
+    if(!this.list.containsKey(sessionId))
+    {
+      this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
     }
   }
 
@@ -331,25 +321,18 @@ public void sessionDestroyed(HttpSessionEvent arg0) {
 
       Queue<Builder> messages;
       List<String> session_ids;
-      synchronized (this.meetings) {
-        if((session_ids = this.sessions.get(meetingCode)) != null) {
-          session_ids.remove(arg0.getSession().getId());
-        }
-
-        if ((messages = this.meetings.get(meetingCode)) != null) {
-          messages.remove(meetingCode);
-        }
+      if((session_ids = this.sessions.get(meetingCode)) != null) {
+        session_ids.remove(arg0.getSession().getId());
+      }
 
-        this.meetings.notifyAll();
+      if ((messages = this.meetings.get(meetingCode)) != null) {
+        messages.remove(meetingCode);
       }
 
-      synchronized (this.list) {
-        final String sessionId = arg0.getSession().getId();
-        if(this.list.containsKey(sessionId))
-        {
-          this.list.remove(sessionId);
-        }
-        this.list.notifyAll();
+      final String sessionId = arg0.getSession().getId();
+      if(this.list.containsKey(sessionId))
+      {
+        this.list.remove(sessionId);
       }
     }
   }
diff --git a/src/tinystruct/examples/talk.java b/src/tinystruct/examples/talk.java
@@ -10,6 +10,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
@@ -23,11 +25,13 @@
 
 public class talk extends AbstractApplication {
 
-  private static final long TIMEOUT = 200;
+  private static final long TIMEOUT = 1;
+  private static final int DEFAULT_POOL_SIZE = 3;
+  protected static final int DEFAULT_MESSAGE_POOL_SIZE = 10;
+  protected final Map<String, BlockingQueue<Builder>> meetings = new ConcurrentHashMap<String, BlockingQueue<Builder>>();
   protected final Map<String, Queue<Builder>> list = new ConcurrentHashMap<String, Queue<Builder>>();
-  protected final Map<String, Queue<Builder>> meetings = new ConcurrentHashMap<String, Queue<Builder>>();
   protected final Map<String, List<String>> sessions = new ConcurrentHashMap<String, List<String>>();
-  private final ExecutorService service = Executors.newFixedThreadPool(3);
+  private ExecutorService service;
 
   @Override
   public void init() {
@@ -36,23 +40,25 @@ public void init() {
     this.setAction("talk/version", "version");
     this.setAction("talk/testing", "testing");
     
-    Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-        @Override
-        public void run() {
-            service.shutdown();
-            while (true) {
-                try {
-                    System.out.println("Waiting for the service to terminate...");
-                    if (service.awaitTermination(5, TimeUnit.SECONDS)) {
-                      System.out.println("Service will be terminated soon.");
+    if (this.service != null) {
+      Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+          @Override
+          public void run() {
+              service.shutdown();
+              while (true) {
+                  try {
+                      System.out.println("Waiting for the service to terminate...");
+                      if (service.awaitTermination(5, TimeUnit.SECONDS)) {
+                        System.out.println("Service will be terminated soon.");
                         break;
-                    }
-                } catch (InterruptedException e) {
-                  e.printStackTrace();
-                }
-            }
-        }
-    }));
+                      }
+                  } catch (InterruptedException e) {
+                    e.printStackTrace();
+                  }
+              }
+          }
+      }));
+    }
   }
 
   /**
@@ -86,37 +92,38 @@ public String save(Object meetingCode, String sessionId, String message) {
    * @return builder
    */
   public final String save(final Object meetingCode, final Builder builder) {
-    final Queue<Builder> messages;
-    synchronized (this.meetings) {
-      if (this.meetings.get(meetingCode) == null) {
-        this.meetings.put(meetingCode.toString(), new ConcurrentLinkedQueue<Builder>());
-      }
+    BlockingQueue<Builder> messages;
+    if ((messages = this.meetings.get(meetingCode)) == null) {
+      this.meetings.put(meetingCode.toString(), messages = new ArrayBlockingQueue<Builder>(DEFAULT_MESSAGE_POOL_SIZE));
+    }
 
-      messages = this.meetings.get(meetingCode);
-      messages.add(builder);
-      this.meetings.notifyAll();
+    try {
+      messages.put(builder);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
     }
 
-    service.execute(new Runnable(){
+    this.getService().execute(new Runnable(){
       @Override
       public void run() {
-        synchronized(talk.this.meetings) {
           Builder message;
           do {
             try {
-              talk.this.meetings.wait(TIMEOUT);
+              Thread.sleep(TIMEOUT);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+              e.printStackTrace();
             }
           } while(talk.this.meetings.get(meetingCode) == null || (message = talk.this.meetings.get(meetingCode).poll()) == null);
-          
           talk.this.copy(meetingCode, message);
-        }
       }
     });
     return builder.toString();
   }
 
+  private ExecutorService getService() {
+    return this.service!=null? this.service : Executors.newFixedThreadPool(DEFAULT_POOL_SIZE);
+  }
+
   /**
    * Poll message from the messages of the session specified sessionId.
    * @param sessionId
@@ -126,19 +133,16 @@ public void run() {
    */
   public final String update(final String sessionId) throws ApplicationException, IOException {
     Builder message;
-    Queue<Builder> messages;
-    synchronized (this.list) {
-      messages = this.list.get(sessionId);
-      while((message = messages.poll()) == null) {
-        try {
-          this.list.wait(TIMEOUT);
-        } catch (InterruptedException e) {
-          throw new ApplicationException(e.getMessage(), e);
-        }
+    Queue<Builder> messages = this.list.get(sessionId);
+    while((message = messages.poll()) == null) {
+      try {
+        Thread.sleep(TIMEOUT);
+      } catch (InterruptedException e) {
+        throw new ApplicationException(e.getMessage(), e);
       }
-
-      return message.toString();
     }
+
+    return message.toString();
   }
 
   /**
@@ -156,22 +160,17 @@ protected String filter(String text) {
    * @param builder
    */
   private final void copy(Object meetingCode, Builder builder) {
-    synchronized(this.list) {
-      final Collection<Entry<String, Queue<Builder>>> set = list.entrySet();
+      final Collection<Entry<String, Queue<Builder>>> set = this.list.entrySet();
       final Iterator<Entry<String, Queue<Builder>>> iterator = set.iterator();
-      final List<String> meeting_session;
-      if((meeting_session = this.sessions.get(meetingCode)) != null) {
+      final List<String> _sessions;
+      if((_sessions = this.sessions.get(meetingCode)) != null) {
         while(iterator.hasNext()) {
-          Entry<String, Queue<Builder>> e = iterator.next();
-          if(meeting_session.contains(e.getKey())) {
-            e.getValue().add(builder);
-            this.list.notifyAll();
+          Entry<String, Queue<Builder>> list = iterator.next();
+          if(_sessions.contains(list.getKey())) {
+	            list.getValue().add(builder);
           }
         }
       }
-      else
-      this.list.notifyAll();
-    }
   }
 
   @Override
@@ -188,7 +187,7 @@ public String version() {
    * @throws ApplicationException
    */
   public boolean testing(final int n) throws ApplicationException {
-    this.meetings.put("[M001]", new ConcurrentLinkedQueue<Builder>());
+    this.meetings.put("[M001]", new ArrayBlockingQueue<Builder>(DEFAULT_MESSAGE_POOL_SIZE));
     this.list.put("{A}", new ConcurrentLinkedQueue<Builder>());
     this.list.put("{B}", new ConcurrentLinkedQueue<Builder>());
     
@@ -197,7 +196,7 @@ public boolean testing(final int n) throws ApplicationException {
     sess.add("{B}");
     this.sessions.put("[M001]", sess);
     
-    service.execute(new Runnable(){
+    this.getService().execute(new Runnable(){
       @Override
       public void run() {
         int i=0;
@@ -215,7 +214,7 @@ public void run() {
       }
     });
 
-    service.execute(new Runnable(){
+    this.getService().execute(new Runnable(){
       @Override
       public void run() {
         int i=0;
@@ -233,7 +232,7 @@ public void run() {
       }
     });
 
-    service.execute(new Runnable(){
+    this.getService().execute(new Runnable(){
       @Override
       public void run() {
         // TODO Auto-generated method stub
@@ -252,7 +251,7 @@ public void run() {
       }
     });
 
-    service.execute(new Runnable(){
+    this.getService().execute(new Runnable(){
       @Override
       public void run() {
         // TODO Auto-generated method stub

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<img src="https://raw.githubusercontent.com/tinystruct/tinystruct2.0/master/favicon.png" title="tinystruct2.0" />`
	`2`	`+`
`2`	`3`	`tinystruct2.0`
`3`	`4`	`=========`
`4`	`5`	`[![Build Status](https://travis-ci.org/m0ver/tinystruct2.0.svg?branch=master)](https://travis-ci.org/m0ver/tinystruct2.0)`