[icedtea-web][rfc] Extract native code caching from JNLPClassLoader into a small class
Jiri Vanek
jvanek at redhat.com
Wed May 29 03:21:33 PDT 2013
On 05/23/2013 09:19 PM, Adam Domurad wrote:
> On 03/12/2013 10:26 AM, Jiri Vanek wrote:
>> On 03/05/2013 10:20 PM, Adam Domurad wrote:
>>> This is an incremental part of the effort to reduce the responsibilities of JNLPClassLoader.
>>>
>>> 2013-03-05 Adam Domurad <adomurad at redhat.com>
>>>
>>> * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New,
>>> stores and searches for native library files that are loaded from jars.
>>> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code
>>> that handled native jar caching to NativeLibraryStorage.
>>>
>>> Happy hacking,
>>> -Adam
>>
>> Is there any more reason for this refactoring then much nicer, more readable, and testable
>> jnlpclasslaoder?
>> Anyway I'm fan of this kind of refactoring. And I'm for this to be done.
>>
>> - there must be unittests for this chnage
>> - i would like to see even reproducer for this
>> - it should go to 1.3 to after some time in head.
>
> Probably a little late now, but 1.4 sure, unless you think 1.3 is still a good idea.
I'm hesitating with 1.4 now. But probably yes. But you owe me your head:)
>
>>
>> I have not check if there is something more then pure refactoring, but if there isn't and tsts
>> will be added, then this will be approved.
>
> It is a refactoring only.
>
>>
>> J.
>
> I have created some unit tests, hopefully it is enough to push with ?
nope. Some moreover important changes needed.
Especially ExecUtils.execAndLog have no reason to live. Please use processWrapper. It is designed
for this and have logging correctly adapted.
Also I'm against such a huge usage of ecxec. Java is not Python.
Especiallythe touch and mkdir is nothing but pure laziness :) Please use java calls.
For jar -cf ... well.. Java have api to work with its own jars.. please follow this api. Do not fork
processes if possible. But ..well. this api can be trap :) So choose wisely.
I would recommend to do the refactoring of DummyJNLPFileWithJar into separate changset which you can
proceed immediately, but I do not insists.
In all cases, thanx for check and refactoring! It is deeply appreciated.
J.
> There is some bundled refactoring of the test extensions, hopefully it is ok.
>
> 2013-05-23 Adam Domurad <adomurad at redhat.com>
>
> * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java:
> Moved MockedOneJarJNLPFile to separate DummyJNLPFileWithJar. Moved
> utilities to ExecUtils & FileDescriptorUtils.
> * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java:
> New, tests lookup of native libraries from folders and jars.
> * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java:
> Moved from JNLPClassLoaderTest.MockedOneJarJNLPFile.
> * tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java:
> New, provides utility for exec'ing cleanly and logging.
> * tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java
> (getOpenFileDescriptorCount): Moved here, counts open files.
> (assertNoFileLeak): Moved here, asserts a runnable does not leak file
> descriptors.
>
> Happy hacking,
> -Adam
>
> test-native-library-storage.patch
>
>
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java b/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java
> @@ -0,0 +1,173 @@
> +/*
> +Copyright (C) 2013 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +package net.sourceforge.jnlp.cache;
> +
> +import static net.sourceforge.jnlp.util.FileDescriptorUtils.assertNoFileLeak;
> +import static org.junit.Assert.assertEquals;
> +import static org.junit.Assert.assertFalse;
> +import static org.junit.Assert.assertTrue;
> +
> +import java.io.File;
> +import java.net.URL;
> +
> +import net.sourceforge.jnlp.Version;
> +import net.sourceforge.jnlp.util.ExecUtils;
> +
> +import org.junit.Test;
> +
> +public class NativeLibraryStorageTest {
> +
> + /**************************************************************************
> + * Test helpers *
> + **************************************************************************/
> +
> + /* Associates an extension with whether it represents a native library */
> + static class FileExtension {
> + public FileExtension(String extension, boolean isNative) {
> + this.extension = extension;
> + this.isNative = isNative;
> + }
> + final String extension;
> + final boolean isNative;
> + }
> +
> + /* Saves typing when creating a FileExtension */
> + static FileExtension fileExt(String extension, boolean isNative) {
> + return new FileExtension(extension, isNative);
> + }
> +
> + /* All the native library types we support, as well as one negative test */
> + static final FileExtension[] extensionsToTest = {
> + fileExt(".foobar", false), /* Dummy non-native test extension */
> + fileExt(".so", true),
> + fileExt(".dylib", true),
> + fileExt(".jnilib", true),
> + fileExt(".framework", true),
> + fileExt(".dll", true)
> + };
> +
> + static File createTempDirectory() throws Exception {
> + return new File(ExecUtils.execAndLog(null /* current working dir */, "mktemp", "-d"));
> + }
> +
> + /* Creates a jar in a temporary directory, with the given name & contents */
> + static File createTempJarWithFile(String jarName, String file) throws Exception {
> + File dir = createTempDirectory();
> + ExecUtils.execAndLog(dir, "touch", file);
> + ExecUtils.execAndLog(dir, "jar", "-cf", jarName, file);
> + return new File(dir.getAbsolutePath() + "/" + jarName);
> + }
> +
> + /* Creates a NativeLibraryStorage object, caching the given URLs */
> + static NativeLibraryStorage nativeLibraryStorageWithCache(URL... urlsToCache) {
> + ResourceTracker tracker = new ResourceTracker();
> + for (URL urlToCache : urlsToCache) {
> + tracker.addResource(urlToCache, new Version("1.0"), null, UpdatePolicy.ALWAYS);
> + }
> +
> + return new NativeLibraryStorage(tracker);
> + }
> +
> + /**************************************************************************
> + * Test cases *
> + **************************************************************************/
> +
> + /* Tests searching for native libraries in jars */
> + @Test
> + public void testJarFileSearch() throws Exception {
> + for (FileExtension ext : extensionsToTest) {
> + String testFile = "foobar" + ext.extension;
> + final URL tempJarUrl = createTempJarWithFile("test.jar", testFile).toURI().toURL();
> + final NativeLibraryStorage storage = nativeLibraryStorageWithCache(tempJarUrl);
> +
> + assertNoFileLeak( new Runnable () {
> + @Override
> + public void run() {
> + storage.addSearchJar(tempJarUrl);
> + }
> + });
> +
> + /* This check isn't critical, but ensures we do not accidentally add jars as search directories */
> + assertFalse(storage.getSearchDirectories().contains(tempJarUrl));
> +
> + /* If the file we added is native, it should be found
> + * Due to an implementation detail, non-native files will not be found */
> + boolean testFileWasFound = storage.findLibrary(testFile) != null;
> + assertEquals(ext.isNative, testFileWasFound);
> + }
> + }
> +
> + /* Tests searching for native libraries in directories */
> + @Test
> + public void testDirectorySearch() throws Exception {
> + for (FileExtension ext : extensionsToTest) {
> + String testFile = "foobar" + ext.extension;
> + File tempDirectory = createTempDirectory();
> +
> + /* Create an empty file with the name 'testFile' */
> + ExecUtils.execAndLog(tempDirectory, "touch", testFile);
> +
> + NativeLibraryStorage storage = nativeLibraryStorageWithCache(/* None needed */);
> + storage.addSearchDirectory(tempDirectory);
> +
> + /* Ensure directory is in our search list */
> + assertTrue(storage.getSearchDirectories().contains(tempDirectory));
> +
> + /* The file should be found, regardless if it was native */
> + boolean testFileWasFound = storage.findLibrary(testFile) != null;
> + assertTrue(testFileWasFound);
> + }
> + }
> +
> + @Test
> + public void testCleanupTemporaryFolder() throws Exception {
> + NativeLibraryStorage storage = nativeLibraryStorageWithCache(/* None needed */);
> + storage.ensureNativeStoreDirectory();
> +
> + /* The temporary native store directory should be our only search folder */
> + assertTrue(storage.getSearchDirectories().size() == 1);
> +
> + File searchDirectory = storage.getSearchDirectories().get(0);
> + assertTrue(searchDirectory.exists());
> +
> + /* Test that it has been deleted */
> + storage.cleanupTemporaryFolder();
> + assertFalse(searchDirectory.exists());
> +
> + }
> +}
> \ No newline at end of file
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
> @@ -36,136 +36,46 @@ exception statement from your version.
>
> package net.sourceforge.jnlp.runtime;
>
> +import static net.sourceforge.jnlp.util.FileDescriptorUtils.assertNoFileLeak;
> +
> import static org.junit.Assert.assertEquals;
> import static org.junit.Assert.assertFalse;
> import static org.junit.Assert.fail;
>
> import java.io.File;
> -import java.lang.management.ManagementFactory;
> -import java.net.MalformedURLException;
> -import java.net.URL;
> import java.util.ArrayList;
> -import java.util.Arrays;
> import java.util.List;
> -import java.util.Locale;
>
> -import javax.management.MBeanServer;
> -import javax.management.ObjectName;
> -
> -import net.sourceforge.jnlp.InformationDesc;
> -import net.sourceforge.jnlp.JARDesc;
> -import net.sourceforge.jnlp.JNLPFile;
> import net.sourceforge.jnlp.LaunchException;
> -import net.sourceforge.jnlp.ResourcesDesc;
> -import net.sourceforge.jnlp.SecurityDesc;
> -import net.sourceforge.jnlp.ServerAccess;
> -import net.sourceforge.jnlp.Version;
> import net.sourceforge.jnlp.cache.UpdatePolicy;
> -import net.sourceforge.jnlp.util.StreamUtils;
> +import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar;
> +import net.sourceforge.jnlp.util.ExecUtils;
>
> import org.junit.Test;
>
> public class JNLPClassLoaderTest {
>
> - /* Get the open file-descriptor count for the process.
> - * Note that this is specific to Unix-like operating systems.
> - * As well, it relies on */
> - static public long getOpenFileDescriptorCount() {
> - MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
> - try {
> - return (Long) beanServer.getAttribute(
> - new ObjectName("java.lang:type=OperatingSystem"),
> - "OpenFileDescriptorCount"
> - );
> - } catch (Exception e) {
> - // Effectively disables leak tests
> - ServerAccess.logErrorReprint("Warning: Cannot get file descriptors for this platform!");
> - return 0;
> - }
> - }
> -
> - /* Check the amount of file descriptors before and after a Runnable */
> - static private void assertNoFileLeak(Runnable runnable) {
> - long filesOpenBefore = getOpenFileDescriptorCount();
> - runnable.run();
> - long filesLeaked = getOpenFileDescriptorCount() - filesOpenBefore;
> - assertEquals(0, filesLeaked);
> - }
> -
> - static private String cleanExec(File directory, String... command) throws Exception {
> - Process p = Runtime.getRuntime().exec(command, new String[]{}, directory);
> -
> - String stdOut = StreamUtils.readStreamAsString(p.getInputStream());
> - String stdErr = StreamUtils.readStreamAsString(p.getErrorStream());
> -
> - ServerAccess.logNoReprint("Running " + Arrays.toString(command));
> - ServerAccess.logNoReprint("Standard output was: \n" + stdOut);
> - ServerAccess.logNoReprint("Standard error was: \n" + stdErr);
> -
> - p.getInputStream().close();
> - p.getErrorStream().close();
> - p.getOutputStream().close();
> -
> - return stdOut;
> -
> + static public File createTempDirectory() throws Exception {
> + return new File(ExecUtils.execAndLog(null /* current working dir */, "mktemp", "-d"));
> }
>
> /* Creates a jar in a temporary directory, with the given name & manifest contents. */
> - static private File createTempJar(String jarName, String manifestContents) throws Exception {
> - File dir = new File(cleanExec(null /* current working dir */, "mktemp", "-d"));
> - cleanExec(dir, "/bin/bash", "-c", "echo '" + manifestContents + "' > Manifest.txt");
> - cleanExec(dir, "jar", "-cfm", jarName, "Manifest.txt");
> + static public File createTempJar(String jarName, String manifestContents) throws Exception {
> + File dir = createTempDirectory();
> + ExecUtils.execAndLog(dir, "/bin/sh", "-c", "echo '" + manifestContents + "' > Manifest.txt");
> + ExecUtils.execAndLog(dir, "jar", "-cfm", jarName, "Manifest.txt");
> return new File(dir.getAbsolutePath() + "/" + jarName);
> }
>
> /* Creates a jar in a temporary directory, with the given name & an empty manifest. */
> - static private File createTempJar(String jarName) throws Exception {
> + static public File createTempJar(String jarName) throws Exception {
> return createTempJar(jarName, "");
> }
>
> - /* Create a JARDesc for the given URL location */
> - static private JARDesc makeJarDesc(URL jarLocation) {
> - return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false);
> - }
> -
> - /* A mocked dummy JNLP file with a single JAR. */
> - private class MockedOneJarJNLPFile extends JNLPFile {
> - URL codeBase, jarLocation;
> - JARDesc jarDesc;
> -
> - MockedOneJarJNLPFile(File jarFile) throws MalformedURLException {
> - codeBase = jarFile.getParentFile().toURI().toURL();
> - jarLocation = jarFile.toURI().toURL();
> - jarDesc = makeJarDesc(jarLocation);
> - info = new ArrayList<InformationDesc>();
> - }
> -
> - @Override
> - public ResourcesDesc getResources() {
> - ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]);
> - resources.addResource(jarDesc);
> - return resources;
> - }
> - @Override
> - public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) {
> - return new ResourcesDesc[] { getResources() };
> - }
> -
> - @Override
> - public URL getCodeBase() {
> - return codeBase;
> - }
> -
> - @Override
> - public SecurityDesc getSecurity() {
> - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null);
> - }
> - };
> -
> /* Note: Only does file leak testing for now. */
> @Test
> public void constructorFileLeakTest() throws Exception {
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar"));
> + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar"));
>
> assertNoFileLeak( new Runnable () {
> @Override
> @@ -183,7 +93,7 @@ public class JNLPClassLoaderTest {
> * However, it is tricky without it erroring-out. */
> @Test
> public void isInvalidJarTest() throws Exception {
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar"));
> + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar"));
> final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
>
> assertNoFileLeak( new Runnable () {
> @@ -194,25 +104,11 @@ public class JNLPClassLoaderTest {
> });
>
> }
> -
> - /* Note: Only does file leak testing for now, but more testing could be added. */
> - @Test
> - public void activateNativeFileLeakTest() throws Exception {
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar"));
> - final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
> -
> - assertNoFileLeak( new Runnable () {
> - @Override
> - public void run() {
> - classLoader.activateNative(jnlpFile.jarDesc);
> - }
> - });
> - }
>
> @Test
> public void getMainClassNameTest() throws Exception {
> /* Test with main-class */{
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "Main-Class: DummyClass\n"));
> + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "Main-Class: DummyClass\n"));
> final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
>
> assertNoFileLeak(new Runnable() {
> @@ -223,7 +119,7 @@ public class JNLPClassLoaderTest {
> });
> }
> /* Test with-out main-class */{
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", ""));
> + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", ""));
> final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
>
> assertNoFileLeak(new Runnable() {
> @@ -246,7 +142,7 @@ public class JNLPClassLoaderTest {
> /* Note: Although it does a basic check, this mainly checks for file-descriptor leak */
> @Test
> public void checkForMainFileLeakTest() throws Exception {
> - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", ""));
> + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", ""));
> final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
> assertNoFileLeak(new Runnable() {
> @Override
> diff --git a/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java
> @@ -0,0 +1,91 @@
> +/*
> +Copyright (C) 2013 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +package net.sourceforge.jnlp.mock;
> +
> +import java.io.File;
> +import java.net.MalformedURLException;
> +import java.net.URL;
> +import java.util.ArrayList;
> +import java.util.Locale;
> +
> +import net.sourceforge.jnlp.InformationDesc;
> +import net.sourceforge.jnlp.JARDesc;
> +import net.sourceforge.jnlp.JNLPFile;
> +import net.sourceforge.jnlp.ResourcesDesc;
> +import net.sourceforge.jnlp.SecurityDesc;
> +import net.sourceforge.jnlp.Version;
> +
> +/* A mocked dummy JNLP file with a single JAR. */
> +public class DummyJNLPFileWithJar extends JNLPFile {
> +
> + /* Create a JARDesc for the given URL location */
> + static private JARDesc makeJarDesc(URL jarLocation) {
> + return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false);
> + }
> +
> + public URL codeBase, jarLocation;
> + public JARDesc jarDesc;
> +
> + public DummyJNLPFileWithJar(File jarFile) throws MalformedURLException {
> + codeBase = jarFile.getParentFile().toURI().toURL();
> + jarLocation = jarFile.toURI().toURL();
> + jarDesc = makeJarDesc(jarLocation);
> + info = new ArrayList<InformationDesc>();
> + }
> +
> + @Override
> + public ResourcesDesc getResources() {
> + ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]);
> + resources.addResource(jarDesc);
> + return resources;
> + }
> + @Override
> + public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) {
> + return new ResourcesDesc[] { getResources() };
> + }
> +
> + @Override
> + public URL getCodeBase() {
> + return codeBase;
> + }
> +
> + @Override
> + public SecurityDesc getSecurity() {
> + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null);
> + }
> +};
> \ No newline at end of file
> diff --git a/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java b/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java
> @@ -0,0 +1,64 @@
> +/*
> +Copyright (C) 2013 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +package net.sourceforge.jnlp.util;
> +
> +import java.io.File;
> +import java.util.Arrays;
> +
> +import net.sourceforge.jnlp.ServerAccess;
> +
> +public class ExecUtils {
> +
> + static public String execAndLog(File directory, String... command) throws Exception {
> + Process p = Runtime.getRuntime().exec(command, new String[]{}, directory);
> +
> + String stdOut = StreamUtils.readStreamAsString(p.getInputStream());
> + String stdErr = StreamUtils.readStreamAsString(p.getErrorStream());
> +
> + ServerAccess.logNoReprint("Running " + Arrays.toString(command));
> + ServerAccess.logNoReprint("Standard output was: \n" + stdOut);
> + ServerAccess.logNoReprint("Standard error was: \n" + stdErr);
> +
> + p.getInputStream().close();
> + p.getErrorStream().close();
> + p.getOutputStream().close();
> +
> + return stdOut;
> +
> + }
> +}
> diff --git a/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java b/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java
> @@ -0,0 +1,76 @@
> +/*
> +Copyright (C) 2013 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +package net.sourceforge.jnlp.util;
> +
> +import static org.junit.Assert.assertEquals;
> +
> +import java.lang.management.ManagementFactory;
> +
> +import javax.management.MBeanServer;
> +import javax.management.ObjectName;
> +
> +import net.sourceforge.jnlp.ServerAccess;
> +
> +public class FileDescriptorUtils {
> +
> + /* Get the open file-descriptor count for the process.
> + * Note that this is specific to Unix-like operating systems.
> + * As well, it relies on */
> + static public long getOpenFileDescriptorCount() {
> + MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
> + try {
> + return (Long) beanServer.getAttribute(
> + new ObjectName("java.lang:type=OperatingSystem"),
> + "OpenFileDescriptorCount"
> + );
> + } catch (Exception e) {
> + // Effectively disables leak tests
> + ServerAccess.logErrorReprint("Warning: Cannot get file descriptors for this platform!");
> + return 0;
> + }
> + }
> +
> + /* Check the amount of file descriptors before and after a Runnable */
> + static public void assertNoFileLeak(Runnable runnable) {
> + long filesOpenBefore = getOpenFileDescriptorCount();
> + runnable.run();
> + long filesLeaked = getOpenFileDescriptorCount() - filesOpenBefore;
> + assertEquals(0, filesLeaked);
> + }
> +
> +}
>
More information about the distro-pkg-dev
mailing list