archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8215412: Optimize PrintStream.println methods

Browse source 
Reviewed-by: rriggs, dfuchs, forax
This commit is contained in:
Claes Redestad 2019-01-04 20:58:35 +01:00
parent c3eb2e9d16
commit 346018251f
1 changed files with 116 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

146
src/java.base/share/classes/java/io/PrintStream.java
View file

@ -575,7 +575,7 @@ public class PrintStream extends FilterOutputStream
* stream occur as promptly as with the original PrintStream. * stream occur as promptly as with the original PrintStream.
*/ */
private void write(char buf[]) { private void write(char[] buf) {
try { try {
synchronized (this) { synchronized (this) {
ensureOpen(); ensureOpen();
@ -584,10 +584,34 @@ public class PrintStream extends FilterOutputStream
charOut.flushBuffer(); charOut.flushBuffer();
if (autoFlush) { if (autoFlush) {
for (int i = 0; i < buf.length; i++) for (int i = 0; i < buf.length; i++)
if (buf[i] == '\n') if (buf[i] == '\n') {
out.flush(); out.flush();
break;
}
} }
} }
} catch (InterruptedIOException x) {
Thread.currentThread().interrupt();
} catch (IOException x) {
trouble = true;
}
}
// Used to optimize away back-to-back flushing and synchronization when
// using println, but since subclasses could exist which depend on
// observing a call to print followed by newLine() we only use this if
// getClass() == PrintStream.class to avoid compatibility issues.
private void writeln(char[] buf) {
try {
synchronized (this) {
ensureOpen();
textOut.write(buf);
textOut.newLine();
textOut.flushBuffer();
charOut.flushBuffer();
if (autoFlush)
out.flush();
}
} }
catch (InterruptedIOException x) { catch (InterruptedIOException x) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
@ -616,6 +640,30 @@ public class PrintStream extends FilterOutputStream
} }
} }
// Used to optimize away back-to-back flushing and synchronization when
// using println, but since subclasses could exist which depend on
// observing a call to print followed by newLine we only use this if
// getClass() == PrintStream.class to avoid compatibility issues.
private void writeln(String s) {
try {
synchronized (this) {
ensureOpen();
textOut.write(s);
textOut.newLine();
textOut.flushBuffer();
charOut.flushBuffer();
if (autoFlush)
out.flush();
}
}
catch (InterruptedIOException x) {
Thread.currentThread().interrupt();
}
catch (IOException x) {
trouble = true;
}
}
private void newLine() { private void newLine() {
try { try {
synchronized (this) { synchronized (this) {
@ -780,9 +828,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code boolean} to be printed * @param x The {@code boolean} to be printed
*/ */
public void println(boolean x) { public void println(boolean x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -794,9 +846,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code char} to be printed. * @param x The {@code char} to be printed.
*/ */
public void println(char x) { public void println(char x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -808,9 +864,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code int} to be printed. * @param x The {@code int} to be printed.
*/ */
public void println(int x) { public void println(int x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -822,9 +882,13 @@ public class PrintStream extends FilterOutputStream
* @param x a The {@code long} to be printed. * @param x a The {@code long} to be printed.
*/ */
public void println(long x) { public void println(long x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -836,9 +900,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code float} to be printed. * @param x The {@code float} to be printed.
*/ */
public void println(float x) { public void println(float x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -850,9 +918,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code double} to be printed. * @param x The {@code double} to be printed.
*/ */
public void println(double x) { public void println(double x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -863,10 +935,14 @@ public class PrintStream extends FilterOutputStream
* *
* @param x an array of chars to print. * @param x an array of chars to print.
*/ */
public void println(char x[]) { public void println(char[] x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(x);
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -878,9 +954,13 @@ public class PrintStream extends FilterOutputStream
* @param x The {@code String} to be printed. * @param x The {@code String} to be printed.
*/ */
public void println(String x) { public void println(String x) {
synchronized (this) { if (getClass() == PrintStream.class) {
print(x); writeln(String.valueOf(x));
newLine(); } else {
synchronized (this) {
print(x);
newLine();
}
} }
} }
@ -895,9 +975,15 @@ public class PrintStream extends FilterOutputStream
*/ */
public void println(Object x) { public void println(Object x) {
String s = String.valueOf(x); String s = String.valueOf(x);
synchronized (this) { if (getClass() == PrintStream.class) {
print(s); // need to apply String.valueOf again since first invocation
newLine(); // might return null
writeln(String.valueOf(s));
} else {
synchronized (this) {
print(s);
newLine();
}
} }
} }