Setup inner Java2Script hotspot server (Java2Script is going to support Java-like hotspot loading.)

zhourenjian · zhourenjian · commit ac2dc83e5500 · 2007-05-27T15:41:51.000Z
diff --git a/src/net/sf/j2s/core/CorePlugin.java b/src/net/sf/j2s/core/CorePlugin.java
@@ -1,5 +1,7 @@
 package net.sf.j2s.core;
 
+import net.sf.j2s.core.hotspot.InnerHotspotServer;
+
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
 
@@ -31,6 +33,9 @@ public void start(BundleContext context) throws Exception {
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;
+		if (InnerHotspotServer.isServerStarted()) {
+			InnerHotspotServer.getSingletonServer().stopServer();
+		}
 	}
 
 	/**
diff --git a/src/net/sf/j2s/core/hotspot/HotspotWorker.java b/src/net/sf/j2s/core/hotspot/HotspotWorker.java
@@ -131,18 +131,23 @@ void handleClient() throws IOException {
                     break;
                 }
             }
-//            String fname = new String(buf, 0, index, i-index);
-//            if (fname.startsWith(File.separator)) {
-//                fname = fname.substring(1);
-//            }
-//            int idx = fname.indexOf('.');
-//            if (idx != -1) {
-//            	fname = fname.substring(0, idx);
-//            }
-//            idx = fname.indexOf('?');
-//            if (idx != -1) {
-//                fname = fname.substring(idx + 1);
-//            }
+            String fname = new String(buf, 0, index, i-index);
+            if (fname.startsWith("/") || fname.startsWith("\\")) {
+                fname = fname.substring(1);
+            }
+            int idx = fname.indexOf('.');
+            if (idx != -1) {
+            	fname = fname.substring(0, idx);
+            }
+            idx = fname.indexOf('?');
+            if (idx != -1) {
+                fname = fname.substring(idx + 1);
+            }
+            long sessionID = -1;
+            try {
+				sessionID = Long.parseLong(fname);
+			} catch (NumberFormatException e) {
+			}
             ps.print("HTTP/1.0 200 OK");
             ps.write(EOL);
             ps.print("Server: Java2Script Hotspot Sever");
@@ -154,20 +159,20 @@ void handleClient() throws IOException {
             ps.print("Content-type: text/javascript");
             ps.write(EOL);
             if (doingGet) {
-            	sendLatestHotspot(ps);
+            	sendLatestHotspot(sessionID, ps);
             }
         } finally {
             s.close();
         }
     }
 
-    void sendLatestHotspot(PrintStream ps) throws IOException {
+    void sendLatestHotspot(long session, PrintStream ps) throws IOException {
         ps.write(EOL);
         StringBuffer strBuf = new StringBuffer();
         strBuf.append("ClazzLoader.updateHotspot (");
         long time = 0;
         while (time < 5000) {
-	        String hotspotJS = InnerHotspotServer.getHotspotJavaScript();
+	        String hotspotJS = InnerHotspotServer.getHotspotJavaScript(session);
 	        if (hotspotJS.length() != 0) {
 	        	strBuf.append("\r\n");
 	        	strBuf.append(hotspotJS);
diff --git a/src/net/sf/j2s/core/hotspot/InnerHotspotServer.java b/src/net/sf/j2s/core/hotspot/InnerHotspotServer.java
@@ -23,11 +23,28 @@ public class InnerHotspotServer {
     
     private static int port = -1;
 
+    private static InnerHotspotServer server = null;
+    
     private ServerSocket ss;
     
+    private InnerHotspotServer() {
+    	// prevent ...
+    }
+    
+    public static InnerHotspotServer getSingletonServer() {
+    	if (server == null) {
+    		server = new InnerHotspotServer();
+    	}
+    	return server;
+    }
+    
+    public static boolean isServerStarted() {
+    	return serverStarted;
+    }
+    
     public static int getHotspotPort() {
     	if (port == -1) {
-    		return new InnerHotspotServer().startServer();
+    		return getSingletonServer().startServer();
     	}
     	return port;
     }
@@ -53,13 +70,14 @@ public static void addCompiledItem(String name) {
     	}
     }
     
-    public static String getHotspotJavaScript() {
+    public static String getHotspotJavaScript(long session) {
     	StringBuffer buf = new StringBuffer();
     	long now = new Date().getTime();
     	synchronized (hotspotItems) {
     		for (Iterator iterator = hotspotItems.iterator(); iterator.hasNext();) {
     			Java2ScriptCompiledItem item = (Java2ScriptCompiledItem) iterator.next();
-    			if (item.getTime() >= now - 10000) { // 10 seconds delay!
+    			if ((session > 0 && item.getId() > session) 
+    					|| (session <= 0 && item.getTime() >= now - 10000)) { // 10 seconds delay!
     				buf.append(item.getTime());
     				buf.append(", ");
     				buf.append(item.getId());
@@ -68,7 +86,7 @@ public static String getHotspotJavaScript() {
     				buf.append("\",\r\n");
     			}
     		}
-		}
+    	}
     	return buf.toString();
     }
     
@@ -174,13 +192,5 @@ private int tryToGetAPort() throws Exception {
         }
         return port;
 	}
-    
-    public static void main(String[] args) {
-        new InnerHotspotServer().startServer();
-        new InnerHotspotServer().startServer();
-        new InnerHotspotServer().startServer();
-        new InnerHotspotServer().startServer();
-        addCompiledItem("hello.world.SeeYou");
-    }
 }
 
