added more logs
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2ce8282e Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2ce8282e Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2ce8282e Branch: refs/heads/2.19.2-experimental Commit: 2ce8282ee51dc8d5564d186c6392d9a0ca4f32cb Parents: 8f6f855 Author: Tibor17 <tibo...@lycos.com> Authored: Tue Feb 28 22:46:00 2017 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Tue Feb 28 22:46:00 2017 +0100 ---------------------------------------------------------------------- .../lazytestprovider/AbstractCommandStream.java | 5 +++-- .../AbstractForkInputStream.java | 4 ++-- .../OutputStreamFlushableCommandline.java | 2 +- .../TestProvidingInputStream.java | 20 ++++++++++++++------ .../booterclient/output/ForkClient.java | 3 ++- .../output/ThreadedStreamConsumer.java | 8 ++++---- 6 files changed, 26 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java index d7d33f8..58cac1f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java @@ -106,7 +106,8 @@ public abstract class AbstractCommandStream } Command cmd = nextCommand(); - System.out.println( getClass().getSimpleName() + " will send " + cmd.getCommandType() ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " will send " + cmd.getCommandType() ); lastCommand = cmd.getCommandType(); buffer = lastCommand.hasDataType() ? lastCommand.encode( cmd.getData() ) : lastCommand.encode(); } @@ -127,7 +128,7 @@ public abstract class AbstractCommandStream offset = 8; len = toInt( currentBuffer, 4 ); } - System.out.println( getClass().getSimpleName() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " last byte sent of cmd " + lastCommand + " " http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java index 95e742a..97eef61 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java @@ -41,7 +41,7 @@ public abstract class AbstractForkInputStream */ public void setFlushReceiverProvider( FlushReceiverProvider flushReceiverProvider ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " :: setFlushReceiverProvider() :: " + flushReceiverProvider ); this.flushReceiverProvider = requireNonNull( flushReceiverProvider ); } @@ -54,7 +54,7 @@ public abstract class AbstractForkInputStream FlushReceiver flushReceiver = flushReceiverProvider.getFlushReceiver(); if ( flushReceiver != null ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " :: tryFlush() :: flushReceiver.flush();" ); flushReceiver.flush(); return true; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java index ed54489..b92a7dd 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java @@ -73,7 +73,7 @@ public class OutputStreamFlushableCommandline { System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " :: execute() :: flushReceiver is set!!!" ); - flushReceiver = new OutputStreamFlushReceiver( process.getOutputStream() ); + //flushReceiver = new OutputStreamFlushReceiver( process.getOutputStream() ); } return process; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java index e05fad2..c2dad9f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java @@ -116,10 +116,15 @@ public final class TestProvidingInputStream if ( cmd == null ) { String cmdData = testClassNames.poll(); - return cmdData == null ? Command.TEST_SET_FINISHED : toRunClass( cmdData ); + Command c = cmdData == null ? Command.TEST_SET_FINISHED : toRunClass( cmdData ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: nextCommand() :: " + c.getCommandType() + " " + c.getData() ); + return c; } else { + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: nextCommand() :: " + cmd.getCommandType() + " " + cmd.getData() ); return cmd; } } @@ -148,10 +153,12 @@ public final class TestProvidingInputStream */ public void provideNewTest() { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + " :: provideNewTest() :: before if" ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: provideNewTest() :: before if" ); if ( canContinue() ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + " :: provideNewTest() :: after if" ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: provideNewTest() :: after if" ); barrier.release(); } } @@ -161,7 +168,8 @@ public final class TestProvidingInputStream { if ( closed.compareAndSet( false, true ) ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + " :: close()" ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: close()" ); invalidateInternalBuffer(); barrier.drainPermits(); barrier.release(); @@ -173,10 +181,10 @@ public final class TestProvidingInputStream { try { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " :: awaitNextTest() :: before acquire" ); barrier.acquire(); - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " :: awaitNextTest() :: after acquire" ); } catch ( InterruptedException e ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java index 2d00244..7f7f4b9 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java @@ -177,7 +177,8 @@ public class ForkClient private void processLine( String s ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + " :: processLine() :: " + s ); + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + + " :: processLine() :: " + s ); try { final byte operationId = (byte) s.charAt( 0 ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2ce8282e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java index 18a3083..2b07308 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java @@ -120,7 +120,7 @@ public final class ThreadedStreamConsumer { if ( stop && !thread.isAlive() ) { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " consumeLine() :: items.clear()." ); items.clear(); return; @@ -128,7 +128,7 @@ public final class ThreadedStreamConsumer try { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " consumeLine() :: items.put( s ) :: " + s ); items.put( s ); } @@ -142,7 +142,7 @@ public final class ThreadedStreamConsumer public void close() throws IOException { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " close()" ); if ( stop ) { @@ -151,7 +151,7 @@ public final class ThreadedStreamConsumer try { - System.out.println( getClass().getSimpleName() + "#" + hashCode() + System.out.println( System.currentTimeMillis() + " " + getClass().getSimpleName() + "#" + hashCode() + " close() :: END_ITEM" ); items.put( END_ITEM ); thread.join( CLOSE_TIMEOUT_MILLIS );
