# HG changeset patch
# User robcast
# Date 1100810246 -3600
# Node ID 84bfba8a1c9edfb47110384f070dfbef48cb2d39
# Parent  d10e4ce2a15333d5fa193218bda25d1e3c6140d1
servlet version 1.5.5b
- output of the number of running and waiting threads in dlConfig.jsp

diff -r d10e4ce2a153 -r 84bfba8a1c9e client/digitallibrary/WEB-INF/lib/DigilibServlet.jar
Binary file client/digitallibrary/WEB-INF/lib/DigilibServlet.jar has changed
diff -r d10e4ce2a153 -r 84bfba8a1c9e client/digitallibrary/server/dlConfig.jsp
--- a/client/digitallibrary/server/dlConfig.jsp	Wed Nov 17 19:30:34 2004 +0100
+++ b/client/digitallibrary/server/dlConfig.jsp	Thu Nov 18 21:37:26 2004 +0100
@@ -65,6 +65,19 @@
 %>
 </table>
 
+<h2>Threads</h2>
+
+<table>
+  <tr>
+    <td>currently waiting</td><td><b><%= digilib.servlet.DigilibWorker.getNumWaiting() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>currently running</td><td><b><%= digilib.servlet.DigilibWorker.getNumRunning() %></b></td>
+    <td></td>
+  </tr>
+</table>
+
 <h2>Directory cache</h2>
 
 <table>
diff -r d10e4ce2a153 -r 84bfba8a1c9e servlet/src/digilib/servlet/DigilibWorker.java
--- a/servlet/src/digilib/servlet/DigilibWorker.java	Wed Nov 17 19:30:34 2004 +0100
+++ b/servlet/src/digilib/servlet/DigilibWorker.java	Thu Nov 18 21:37:26 2004 +0100
@@ -37,6 +37,8 @@
 
 	private static int runningThreads = 0;
 
+	private static int waitingThreads = 0;
+
 	public static Semaphore lock = new FIFOSemaphore(1);
 
 	protected boolean busy = false;
@@ -58,11 +60,14 @@
 	 * Do the work.
 	 */
 	public void run() {
+		logger.debug((++waitingThreads) + " waiting threads");
 		try {
 			lock.acquire();
+			waitingThreads--;
 		} catch (InterruptedException e) {
 			error = e;
 			busy = false;
+			waitingThreads--;
 			return;
 		}
 		logger.debug((++runningThreads) + " running threads");
@@ -123,4 +128,18 @@
 	public static void setLock(Semaphore lock) {
 		DigilibWorker.lock = lock;
 	}
+	
+	/** The number of currently running threads (approximate).
+	 * @return
+	 */
+	public static int getNumRunning() {
+		return runningThreads;
+	}
+
+	/** The number of currently waiting threads (approximate).
+	 * @return
+	 */
+	public static int getNumWaiting() {
+		return waitingThreads;
+	}
 }
diff -r d10e4ce2a153 -r 84bfba8a1c9e servlet/src/digilib/servlet/Scaler.java
--- a/servlet/src/digilib/servlet/Scaler.java	Wed Nov 17 19:30:34 2004 +0100
+++ b/servlet/src/digilib/servlet/Scaler.java	Thu Nov 18 21:37:26 2004 +0100
@@ -59,7 +59,7 @@
 	private static final long serialVersionUID = -325080527268912852L;
 
 	/** digilib servlet version (for all components) */
-	public static final String dlVersion = "1.5.4b";
+	public static final String dlVersion = "1.5.5b";
 
 	/** logger for accounting requests */
 	private static Logger accountlog = Logger.getLogger("account.request");