Skip to content

Commit

Permalink
Merge pull request #4279 from pdudits/pr-4277
Browse files Browse the repository at this point in the history 
PAYARA-3811: Optimize deployment times
  • Loading branch information
@pdudits
pdudits authored Oct 24, 2019
2 parents 3879233 + 1612c5b commit adb46ec
Show file tree
Hide file tree
Showing 6 changed files with 697 additions and 144 deletions.
148 changes: 25 additions & 123 deletions nucleus/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
import java.net.*;
import java.nio.file.Path;
import java.security.*;
import java.security.cert.Certificate;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
Expand Down Expand Up @@ -203,19 +205,7 @@ public void done() {

// closes the jar handles and sets the url entries to null
for (URLEntry u : this.urlSet) {
if (u.zip != null) {
try {
u.zip.reallyClose();
} catch (IOException ioe) {
_logger.log(Level.INFO,
CULoggerInfo.getString(CULoggerInfo.exceptionClosingURLEntry, u.source),
ioe);
}
}
if (u.table != null) {
u.table.clear();
u.table = null;
}
u.close();
}

closeOpenStreams();
Expand Down Expand Up @@ -936,8 +926,7 @@ protected static final class URLEntry {
ensure thread visibility by making it 'volatile' */
volatile boolean isJar = false;

/** ensure thread visibility by making it 'volatile' */
volatile Map<String,String> table = null;
private Predicate<String> presenceCheck;

/** ProtectionDomain with signers if jar is signed,
ensure thread visibility by making it 'volatile' */
Expand All @@ -955,122 +944,21 @@ void init() throws IOException {

if (isJar) {
zip = new ProtectedJarFile(file);
// negative lookups in jar are cheap
presenceCheck = (any) -> true;
} else {
Path path = file.toPath();
presenceCheck = (item) -> DirWatcher.hasItem(path, item);
DirWatcher.register(path);
}

table = new ConcurrentHashMap<>();
} catch (URISyntaxException use) {
throw new IOException(use);
}
}

private void fillTable(File f, Map<String, String> t, String parent) throws IOException {
String localName = (parent.equals("")) ? "" : parent + "/";
File[] children = f.listFiles();
if (children != null) {
for (File aChildren : children) {
processFile(aChildren, t, localName);
}
}
}

/**
*Adds a file (or, if a directory, the directory's contents) to the table
*of files this loader knows about.
*<p>
*Invokes fillTable for subdirectories which in turn invokes processFile
*recursively.
*@param fileToProcess the File to be processed
*@param t the Map that holds the files the loader knows about
*@param parentLocalName prefix to be used for the full path; should be
*non-empty only for recursive invocations
*@throws IOException in case of errors working with the fileToProcess
*/
private void processFile(File fileToProcess, Map<String, String> t, String parentLocalName) throws IOException {
String key = parentLocalName + fileToProcess.getName();
if (fileToProcess.isFile()) {
t.put(key, key);
} else if (fileToProcess.isDirectory()) {
fillTable(fileToProcess, t, key);
}
}


boolean hasItem(String item) {
// in the case of ejbc stub compilation, asurlclassloader is created before stubs
// gets generated, thus we need to return true for this case.
if (table.isEmpty()) {
return true;
}

/*
*Even with the previous special handling, a file could be created
*in a directory after the loader was created and its table of
*URLEntry names populated. So check the table first and, if
*the target item is not there and this URLEntry is for a directory, look for
*the file. If the file is now present but was not when the loader
*was created, add an entry for the file in the table.
*/
String target = item;
// special handling
if (item.startsWith("./")) {
target = item.substring(2);
}

boolean result = table.containsKey(target);
if ( ! result && ! isJar) {
/*
*If the file exists now then it has been added to the directory since the
*loader was created. Add it to the table of files we
*know about.
*/
File targetFile = privilegedCheckForFile(target);
if (targetFile != null) {
try {
processFile(targetFile, table, "");
result = true;
} catch (IOException ioe) {
_logger.log(Level.SEVERE,
CULoggerInfo.getString(CULoggerInfo.exceptionProcessingFile, target, file.getAbsolutePath()),
ioe);
return false;
}
}
}
return result;
}

/**
*Returns a File object for the requested path within the URLEntry.
*<p>
*Runs privileged because user code could trigger invocations of this
*method.
*@param targetPath the relative path to look for
*@return File object for the requested file; null if it does not exist or
*in case of error
*/
private File privilegedCheckForFile(final String targetPath) {
/*
*Check for the file existence with privs, because this code can
*be invoked from user code which may not otherwise have access
*to the directories of interest.
*/
try {
return AccessController.doPrivileged((PrivilegedExceptionAction<File>) () -> {
File targetFile = new File(file, targetPath);
if ( ! targetFile.exists()) {
targetFile = null;
}
return targetFile;
});
} catch (PrivilegedActionException pae) {
/*
*Log any exception and return false.
*/
_logger.log(Level.SEVERE,
CULoggerInfo.getString(CULoggerInfo.exceptionCheckingFile, targetPath, file.getAbsolutePath()),
pae.getCause());
return null;
}
return presenceCheck.test(item);
}

/**
Expand Down Expand Up @@ -1133,6 +1021,20 @@ public int hashCode() {
}
}

public void close() {
if (zip != null) {
try {
zip.reallyClose();
} catch (IOException ioe) {
_logger.log(Level.INFO,
CULoggerInfo.getString(CULoggerInfo.exceptionClosingURLEntry, source),
ioe);
}
}
if (!isJar) {
DirWatcher.unregister(file.toPath());
}
}
}

/**
Expand Down
Loading

0 comments on commit adb46ec

Please sign in to comment.