- logback-dev - mailman3.qos.ch

svn commit: r511 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 06 Sep '06

06 Sep '06

Author: seb Date: Wed Sep 6 09:30:10 2006 New Revision: 511 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: added a new test result Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Wed Sep 6 09:30:10 2006 @@ -18,7 +18,7 @@ int loopNumber = 10000; int resetFrequency = 100; - int pauseFrequency = 100; + int pauseFrequency = 500; long pauseLengthInMillis = 20; /** @@ -77,6 +77,15 @@ * | LoggEvent Ext | 10000 | 106442 | 649984 | * | LoggEvent Ser | 10000 | 93467 | 855984 | * pauseFrequency = 200 and pauseLengthInMillis = 50 + * + * External MockServer with 45 letters-long message: + * WARNING: This test was done by sending _always the same_ logger object. + * | | Runs | Avg time | Data sent | + * | MinimalObj Ext | 10000 | 28739 | 123604 | + * | MinimalObj Ser | 10000 | 27431 | 129604 | + * | LoggEvent Ext | 10000 | 30112 | 125604 | + * | LoggEvent Ser | 10000 | 26059 | 153404 | + * pauseFrequency = 500 and pauseLengthInMillis = 50 */ public void setUp() throws Exception { @@ -103,12 +112,14 @@ public void runPerfTest(Builder builder, String label) throws Exception { //long time1 = System.nanoTime(); + Object builtObject = builder.build(1); + // first run for just in time compiler int resetCounter = 0; int pauseCounter = 0; for (int i = 0; i < loopNumber; i++) { try { - oos.writeObject(builder.build(i)); + oos.writeObject(builtObject); oos.flush(); if (++resetCounter >= resetFrequency) { oos.reset(); @@ -133,7 +144,7 @@ for (int i = 0; i < loopNumber; i++) { try { t1 = System.nanoTime(); - oos.writeObject(builder.build(i)); + oos.writeObject(builtObject); oos.flush(); t2 = System.nanoTime(); total += (t2 - t1);

1 0

svn commit: r510 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 05 Sep '06

05 Sep '06

Author: seb Date: Tue Sep 5 20:59:03 2006 New Revision: 510 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Tue Sep 5 20:59:03 2006 @@ -18,8 +18,8 @@ int loopNumber = 10000; int resetFrequency = 100; - int pauseFrequency = 200; - long pauseLengthInMillis = 50; + int pauseFrequency = 100; + long pauseLengthInMillis = 20; /** * Run the test with a MockSocketServer or with a NOPOutputStream @@ -112,7 +112,7 @@ oos.flush(); if (++resetCounter >= resetFrequency) { oos.reset(); - //resetCounter = 0; + resetCounter = 0; } if (++pauseCounter >= pauseFrequency) { Thread.sleep(pauseLengthInMillis); @@ -139,7 +139,7 @@ total += (t2 - t1); if (++resetCounter >= resetFrequency) { oos.reset(); - //resetCounter = 0; + resetCounter = 0; } if (++pauseCounter >= pauseFrequency) { Thread.sleep(pauseLengthInMillis);

1 0

svn commit: r509 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 05 Sep '06

05 Sep '06

Author: seb Date: Tue Sep 5 18:19:53 2006 New Revision: 509 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: minor fix Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Tue Sep 5 18:19:53 2006 @@ -22,7 +22,7 @@ appender.setName("smtp"); appender.setFrom("user(a)host.dom"); appender.setLayout(buildLayout(lc)); - appender.setSMTPHost("mail.qos.ch"); + appender.setSMTPHost("mail2.qos.ch"); appender.setSubject("logging report"); appender.setTo("sebastien.nospam(a)qos.ch"); appender.start();

1 0

svn commit: r508 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net: . testObjectBuilders
by noreply.seb＠qos.ch 05 Sep '06

05 Sep '06

Author: seb Date: Tue Sep 5 18:19:17 2006 New Revision: 508 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Log: improved performance tests Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java Tue Sep 5 18:19:17 2006 @@ -1,7 +1,6 @@ package ch.qos.logback.classic.net; -import java.io.BufferedInputStream; -import java.io.ObjectInputStream; +import java.io.InputStream; import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; @@ -16,7 +15,7 @@ static final int PORT = 4560; - static int loopLen; + //static int loopLen; static int clientNumber; static List<String> msgList = new ArrayList<String>(); @@ -25,10 +24,9 @@ String className = LOGGINGEVENT; public static void main(String[] args) { - if (args.length == 2) { + if (args.length == 1) { clientNumber = Integer.parseInt(args[0]); - loopLen = Integer.parseInt((args[1])); - System.out.println("Starting Server..."); + //loopLen = Integer.parseInt((args[1])); runServer(); } else { usage("Wrong number of arguments."); @@ -37,29 +35,39 @@ static void usage(String msg) { System.err.println(msg); - System.err.println("Usage: java " - + ExternalMockSocketServer.class.getName() + " clientNumber loopNumber"); + System.err + .println("Usage: java " + ExternalMockSocketServer.class.getName() + + " loopNumber"); System.exit(1); } static void runServer() { - ObjectInputStream ois; - Object readObject; + try { - System.out.println("Listening on port " + PORT); + System.out.println("Starting Server..."); ServerSocket serverSocket = new ServerSocket(PORT); + System.out.println("Listening on port " + PORT); for (int j = 0; j < clientNumber; j++) { Socket socket = serverSocket.accept(); System.out.println("New client accepted."); System.out.println("Connected to client at " + socket.getInetAddress()); - ois = new ObjectInputStream(new BufferedInputStream(socket - .getInputStream())); - for (int i = 0; i < loopLen; i++) { - readObject = ois.readObject(); - //msgList.add(readObject.toString()); + + InputStream is = socket.getInputStream(); + long sum = 0; + + while (true) { + // this call is blocking + int val = is.read(); + if(val == -1) { + break; + } + // if a byte is available, we skip it. + // this allows to pass all available bytes in a quick manner. + int a = is.available(); + sum += a + 1; + is.skip(a); } - ois.close(); - System.out.println("Finished with this client."); + System.out.println(sum); } serverSocket.close(); } catch (Exception se) { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Tue Sep 5 18:19:17 2006 @@ -18,6 +18,9 @@ int loopNumber = 10000; int resetFrequency = 100; + int pauseFrequency = 200; + long pauseLengthInMillis = 50; + /** * Run the test with a MockSocketServer or with a NOPOutputStream */ @@ -26,41 +29,54 @@ * * Run with external mock can be done using the * ExternalMockSocketServer. It needs to be launched - * from a separate JVM. + * from a separate JVM. The ExternalMockSocketServer does not + * consume the events but passes through the available bytes + * that it is recieving. * * - * For example, with 4 test methods and a loopNumber of 10000, + * For example, with 4 test methods, * you can launch the ExternalMockSocketServer this way: * * - * <code>java ch.qos.logback.classic.net.ExternalMockSocketServer 4 20000</code> - * - * - * (20000 because each methods iterate twice). + * <code>java ch.qos.logback.classic.net.ExternalMockSocketServer 4</code> * */ boolean runWithExternalMockServer = true; /** * Last results: + * Data sent mesured in bytes. + * Avg time mesured in nanos. * * NOPOutputStream: - * Minimal Object externalization: average time = 6511 after 10000 writes. - * Minimal Object serialization: average time = 7883 after 10000 writes. - * LoggingEvent object externalization: average time = 9641 after 10000 writes. - * LoggingEvent object serialization: average time = 25729 after 10000 writes. + * | | Runs | Avg time | Data sent | + * | MinimalObj Ext | 10000 | 6511 | | + * | MinimalObj Ser | 10000 | 7883 | | + * | LoggEvent Ext | 10000 | 9641 | | + * | LoggEvent Ser | 10000 | 25729 | | * * Internal MockServer: - * Minimal object externalization : average time = 62040 after 10000 writes. - * Minimal object serialization : average time = 76237 after 10000 writes. - * LoggingEvent object externalization : average time = 122714 after 10000 writes. - * LoggingEvent object serialization : average time = 121711 after 10000 writes. + * | | Runs | Avg time | Data sent | + * | MinimalObj Ext | 10000 | 62040 | | + * | MinimalObj Ser | 10000 | 76237 | | + * | LoggEvent Ext | 10000 | 122714 | | + * | LoggEvent Ser | 10000 | 121711 | | * - * External MockServer: - * Minimal object externalization : average time = 55577 after 10000 writes. - * Minimal object serialization : average time = 56669 after 10000 writes. - * LoggingEvent object externalization : average time = 121477 after 10000 writes. - * LoggingEvent object serialization : average time = 111148 after 10000 writes. + * External MockServer with 45 letters-long message: + * | | Runs | Avg time | Data sent | + * | MinimalObj Ext | 10000 | 70240 | 1171384 | + * | MinimalObj Ser | 10000 | 62754 | 1157584 | + * | LoggEvent Ext | 10000 | 198910 | 1509984 | + * | LoggEvent Ser | 10000 | 189970 | 1715984 | + * pauseFrequency = 200 and pauseLengthInMillis = 50 + * + * External MockServer with 2 letters-long message: + * | | Runs | Avg time | Data sent | + * | MinimalObj Ext | 10000 | 43234 | 311384 | + * | MinimalObj Ser | 10000 | 31603 | 297584 | + * | LoggEvent Ext | 10000 | 106442 | 649984 | + * | LoggEvent Ser | 10000 | 93467 | 855984 | + * pauseFrequency = 200 and pauseLengthInMillis = 50 */ public void setUp() throws Exception { @@ -85,15 +101,22 @@ } public void runPerfTest(Builder builder, String label) throws Exception { + //long time1 = System.nanoTime(); // first run for just in time compiler - int counter = 0; + int resetCounter = 0; + int pauseCounter = 0; for (int i = 0; i < loopNumber; i++) { try { oos.writeObject(builder.build(i)); oos.flush(); - if (++counter >= resetFrequency) { + if (++resetCounter >= resetFrequency) { oos.reset(); + //resetCounter = 0; + } + if (++pauseCounter >= pauseFrequency) { + Thread.sleep(pauseLengthInMillis); + pauseCounter = 0; } } catch (IOException ex) { fail(ex.getMessage()); @@ -102,24 +125,30 @@ // second run Long t1; - Long t2; + Long t2 ; Long total = 0L; - counter = 0; - // System.out.println("Beginning mesured run"); - t1 = System.nanoTime(); + resetCounter = 0; + pauseCounter = 0; + //System.out.println("Beginning mesured run"); for (int i = 0; i < loopNumber; i++) { try { + t1 = System.nanoTime(); oos.writeObject(builder.build(i)); oos.flush(); - if (++counter >= resetFrequency) { + t2 = System.nanoTime(); + total += (t2 - t1); + if (++resetCounter >= resetFrequency) { oos.reset(); + //resetCounter = 0; + } + if (++pauseCounter >= pauseFrequency) { + Thread.sleep(pauseLengthInMillis); + pauseCounter = 0; } } catch (IOException ex) { fail(ex.getMessage()); } } - t2 = System.nanoTime(); - total += (t2 - t1); System.out.println(label + " : average time = " + total / loopNumber + " after " + loopNumber + " writes."); @@ -127,6 +156,9 @@ mockServer.join(1000); assertTrue(mockServer.finished); } + + //long time2 = System.nanoTime(); + //System.out.println("********* -> Time needed to run the test method: " + Long.toString(time2-time1)); } public void testWithMinimalExternalization() throws Exception { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java Tue Sep 5 18:19:17 2006 @@ -2,6 +2,7 @@ public interface Builder { + //45 characters message final String MSG_PREFIX = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa"; //final String MSG_PREFIX = "a"; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java Tue Sep 5 18:19:17 2006 @@ -10,7 +10,6 @@ LoggingEvent2 le = new LoggingEvent2(); le.setLevel(Level.DEBUG); le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); - // 45 characters message le.setMessage(MSG_PREFIX + i); le.setThreadName("threadName"); return le; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java Tue Sep 5 18:19:17 2006 @@ -10,7 +10,6 @@ LoggingEvent le = new LoggingEvent(); le.setLevel(Level.DEBUG); le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); - // 45 characters message le.setMessage(MSG_PREFIX + i); le.setThreadName("threadName"); return le; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java Tue Sep 5 18:19:17 2006 @@ -25,7 +25,6 @@ } public MinimalExt(int i) { - // 45 characters message message = Builder.MSG_PREFIX + i; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Tue Sep 5 18:19:17 2006 @@ -18,7 +18,6 @@ String message; public MinimalSer(int i) { - // 45 characters message message = Builder.MSG_PREFIX + i; } } \ No newline at end of file

1 0

svn commit: r507 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders
by noreply.seb＠qos.ch 05 Sep '06

05 Sep '06

Author: seb Date: Tue Sep 5 08:59:25 2006 New Revision: 507 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Log: better message forming Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java Tue Sep 5 08:59:25 2006 @@ -2,5 +2,8 @@ public interface Builder { + final String MSG_PREFIX = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa"; + //final String MSG_PREFIX = "a"; + Object build(int i); } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java Tue Sep 5 08:59:25 2006 @@ -11,7 +11,7 @@ le.setLevel(Level.DEBUG); le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); // 45 characters message - le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); + le.setMessage(MSG_PREFIX + i); le.setThreadName("threadName"); return le; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java Tue Sep 5 08:59:25 2006 @@ -11,7 +11,7 @@ le.setLevel(Level.DEBUG); le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); // 45 characters message - le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); + le.setMessage(MSG_PREFIX + i); le.setThreadName("threadName"); return le; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java Tue Sep 5 08:59:25 2006 @@ -26,7 +26,7 @@ public MinimalExt(int i) { // 45 characters message - message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + message = Builder.MSG_PREFIX + i; } public void readExternal(ObjectInput in) throws IOException, Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Tue Sep 5 08:59:25 2006 @@ -19,6 +19,6 @@ public MinimalSer(int i) { // 45 characters message - message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + message = Builder.MSG_PREFIX + i; } } \ No newline at end of file

1 0

svn commit: r506 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 05 Sep '06

05 Sep '06

Author: seb Date: Tue Sep 5 08:57:57 2006 New Revision: 506 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Log: back to a normal RESET_FREQUENCY. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Tue Sep 5 08:57:57 2006 @@ -125,8 +125,7 @@ int counter = 0; // reset the ObjectOutputStream every 70 calls - // private static final int RESET_FREQUENCY = 70; - private static final int RESET_FREQUENCY = 1; + private static final int RESET_FREQUENCY = 70; public SocketAppender() { }

1 0

svn commit: r505 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 18:34:38 2006 New Revision: 505 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: added an ExternalMockSocketServer and modified test case to allow tests to run with a server in a different jvm Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java Thu Aug 31 18:34:38 2006 @@ -0,0 +1,72 @@ +package ch.qos.logback.classic.net; + +import java.io.BufferedInputStream; +import java.io.ObjectInputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.ArrayList; +import java.util.List; + +public class ExternalMockSocketServer { + + static final String LOGGINGEVENT = "LoggingEvent"; + static final String LOGGINGEVENT2 = "LoggingEvent2"; + static final String MINIMALEXT = "MinimalExt"; + static final String MINIMALSER = "MinimalSer"; + + static final int PORT = 4560; + + static int loopLen; + static int clientNumber; + + static List<String> msgList = new ArrayList<String>(); + static boolean finished = false; + + String className = LOGGINGEVENT; + + public static void main(String[] args) { + if (args.length == 2) { + clientNumber = Integer.parseInt(args[0]); + loopLen = Integer.parseInt((args[1])); + System.out.println("Starting Server..."); + runServer(); + } else { + usage("Wrong number of arguments."); + } + } + + static void usage(String msg) { + System.err.println(msg); + System.err.println("Usage: java " + + ExternalMockSocketServer.class.getName() + " clientNumber loopNumber"); + System.exit(1); + } + + static void runServer() { + ObjectInputStream ois; + Object readObject; + try { + System.out.println("Listening on port " + PORT); + ServerSocket serverSocket = new ServerSocket(PORT); + for (int j = 0; j < clientNumber; j++) { + Socket socket = serverSocket.accept(); + System.out.println("New client accepted."); + System.out.println("Connected to client at " + socket.getInetAddress()); + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); + for (int i = 0; i < loopLen; i++) { + readObject = ois.readObject(); + //msgList.add(readObject.toString()); + } + ois.close(); + System.out.println("Finished with this client."); + } + serverSocket.close(); + } catch (Exception se) { + se.printStackTrace(); + } + System.out.println("Server finished."); + finished = true; + } + +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Thu Aug 31 18:34:38 2006 @@ -22,28 +22,54 @@ * Run the test with a MockSocketServer or with a NOPOutputStream */ boolean runWithMockServer = true; + /** + * + * Run with external mock can be done using the + * ExternalMockSocketServer. It needs to be launched + * from a separate JVM. + * + * + * For example, with 4 test methods and a loopNumber of 10000, + * you can launch the ExternalMockSocketServer this way: + * + * + * <code>java ch.qos.logback.classic.net.ExternalMockSocketServer 4 20000</code> + * + * + * (20000 because each methods iterate twice). + * + */ + boolean runWithExternalMockServer = true; /** * Last results: * * NOPOutputStream: - * Minimal Object Externalization: average time = 6511 after 10000 writes. - * Minimal Object Serialization: average time = 7883 after 10000 writes. - * Externalization: average time = 9641 after 10000 writes. - * Serialization: average time = 25729 after 10000 writes. + * Minimal Object externalization: average time = 6511 after 10000 writes. + * Minimal Object serialization: average time = 7883 after 10000 writes. + * LoggingEvent object externalization: average time = 9641 after 10000 writes. + * LoggingEvent object serialization: average time = 25729 after 10000 writes. * - * MockServer: + * Internal MockServer: * Minimal object externalization : average time = 62040 after 10000 writes. * Minimal object serialization : average time = 76237 after 10000 writes. * LoggingEvent object externalization : average time = 122714 after 10000 writes. * LoggingEvent object serialization : average time = 121711 after 10000 writes. + * + * External MockServer: + * Minimal object externalization : average time = 55577 after 10000 writes. + * Minimal object serialization : average time = 56669 after 10000 writes. + * LoggingEvent object externalization : average time = 121477 after 10000 writes. + * LoggingEvent object serialization : average time = 111148 after 10000 writes. */ public void setUp() throws Exception { super.setUp(); if (runWithMockServer) { - mockServer = new MockSocketServer(loopNumber * 2); - mockServer.start(); + if (!runWithExternalMockServer) { + mockServer = new MockSocketServer(loopNumber * 2); + mockServer.start(); + } oos = new ObjectOutputStream(new Socket("localhost", MockSocketServer.PORT).getOutputStream()); } else { @@ -70,7 +96,7 @@ oos.reset(); } } catch (IOException ex) { - fail(); + fail(ex.getMessage()); } } @@ -89,7 +115,7 @@ oos.reset(); } } catch (IOException ex) { - fail(); + fail(ex.getMessage()); } } t2 = System.nanoTime(); @@ -97,7 +123,7 @@ System.out.println(label + " : average time = " + total / loopNumber + " after " + loopNumber + " writes."); - if (runWithMockServer) { + if (runWithMockServer && !runWithExternalMockServer) { mockServer.join(1000); assertTrue(mockServer.finished); }

1 0

svn commit: r504 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 15:25:27 2006 New Revision: 504 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Log: tests are back Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Thu Aug 31 15:25:27 2006 @@ -0,0 +1,113 @@ +package ch.qos.logback.classic.net; + +import javax.mail.Address; +import javax.mail.MessagingException; + +import junit.framework.TestCase; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.Layout; + +public class SMTPAppenderTest extends TestCase { + + SMTPAppender appender; + + public void setUp() throws Exception { + super.setUp(); + LoggerContext lc = new LoggerContext(); + appender = new SMTPAppender(); + appender.setContext(lc); + appender.setName("smtp"); + appender.setFrom("user(a)host.dom"); + appender.setLayout(buildLayout(lc)); + appender.setSMTPHost("mail.qos.ch"); + appender.setSubject("logging report"); + appender.setTo("sebastien.nospam(a)qos.ch"); + appender.start(); + } + + public void tearDown() throws Exception { + super.tearDown(); + appender = null; + } + + public void testStart() { + try { + Address[] addressArray = appender.msg.getFrom(); + Address address = addressArray[0]; + assertEquals("user(a)host.dom", address.toString()); + + addressArray = null; + address = null; + + addressArray = appender.msg.getAllRecipients(); + address = addressArray[0]; + assertEquals("sebastien.nospam(a)qos.ch", address.toString()); + + assertEquals("logging report", appender.msg.getSubject()); + + assertTrue(appender.isStarted()); + + } catch (MessagingException ex) { + fail("Unexpected exception."); + } + } + + public void testAppendNonTriggeringEvent() { + LoggingEvent event = new LoggingEvent(); + event.setThreadName("thead name"); + event.setLevel(Level.DEBUG); + appender.append(event); + assertEquals(1, appender.cb.length()); + } + + public void testEntryConditionsCheck() { + appender.checkEntryConditions(); + assertEquals(0, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoMessage() { + appender.msg = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoEvaluator() { + appender.evaluator = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoLayout() { + appender.setLayout(null); + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + + public void testDefaultEvaluatorNoTrigger() { + DefaultEvaluator evaluator = new DefaultEvaluator(); + LoggingEvent le = new LoggingEvent(); + le.setLevel(Level.DEBUG); + assertFalse(evaluator.isTriggeringEvent(null,le)); + } + + public void testDefaultEvaluatorTrigger() { + DefaultEvaluator evaluator = new DefaultEvaluator(); + LoggingEvent le = new LoggingEvent(); + le.setLevel(Level.ERROR); + assertTrue(evaluator.isTriggeringEvent(null,le)); + } + + private static Layout buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFooter("Some footer"); + layout.start(); + return layout; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Thu Aug 31 15:25:27 2006 @@ -0,0 +1,48 @@ +package ch.qos.logback.classic.net; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.util.StatusPrinter; + +public class SMTPAppenderTestApp { + + public static void main(String[] args) { + + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SMTPAppender appender = new SMTPAppender(); + appender.setContext(lc); + appender.setName("smtp"); + appender.setFrom("user(a)host.dom"); + appender.setLayout(buildLayout(lc)); + appender.setSMTPHost("mail.qos.ch"); + appender.setSubject("logging report"); + appender.setTo("sebastien.nospam(a)qos.ch"); + + appender.start(); + + logger.addAppender(appender); + + for (int i = 0; i <= 10; i++) { + logger.debug("** Hello world. n=" + i); + } + logger.error("Triggering request"); + + StatusPrinter.print(lc.getStatusManager()); + } + + private static Layout buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFooter("Some footer"); + layout.start(); + return layout; + } + +}

1 0

svn commit: r503 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 15:24:59 2006 New Revision: 503 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: tmp delete

1 0

svn commit: r502 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 15:02:06 2006 New Revision: 502 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Log: - corrected writeObject method Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Thu Aug 31 15:02:06 2006 @@ -253,7 +253,7 @@ private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); out.writeObject(logger.getName()); - out.writeObject(level.levelInt); + out.writeInt(level.levelInt); } private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {

1 0