You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/12/29 02:29:52 UTC

[maven-surefire] 03/03: [SUREFIRE-1516] Poor performance in reuseForks=false

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 5148b02ba552cd79ac212b869dec10d01ba4d2e6
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Dec 27 19:35:50 2019 +0100

    [SUREFIRE-1516] Poor performance in reuseForks=false
---
 .../main/java/org/apache/maven/surefire/booter/CommandReader.java   | 6 ++++++
 .../fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
index b71aec0..2e735d9 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -412,6 +412,12 @@ public final class CommandReader
                                 CommandReader.this.wakeupIterator();
                                 callListeners( command );
                                 break;
+                            case BYE_ACK:
+                                callListeners( command );
+                                // After SHUTDOWN no more commands can come.
+                                // Hence, do NOT go back to blocking in I/O.
+                                CommandReader.this.state.set( TERMINATED );
+                                break;
                             default:
                                 callListeners( command );
                                 break;
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
index a2dc6cb..c1cdb04 100644
--- a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
@@ -23,7 +23,7 @@ public abstract class BaseForkTimeout
 {
     protected void dumpStuff( String prefix )
     {
-        reallySleep( 990 );
+        reallySleep( 1350L );
         for ( int i = 0; i < 200; i++ )
         {
             System.out.println( prefix + " with lots of output " + i );