/hg/icedtea6: netx: add -Xclearcache to clear the cache
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Fri Oct 8 08:06:49 PDT 2010
changeset 4698e476b886 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4698e476b886
author: Omair Majid <omajid at redhat.com>
date: Fri Oct 08 11:06:14 2010 -0400
netx: add -Xclearcache to clear the cache
2010-10-08 Omair Majid <omajid at redhat.com>
* NEWS: Updated
* net/sourceforge/jnlp/Launcher.java: Add fileLock.
(launchApplication): Call markNetxRunning and install a shutdown
hook for markNetxStopped. (markNetxRunning): New method.
(markNetxStopped): New method.
* net/sourceforge/jnlp/cache/CacheUtil.java (R): New method.
(clearCache): New method. (okToClearCache): New method.
* net/sourceforge/jnlp/resources/Messages.properties: Add BXclearcache
and CCannotClearCache.
* net/sourceforge/jnlp/runtime/Boot.java (run): Clear the cache.
* net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add
NETX_RUNNING_FILE.
* net/sourceforge/jnlp/util/FileUtils.java (recursiveDelete): New
method.
diffstat:
8 files changed, 229 insertions(+)
ChangeLog | 20 +++
NEWS | 1
netx/net/sourceforge/jnlp/Launcher.java | 77 +++++++++++++++
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 71 +++++++++++++
netx/net/sourceforge/jnlp/resources/Messages.properties | 2
netx/net/sourceforge/jnlp/runtime/Boot.java | 13 ++
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 10 +
netx/net/sourceforge/jnlp/util/FileUtils.java | 35 ++++++
diffs (387 lines):
diff -r f41b0a7fbd70 -r 4698e476b886 ChangeLog
--- a/ChangeLog Mon Oct 04 18:13:02 2010 -0400
+++ b/ChangeLog Fri Oct 08 11:06:14 2010 -0400
@@ -1,3 +1,23 @@ 2010-10-04 Paul Ebermann <Paul-Eberman
+2010-10-08 Omair Majid <omajid at redhat.com>
+
+ * NEWS: Updated
+ * net/sourceforge/jnlp/Launcher.java: Add fileLock.
+ (launchApplication): Call markNetxRunning and install a shutdown hook for
+ markNetxStopped.
+ (markNetxRunning): New method.
+ (markNetxStopped): New method.
+ * net/sourceforge/jnlp/cache/CacheUtil.java
+ (R): New method.
+ (clearCache): New method.
+ (okToClearCache): New method.
+ * net/sourceforge/jnlp/resources/Messages.properties: Add BXclearcache and
+ CCannotClearCache.
+ * net/sourceforge/jnlp/runtime/Boot.java
+ (run): Clear the cache.
+ * net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add NETX_RUNNING_FILE.
+ * net/sourceforge/jnlp/util/FileUtils.java
+ (recursiveDelete): New method.
+
2010-10-04 Paul Ebermann <Paul-Ebermann at gmx.de>
Omair Majid <omajid at redhat.com>
diff -r f41b0a7fbd70 -r 4698e476b886 NEWS
--- a/NEWS Mon Oct 04 18:13:02 2010 -0400
+++ b/NEWS Fri Oct 08 11:06:14 2010 -0400
@@ -18,6 +18,7 @@ New in release 1.10 (2010-XX-XX):
- S6650759: Inference of formal type parameter (unused in formal parameters) is not performed
* Netx
- A new man page for javaws.
+ - Add a new option -Xclearcache
* Plugin
- PR554: System.err writes content two times
- PR556: Applet initialization code is prone to race conditions
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Oct 08 11:06:14 2010 -0400
@@ -20,12 +20,17 @@ import java.applet.Applet;
import java.applet.Applet;
import java.awt.Container;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadMXBean;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
import java.util.LinkedList;
import java.util.List;
import java.util.jar.JarFile;
@@ -78,6 +83,9 @@ public class Launcher {
/** If the application should call System.exit on fatal errors */
private boolean exitOnFailure = true;
+ /** a lock which is held to indicate that an instance of netx is running */
+ private FileLock fileLock;
+
/**
* Create a launcher with the runtime's default update policy
* and launch handler.
@@ -127,6 +135,7 @@ public class Launcher {
this.handler = handler;
this.updatePolicy = policy;
+
}
/**
@@ -385,6 +394,11 @@ public class Launcher {
if (!file.isApplication())
throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplication"), R("LNotApplicationInfo")));
+ markNetxRunning();
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() { markNetxStopped(); }
+ });
+
try {
try {
@@ -686,6 +700,69 @@ public class Launcher {
return null; // chose to continue, or no handler
}
+ /**
+ * Indicate that netx is running by creating the {@link JNLPRuntime#INSTANCE_FILE} and
+ * acquiring a shared lock on it
+ */
+ private void markNetxRunning() {
+ try {
+ String message = "This file is used to check if netx is running";
+
+ File netxRunningFile = new File(JNLPRuntime.NETX_RUNNING_FILE);
+ netxRunningFile.getParentFile().mkdirs();
+ if (netxRunningFile.createNewFile()) {
+ FileOutputStream fos = new FileOutputStream(netxRunningFile);
+ try {
+ fos.write(message.getBytes());
+ } finally {
+ fos.close();
+ }
+ }
+
+ if (!netxRunningFile.isFile()) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Unable to create instance file");
+ }
+ fileLock = null;
+ return;
+ }
+
+ FileInputStream is = new FileInputStream(netxRunningFile);
+ FileChannel channel = is.getChannel();
+ fileLock = channel.tryLock(0, Long.MAX_VALUE, true);
+ if (fileLock != null && fileLock.isShared()) {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Acquired shared lock on " +
+ JNLPRuntime.NETX_RUNNING_FILE + " to indicate javaws is running");
+ }
+ } else {
+ fileLock = null;
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * Indicate that netx is stopped by releasing the shared lock on
+ * {@link JNLPRuntime#INSTANCE_FILE}.
+ */
+ private void markNetxStopped() {
+ if (fileLock == null) {
+ return;
+ }
+ try {
+ fileLock.release();
+ fileLock.channel().close();
+ fileLock = null;
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Release shared lock on " + JNLPRuntime.NETX_RUNNING_FILE);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
/**
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri Oct 08 11:06:14 2010 -0400
@@ -19,6 +19,7 @@ package net.sourceforge.jnlp.cache;
import java.io.*;
import java.net.*;
+import java.nio.channels.FileChannel;
import java.util.*;
import java.lang.reflect.*;
import java.security.*;
@@ -36,6 +37,10 @@ import net.sourceforge.jnlp.util.FileUti
* @version $Revision: 1.17 $
*/
public class CacheUtil {
+
+ private static String R(String key) {
+ return JNLPRuntime.getMessage(key);
+ }
private static String R(String key, Object param) {
return JNLPRuntime.getMessage(key, new Object[] {param});
@@ -126,6 +131,72 @@ public class CacheUtil {
}
return null;
+ }
+
+ /**
+ * Clears the cache by deleting all the Netx cache files
+ *
+ * Note: Because of how our caching system works, deleting jars of another javaws
+ * process is using them can be quite disasterous. Hence why Launcher creates lock files
+ * and we check for those by calling {@link #okToClearCache()}
+ */
+ public static void clearCache() {
+
+ if (!okToClearCache()) {
+ System.err.println(R("CCannotClearCache"));
+ return;
+ }
+
+ File cacheDir = new File(JNLPRuntime.getBaseDir() + File.separator + "cache");
+ if (!(cacheDir.isDirectory())) {
+ return;
+ }
+
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Clearing cache directory: " + cacheDir);
+ }
+ try {
+ FileUtils.recursiveDelete(cacheDir, JNLPRuntime.getBaseDir());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Returns a boolean indicating if it ok to clear the netx application cache at this point
+ * @return true if the cache can be cleared at this time without problems
+ */
+ private static boolean okToClearCache() {
+ File otherJavawsRunning = new File(JNLPRuntime.NETX_RUNNING_FILE);
+ try {
+ if (otherJavawsRunning.isFile()) {
+ FileOutputStream fis = new FileOutputStream(otherJavawsRunning);
+ try {
+ FileChannel channel = fis.getChannel();
+ if (channel.tryLock() == null) {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Other instances of netx are running");
+ }
+ return false;
+ }
+
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("No other instances of netx are running");
+ }
+ return true;
+
+ } finally {
+ fis.close();
+ }
+ } else {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("No instance file found");
+ }
+ return true;
+ }
+ } catch (IOException e) {
+ return false;
+ }
}
/**
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Oct 08 11:06:14 2010 -0400
@@ -139,6 +139,7 @@ BOViewer = Shows the trusted certific
BOViewer = Shows the trusted certificate viewer.
BOUmask = Sets the umask for files created by an application.
BXnofork = Do not create another JVM.
+BXclearcache= Clean the JNLP application cache.
BOHelp = Print this message and exit.
# Cache
@@ -149,6 +150,7 @@ CChooseCache=Choose a cache directory...
CChooseCache=Choose a cache directory...
CChooseCacheInfo=Netx needs a location for storing cache files.
CChooseCacheDir=Cache directory
+CCannotClearCache=Can not clear cache at this time
# Security
SFileReadAccess=The application has requested read access to {0}. Do you want to allow this action?
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Oct 08 11:06:14 2010 -0400
@@ -40,6 +40,7 @@ import net.sourceforge.jnlp.ParseExcepti
import net.sourceforge.jnlp.ParseException;
import net.sourceforge.jnlp.PropertyDesc;
import net.sourceforge.jnlp.ResourcesDesc;
+import net.sourceforge.jnlp.cache.CacheUtil;
import net.sourceforge.jnlp.cache.UpdatePolicy;
import net.sourceforge.jnlp.security.VariableX509TrustManager;
import net.sourceforge.jnlp.security.viewer.CertificateViewer;
@@ -114,6 +115,7 @@ public final class Boot implements Privi
+ " -strict "+R("BOStrict")+"\n"
+ " -umask=value "+R("BOUmask")+"\n"
+ " -Xnofork "+R("BXnofork")+"\n"
+ + " -Xclearcache "+R("BXclearcache")+"\n"
+ " -help "+R("BOHelp")+"\n";
private static final String doubleArgs = "-basedir -jnlp -arg -param -property -update";
@@ -201,6 +203,17 @@ public final class Boot implements Privi
JNLPRuntime.setBaseDir(getBaseDir());
JNLPRuntime.setSecurityEnabled(null == getOption("-nosecurity"));
JNLPRuntime.initialize(true);
+
+ /*
+ * FIXME
+ * This should have been done with the rest of the argument parsing
+ * code. But we need to know what the cache and base directories are,
+ * and baseDir is initialized here
+ */
+ if (null != getOption("-Xclearcache")) {
+ CacheUtil.clearCache();
+ return null;
+ }
try {
new Launcher().launch(getFile());
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Oct 08 11:06:14 2010 -0400
@@ -18,6 +18,7 @@ package net.sourceforge.jnlp.runtime;
package net.sourceforge.jnlp.runtime;
import java.io.*;
+import java.nio.channels.FileLock;
import java.awt.*;
import java.text.*;
import java.util.*;
@@ -131,6 +132,15 @@ public class JNLPRuntime {
*/
public static final String LOCKS_DIR = TMP_DIR + File.separator + USER + File.separator
+ "netx" + File.separator + "locks";
+
+ /**
+ * The /tmp/$USER/netx/locks/netx_running file is used to indicate if any
+ * instances of netx are running (this file may exist even if no instances
+ * are running). All netx instances acquire a shared lock on this file. If
+ * this file can be locked (using a {@link FileLock}) in exclusive mode, then
+ * other netx instances are not running
+ */
+ public static final String NETX_RUNNING_FILE = LOCKS_DIR + File.separator + "netx_running";
/** the java.home directory */
public static final String JAVA_HOME_DIR = System.getProperty("java.home");
diff -r f41b0a7fbd70 -r 4698e476b886 netx/net/sourceforge/jnlp/util/FileUtils.java
--- a/netx/net/sourceforge/jnlp/util/FileUtils.java Mon Oct 04 18:13:02 2010 -0400
+++ b/netx/net/sourceforge/jnlp/util/FileUtils.java Fri Oct 08 11:06:14 2010 -0400
@@ -17,6 +17,9 @@ package net.sourceforge.jnlp.util;
package net.sourceforge.jnlp.util;
import java.io.File;
+import java.io.IOException;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
/**
* This class contains a few file-related utility functions.
@@ -121,4 +124,36 @@ public final class FileUtils {
return prefix + OMITTED + suffix;
}
+ /**
+ * Recursively delete everything under a directory. Works on either files or
+ * directories
+ *
+ * @param file the file object representing what to delete. Can be either a
+ * file or a directory.
+ * @param base the directory under which the file and its subdirectories must be located
+ * @throws IOException on an io exception or if trying to delete something
+ * outside the base
+ */
+ public static void recursiveDelete(File file, File base) throws IOException {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Deleting: " + file);
+ }
+
+ if (!(file.getCanonicalPath().startsWith(base.getCanonicalPath()))) {
+ throw new IOException("Trying to delete a file outside Netx's basedir: "
+ + file.getCanonicalPath());
+ }
+
+ if (file.isDirectory()) {
+ File[] children = file.listFiles();
+ for (int i = 0; i < children.length; i++) {
+ recursiveDelete(children[i], base);
+ }
+ }
+ if (!file.delete()) {
+ throw new IOException("Unable to delete file: " + file);
+ }
+
+ }
+
}
More information about the distro-pkg-dev
mailing list