* configservice.jsp: Add GC button

apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

@@ -218,6 +218,9 @@ public class ConfigServiceHandler extends FormHandler {
         } else if (_("Do not view console on startup").equals(_action)) {
             browseOnStartup(false);
             addFormNotice(_("Console is not to be shown on startup"));
+        } else if (_("Force GC").equals(_action)) {
+            Runtime.getRuntime().gc();
+            addFormNotice(_("Full garbage collection requested"));
         } else {
             //addFormNotice("Blah blah blah.  whatever.  I'm not going to " + _action);
         }

apps/routerconsole/jsp/configservice.jsp

@@ -62,17 +62,21 @@
 
  <h3><%=intl._("Debugging")%></h3>
  <p><a href="/jobs"><%=intl._("View the job queue")%></a>
- <% if (System.getProperty("wrapper.version") != null) { %>
+<% if (System.getProperty("wrapper.version") != null) { %>
  <p><%=intl._("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>.")%></p>
-  <hr><div class="formaction">
- <input type="submit" name="action" value="<%=intl._("Dump threads")%>" >
- </div>
+  <hr>
 <% } %>
+ <div class="formaction">
+ <input type="submit" class="reload" name="action" value="<%=intl._("Force GC")%>" >
+<% if (System.getProperty("wrapper.version") != null) { %>
+ <input type="submit" class="download" name="action" value="<%=intl._("Dump threads")%>" >
+<% } %>
+ </div>
 
  <h3><%=intl._("Launch browser on router startup?")%></h3>
  <p><%=intl._("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%>
  <a href="http://127.0.0.1:7657/">http://127.0.0.1:7657/</a> .</p>
  <hr><div class="formaction">
- <input type="submit" name="action" value="<%=intl._("View console on startup")%>" >
- <input type="submit" name="action" value="<%=intl._("Do not view console on startup")%>" >
+ <input type="submit" class="check" name="action" value="<%=intl._("View console on startup")%>" >
+ <input type="submit" class="delete" name="action" value="<%=intl._("Do not view console on startup")%>" >
 </div></form></div></div></body></html>

history.txt

@@ -1,3 +1,15 @@
+2012-10-05 zzz
+ * configservice.jsp: Add GC button
+ * DataHelper: Sanity checks in storeProps(), use
+               storeProps() for router config again
+ * SSU:
+   - More synchronization fixes
+   - Reduce chance of dup acks in a single message
+   - Reduce max unsent acks to 50
+   - Use last ack time in ping decision too
+   - Reduce ack delay
+ * TunnelPoolManager: Fix early NPE (ticket #724)
+
 2012-10-03 zzz
  * NTCP: Reduce conLock contention
  * SSU:

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
 
     /** for example "-test" */
     public final static String EXTRA = "";