rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add timer proxy 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@181 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2008-11-15 02:03:13 +00:00
parent 84bc14daf8
commit a9b7bfae73
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
log4j.properties
View File

@ -1,4 +1,4 @@
log4j.rootLogger=warn, stdout, file
log4j.rootLogger=info, stdout, file
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@ -9,4 +9,3 @@ log4j.appender.file.File=romraider.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%-5r %-5p [%t] - %m%n
log4j.logger.com.romraider.util.proxy.TimeWrapper=trace

9
src/com/romraider/io/connection/ConnectionManagerFactory.java
View File

@ -2,16 +2,25 @@ package com.romraider.io.connection;
import com.romraider.io.j2534.api.J2534ConnectionManager;
import com.romraider.io.serial.connection.SerialConnectionManager;
import static com.romraider.util.proxy.Proxifier.proxy;
import com.romraider.util.proxy.TimerWrapper;
import org.apache.log4j.Logger;
import static org.apache.log4j.Logger.getLogger;
public final class ConnectionManagerFactory {
private static final Logger LOGGER = getLogger(ConnectionManagerFactory.class);
private static final boolean ENABLE_TIMER = false;
private ConnectionManagerFactory() {
}
public static ConnectionManager getManager(String portName, ConnectionProperties connectionProperties) {
ConnectionManager manager = manager(portName, connectionProperties);
if (ENABLE_TIMER) return proxy(manager, TimerWrapper.class);
return manager;
}
private static ConnectionManager manager(String portName, ConnectionProperties connectionProperties) {
try {
return new J2534ConnectionManager(connectionProperties);
} catch (Throwable t) {

8
src/com/romraider/io/j2534/api/J2534ConnectionManager.java
View File

@ -23,22 +23,22 @@ package com.romraider.io.j2534.api;
import com.romraider.io.connection.ConnectionManager;
import com.romraider.io.connection.ConnectionProperties;
import com.romraider.io.j2534.op20.J2534OpenPort20;
import com.romraider.io.j2534.op20.Old_J2534OpenPort20;
import static com.romraider.io.j2534.op20.OpenPort20.CONFIG_P1_MAX;
import static com.romraider.io.j2534.op20.OpenPort20.CONFIG_P3_MIN;
import static com.romraider.io.j2534.op20.OpenPort20.CONFIG_P4_MIN;
import static com.romraider.io.j2534.op20.OpenPort20.FLAG_ISO9141_NO_CHECKSUM;
import static com.romraider.io.j2534.op20.OpenPort20.PROTOCOL_ISO9141;
import static com.romraider.util.ParamChecker.checkNotNull;
import static com.romraider.util.proxy.Proxifier.proxy;
import com.romraider.util.proxy.TimerWrapper;
import org.apache.log4j.Logger;
import static org.apache.log4j.Logger.getLogger;
public final class J2534ConnectionManager implements ConnectionManager {
private static final Logger LOGGER = getLogger(J2534ConnectionManager.class);
private final J2534 api = new Old_J2534OpenPort20(PROTOCOL_ISO9141);
// private final J2534 api = new J2534OpenPort20(PROTOCOL_ISO9141);
// private final J2534 api = proxy(new Old_J2534OpenPort20(PROTOCOL_ISO9141), TimerWrapper.class);
private final J2534 api = proxy(new J2534OpenPort20(PROTOCOL_ISO9141), TimerWrapper.class);
// private final J2534 api = proxy(new J2534OpenPort20(PROTOCOL_ISO9141), TimerWrapper.class);
private int channelId;
private int deviceId;
private int msgId;

3
src/com/romraider/util/proxy/TimerWrapper.java
View File

@ -26,9 +26,8 @@ public final class TimerWrapper implements Wrapper {
}
private void log(Method method, long time) {
if (!LOGGER.isTraceEnabled()) return;
String c = delegate.getClass().getSimpleName();
String m = method.getName();
LOGGER.trace("[TIMER] - " + c + "." + m + ": " + time + "ms");
LOGGER.error("[TIMER] - " + c + "." + m + ": " + time + "ms");
}
}