Add simple.pipe.max.items.per.query init-param in pipe's web.xml, so we can control the data stream to avoid data flood to browser and make the browser freezing.

zhourenjian · zhourenjian · commit 451a1f0b45cb · 2009-05-12T15:07:34.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRunnable.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRunnable.java
@@ -90,6 +90,7 @@ public boolean isPipeLive() {
 
 	@Override
 	public void pipeClosed() {
+		super.pipeClosed();
 		for (int i = 0; i < pipes.length; i++) {
 			if (pipes[i] != null) {
 				if (pipes[i].closer != null) {
@@ -104,6 +105,7 @@ public void pipeClosed() {
 
 	@Override
 	public void pipeLost() {
+		super.pipeLost();
 		for (int i = 0; i < pipes.length; i++) {
 			if (pipes[i] != null) {
 				pipes[i].pipeLost();
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java
@@ -34,6 +34,8 @@ public class SimplePipeHttpServlet extends HttpServlet {
 	
 	protected long pipeScriptBreakout = 1200000; // 20 minutes
 
+	protected int pipeMaxItemsPerQuery = -1; // infinite
+
 	/*
 	 * Example of web.xml:
     <servlet>
@@ -47,6 +49,10 @@ public class SimplePipeHttpServlet extends HttpServlet {
 			<param-name>simple.pipe.script.breakout</param-name>
 			<param-value>1200000</param-value>
 		</init-param>
+		<init-param>
+			<param-name>simple.pipe.max.items.per.query</param-name>
+			<param-value>60</param-value>
+		</init-param>
     </servlet>
     <servlet-mapping>
         <servlet-name>simplepipe</servlet-name>
@@ -83,6 +89,19 @@ public void init() throws ServletException {
 				e.printStackTrace();
 			}
 		}
+		String perQueryStr = getInitParameter("simple.pipe.max.items.per.query");
+		if (perQueryStr != null) {
+			try {
+				pipeMaxItemsPerQuery = Integer.parseInt(perQueryStr);
+				if (pipeMaxItemsPerQuery <= 0 ) {
+					pipeMaxItemsPerQuery = -1; // 0, -1 means infinite items
+				} else if (pipeMaxItemsPerQuery < 5) {
+					pipeMaxItemsPerQuery = 5; // hey, we think limiting for less than 5 items make no senses.
+				}
+			} catch (NumberFormatException e) {
+				e.printStackTrace();
+			}
+		}
 		super.init();
 	}
 
@@ -193,6 +212,7 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 	        if (pipe != null) {
 	        	waitClosingInterval = pipe.pipeWaitClosingInterval();
 	        }
+	        int items = 0;
 			while ((vector = SimplePipeHelper.getPipeVector(key)) != null
 					/* && SimplePipeHelper.isPipeLive(key) */ // check it!
 					&& !writer.checkError()) {
@@ -224,6 +244,11 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 						}
 						if (ss == null) break; // terminating signal
 						output(writer, type, key, ss.serialize());
+						items++;
+						if (pipeMaxItemsPerQuery > 0 && items >= pipeMaxItemsPerQuery
+								&& !SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type)) {
+							break;
+						}
 						lastPipeDataWritten = new Date().getTime();
 						writer.flush();
 						if (ss instanceof ISimplePipePriority) {
@@ -256,6 +281,8 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 				
 				now = new Date().getTime();
 				if ((vector = SimplePipeHelper.getPipeVector(key)) != null // may be broken down already!!
+						&& (pipeMaxItemsPerQuery <= 0 || items < pipeMaxItemsPerQuery
+								|| SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type))
 						&& (SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type)
 						|| (SimplePipeRequest.PIPE_TYPE_SCRIPT.equals(type)
 								&& now - beforeLoop < pipeScriptBreakout)
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java
@@ -142,6 +142,10 @@ public boolean ignoreDefaultFields() {
 			<param-name>simple.rpc.xss.max.parts</param-name>
 			<param-value>10</param-value>
 		</init-param>
+		<init-param>
+			<param-name>simple.rpc.xss.max.latency</param-name>
+			<param-value>6000</param-value>
+		</init-param>
 		<init-param>
 			<param-name>simple.pipe.managable</param-name>
 			<param-value>true</param-value>
