Skip to content

Commit

Permalink
[LOGMGR-133] Introduce JDKSpecific class in prepration for Java 9; ad…
Browse files Browse the repository at this point in the history 
…d calling module check facilities
  • Loading branch information
@dmlloyd
dmlloyd committed Dec 5, 2017
1 parent d66b664 commit 43ce320
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 89 deletions.
48 changes: 10 additions & 38 deletions src/main/java/org/jboss/logmanager/CallerClassLoaderLogContextSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,6 @@ public CallerClassLoaderLogContextSelector(final boolean checkParentClassLoaders
this(LogContext.DEFAULT_LOG_CONTEXT_SELECTOR, checkParentClassLoaders);
}

private static final class Gateway extends SecurityManager {
protected Class[] getClassContext() {
return super.getClassContext();
}
}

private static final Gateway GATEWAY;

static {
GATEWAY = AccessController.doPrivileged(new PrivilegedAction<Gateway>() {
public Gateway run() {
return new Gateway();
}
});
}

private final LogContextSelector defaultSelector;

private final ConcurrentMap<ClassLoader, LogContext> contextMap = new CopyOnWriteMap<ClassLoader, LogContext>();
Expand All @@ -110,32 +94,20 @@ public Gateway run() {

private final PrivilegedAction<LogContext> logContextAction = new PrivilegedAction<LogContext>() {
public LogContext run() {
for (Class<?> caller : GATEWAY.getClassContext()) {
final ClassLoader classLoader = caller.getClassLoader();
// If the class loader is a log API class loader or null (bootstrap class loader), keep checking
if (classLoader == null || logApiClassLoaders.contains(classLoader)) {
continue;
}
final LogContext result = check(classLoader);
if (result != null) {
return result;
}
break;
}
return defaultSelector.getLogContext();
final Class<?> callingClass = JDKSpecific.findCallingClass(logApiClassLoaders);
return callingClass == null ? defaultSelector.getLogContext() : check(callingClass.getClassLoader());
}

private LogContext check(final ClassLoader classLoader) {
if (classLoader != null && !logApiClassLoaders.contains(classLoader)) {
final LogContext context = contextMap.get(classLoader);
if (context != null) {
return context;
}
if (checkParentClassLoaders) {
return check(classLoader.getParent());
}
final LogContext context = contextMap.get(classLoader);
if (context != null) {
return context;
}
return null;
final ClassLoader parent = classLoader.getParent();
if (parent != null && checkParentClassLoaders && ! logApiClassLoaders.contains(parent)) {
return check(parent);
}
return defaultSelector.getLogContext();
}
};

Expand Down
43 changes: 10 additions & 33 deletions src/main/java/org/jboss/logmanager/ClassLoaderLogContextSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,6 @@ public ClassLoaderLogContextSelector(final boolean checkParentClassLoaders) {
this(LogContext.DEFAULT_LOG_CONTEXT_SELECTOR, checkParentClassLoaders);
}

private static final class Gateway extends SecurityManager {
protected Class[] getClassContext() {
return super.getClassContext();
}
}

private static final Gateway GATEWAY;

static {
GATEWAY = AccessController.doPrivileged(new PrivilegedAction<Gateway>() {
public Gateway run() {
return new Gateway();
}
});
}

private final LogContextSelector defaultSelector;

private final ConcurrentMap<ClassLoader, LogContext> contextMap = new CopyOnWriteMap<ClassLoader, LogContext>();
Expand All @@ -105,27 +89,20 @@ public Gateway run() {

private final PrivilegedAction<LogContext> logContextAction = new PrivilegedAction<LogContext>() {
public LogContext run() {
for (Class<?> caller : GATEWAY.getClassContext()) {
final ClassLoader classLoader = caller.getClassLoader();
final LogContext result = check(classLoader);
if (result != null) {
return result;
}
}
return defaultSelector.getLogContext();
final Class<?> callingClass = JDKSpecific.findCallingClass(logApiClassLoaders);
return callingClass == null ? defaultSelector.getLogContext() : check(callingClass.getClassLoader());
}

private LogContext check(final ClassLoader classLoader) {
if (classLoader != null && !logApiClassLoaders.contains(classLoader)) {
final LogContext context = contextMap.get(classLoader);
if (context != null) {
return context;
}
if (checkParentClassLoaders) {
return check(classLoader.getParent());
}
final LogContext context = contextMap.get(classLoader);
if (context != null) {
return context;
}
return null;
final ClassLoader parent = classLoader.getParent();
if (parent != null && checkParentClassLoaders && ! logApiClassLoaders.contains(parent)) {
return check(parent);
}
return defaultSelector.getLogContext();
}
};

Expand Down
20 changes: 2 additions & 18 deletions src/main/java/org/jboss/logmanager/ExtLogRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,26 +330,10 @@ private void calculateCaller() {
return;
}
calculateCaller = false;
final StackTraceElement[] stack = new Throwable().getStackTrace();
boolean found = false;
for (StackTraceElement element : stack) {
final String className = element.getClassName();
if (found) {
if (! loggerClassName.equals(className)) {
setSourceClassName(className);
setSourceMethodName(element.getMethodName());
setSourceLineNumber(element.getLineNumber());
setSourceFileName(element.getFileName());
return;
}
} else {
found = loggerClassName.equals(className);
}
}
setUnknownCaller();
JDKSpecific.calculateCaller(this);
}

private void setUnknownCaller() {
void setUnknownCaller() {
setSourceClassName(null);
setSourceMethodName(null);
setSourceLineNumber(-1);
Expand Down
101 changes: 101 additions & 0 deletions src/main/java/org/jboss/logmanager/JDKSpecific.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package org.jboss.logmanager;

import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Set;

import org.jboss.modules.Module;
import org.jboss.modules.Version;

/**
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
final class JDKSpecific {
private JDKSpecific() {}

private static final Gateway GATEWAY;
private static final boolean JBOSS_MODULES;

static {
GATEWAY = AccessController.doPrivileged(new PrivilegedAction<Gateway>() {
public Gateway run() {
return new Gateway();
}
});
boolean jbossModules = false;
try {
Module.getStartTime();
jbossModules = true;
} catch (Throwable ignored) {}
JBOSS_MODULES = jbossModules;
}

static final class Gateway extends SecurityManager {
protected Class<?>[] getClassContext() {
return super.getClassContext();
}
}

static Class<?> findCallingClass(Set<ClassLoader> rejectClassLoaders) {
for (Class<?> caller : GATEWAY.getClassContext()) {
final ClassLoader classLoader = caller.getClassLoader();
if (classLoader != null && ! rejectClassLoaders.contains(classLoader)) {
return caller;
}
}
return null;
}

static void calculateCaller(ExtLogRecord logRecord) {
final String loggerClassName = logRecord.getLoggerClassName();
final StackTraceElement[] stackTrace = new Throwable().getStackTrace();
final Class<?>[] classes = GATEWAY.getClassContext();
// The stack trace may be missing classes, but the class context is not, so if we find a mismatch, we skip the class context items.
int i = 1, j = 0;
Class<?> clazz = classes[i++];
StackTraceElement element = stackTrace[j++];
boolean found = false;
for (;;) {
if (clazz.getName().equals(element.getClassName())) {
if (clazz.getName().equals(loggerClassName)) {
// next entry could be the one we want!
found = true;
} else {
if (found) {
logRecord.setSourceClassName(element.getClassName());
logRecord.setSourceMethodName(element.getMethodName());
logRecord.setSourceFileName(element.getFileName());
logRecord.setSourceLineNumber(element.getLineNumber());
if (JBOSS_MODULES) {
calculateModule(logRecord, clazz);
}
return;
}
}
if (j == classes.length) {
logRecord.setUnknownCaller();
return;
}
element = stackTrace[j ++];
}
if (i == classes.length) {
logRecord.setUnknownCaller();
return;
}
clazz = classes[i ++];
}
}

private static void calculateModule(final ExtLogRecord logRecord, final Class<?> clazz) {
final Module module = Module.forClass(clazz);
if (module != null) {
logRecord.setSourceModuleName(module.getName());
final Version version = module.getVersion();
if (version != null) {
logRecord.setSourceModuleVersion(version.toString());
} else {
logRecord.setSourceModuleVersion("");
}
}
}
}

0 comments on commit 43ce320

Please sign in to comment.