X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2FThreadContext.java;h=8e544d3cd64b8f3c9bc490adb9fbff4697b3b249;hb=3299417335913b0886ca80ac0de62d76fc741dbe;hp=2d9931e9d35c521d15baaff6da44ef801052d0c2;hpb=4b8346e1aad3c58196f8d4dadf9da6726f66f5f4;p=jsvc.git

diff --git a/src/dolda/jsvc/ThreadContext.java b/src/dolda/jsvc/ThreadContext.java
index 2d9931e..8e544d3 100644
--- a/src/dolda/jsvc/ThreadContext.java
+++ b/src/dolda/jsvc/ThreadContext.java
@@ -1,7 +1,9 @@
 package dolda.jsvc;
 
+import dolda.jsvc.util.Misc;
 import java.util.logging.*;
 import java.lang.reflect.*;
+import java.util.*;
 
 public class ThreadContext extends ThreadGroup {
     private Logger logger = Logger.getLogger("dolda.jsvc.context");
@@ -9,6 +11,8 @@ public class ThreadContext extends ThreadGroup {
     private long reqs = 0;
     private final ServerContext ctx;
     public final Responder root;
+    private int timelimit = 0;
+    private boolean forcelimit = false;
     
     public ThreadContext(ThreadGroup parent, String name, ServerContext ctx, Class<?> bootclass) {
 	super((parent == null)?(Thread.currentThread().getThreadGroup()):parent, name);
@@ -18,7 +22,91 @@ public class ThreadContext extends ThreadGroup {
 		    logger.log(Level.SEVERE, "Worker thread terminated with an uncaught exception", e);
 		}
 	    };
+	
+	int tl;
+	tl = Integer.parseInt(ctx.sysconfig("jsvc.timelimit", "0"));
+	if((tl > 0) && ((timelimit == 0) || (tl < timelimit)))
+	    timelimit = tl;
+	tl = Integer.parseInt(ctx.libconfig("jsvc.timelimit", "0"));
+	if((tl > 0) && ((timelimit == 0) || (tl < timelimit)))
+	    timelimit = tl;
+	forcelimit |= Misc.boolval(ctx.sysconfig("jsvc.forcelimit", "0"));
+	forcelimit |= Misc.boolval(ctx.libconfig("jsvc.forcelimit", "0"));
+	
 	root = bootstrap(bootclass);
+	
+	if(timelimit > 0)
+	    (new WatchDog()).start();
+    }
+    
+    private class WatchDog extends Thread {
+	private Map<RequestThread, State> state = new WeakHashMap<RequestThread, State>();
+	
+	private class State {
+	    String st = "running";
+	    long lastkill;
+	}
+	
+	private WatchDog() {
+	    super(ThreadContext.this, "Worker watchdog");
+	    setDaemon(true);
+	}
+	
+	@SuppressWarnings("deprecation")
+	private long ckthread(long now, RequestThread rt) {
+	    State st = state.get(rt);
+	    if(st == null) {
+		st = new State();
+		state.put(rt, st);
+	    }
+	    if(st.st == "running") {
+		if(now - rt.stime() > timelimit) {
+		    rt.interrupt();
+		    st.st = "interrupted";
+		    st.lastkill = now;
+		    return(5000);
+		} else {
+		    return(timelimit - (now - rt.stime()));
+		}
+	    } else if((st.st == "interrupted") || (st.st == "killed")) {
+		if(st.st == "killed")
+		    logger.log(Level.WARNING, "Thread " + rt + " refused to die; killing again");
+		if(now - st.lastkill > 5000) {
+		    if(forcelimit)
+			rt.stop();
+		    else
+			rt.interrupt();
+		    st.st = "killed";
+		    st.lastkill = now;
+		} else {
+		    return(5000 - (now - st.lastkill));
+		}
+	    }
+	    return(timelimit);
+	}
+
+	public void run() {
+	    try {
+		while(true) {
+		    long next = timelimit;
+		    long now = System.currentTimeMillis();
+		    Thread[] w = new Thread[workers.activeCount() + 5];
+		    int num = workers.enumerate(w);
+		    for(int i = 0; i < num; i++) {
+			if(w[i] instanceof RequestThread){
+			    RequestThread rt = (RequestThread)w[i];
+			    if(rt.stime() > 0) {
+				long n = ckthread(now, rt);
+				if(n < next)
+				    next = n;
+			    }
+			}
+		    }
+		    Thread.sleep(next);
+		}
+	    } catch(InterruptedException e) {
+	    }
+	}
     }
     
     public void uncaughtException(Thread t, Throwable e) {
@@ -52,7 +140,11 @@ public class ThreadContext extends ThreadGroup {
     }
     
     public RequestThread respond(Request req) {
-	return(new RequestThread(root, req, workers, "Worker thread " + reqs++));
+	return(ctx.worker(root, req, workers, "Worker thread " + reqs++));
+    }
+    
+    public long requests() {
+	return(reqs);
     }
     
     private Responder bootstrap(final Class<?> bootclass) {
@@ -86,9 +178,12 @@ public class ThreadContext extends ThreadGroup {
 	    boot.interrupt();
 	    Thread.currentThread().interrupt();
 	}
-	if(err[0] != null)
+	if(err[0] != null) {
+	    destroy();
 	    throw(new RuntimeException(err[0]));
+	}
 	if(res[0] == null) {
+	    destroy();
 	    logger.log(Level.SEVERE, "No responder returned in spite of no error having happened.");
 	    throw(new NullPointerException("No responder returned in spite of no error having happened."));
 	}
@@ -102,4 +197,31 @@ public class ThreadContext extends ThreadGroup {
 	}
 	return(null);
     }
+    
+    public static class CreateException extends Exception {
+	public CreateException(String message) {
+	    super(message);
+	}
+
+	public CreateException(String message, Throwable cause) {
+	    super(message, cause);
+	}
+    }
+
+    public static ThreadContext create(ServerContext ctx, ClassLoader cl) throws CreateException {
+	String nm = "JSvc Service";
+	if(ctx.name() != null)
+	    nm = "JSvc Service for " + ctx.name();
+	
+	String clnm = ctx.libconfig("jsvc.bootstrap", null);
+	if(clnm == null)
+	    throw(new CreateException("No JSvc bootstrapper specified"));
+	Class<?> bc;
+	try {
+	    bc = cl.loadClass(clnm);
+	} catch(ClassNotFoundException e) {
+	    throw(new CreateException("Invalid JSvc bootstrapper specified", e));
+	}
+	return(new ThreadContext(null, nm, ctx, bc));
+    }
 }