diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:13:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:13:09 +0000 |
commit | d60b333423d146a4fb1763bec984885e1ae9aed1 (patch) | |
tree | b5d896716579f774f701defa6118131093a04899 | |
parent | 5f349cb8a61c476adc9b36df33a180aa454aa7b9 (diff) | |
parent | b2502802c4b488efe62bd0e8eba0a3d6cc4bdd50 (diff) | |
download | vogar-simpleperf-release.tar.gz |
Snap for 11510257 from b2502802c4b488efe62bd0e8eba0a3d6cc4bdd50 to simpleperf-releasesimpleperf-release
Change-Id: I6e384ae7aa8de505b397f3e0449e778a71997159
-rw-r--r-- | src/vogar/monitor/InterleavedReader.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/vogar/monitor/InterleavedReader.java b/src/vogar/monitor/InterleavedReader.java index 2f9f15a..a97ba56 100644 --- a/src/vogar/monitor/InterleavedReader.java +++ b/src/vogar/monitor/InterleavedReader.java @@ -78,7 +78,15 @@ public final class InterleavedReader implements Closeable { int textEnd; while (true) { - int r = reader.read(buffer, count, buffer.length - count); + int r = -1; + + try { + r = reader.read(buffer, count, buffer.length - count); + } catch (IOException e) { + // When running under gcstress, the output stream may be closed outside our control when + // the target process exits. In order to allow this, catch the stream closed exception and + // return whatever has been buffered already. (b/308917607) + } if (r == -1) { // the input is exhausted; return the remaining characters |