From 4996a955146ff81b8e0c812e60065fac7e3e06e6 Mon Sep 17 00:00:00 2001
From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 9 Apr 2000 04:52:43 +0000
Subject: [PATCH] 2000-04-08 Anthony Green <green@cygnus.com>
* java/lang/StringBuffer.java (ensureCapacity): Don't call Math::max.
(ensureCapacity_unsynchronized): New private method.
(append): Use ensureCapacity_unsynchronized.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33036 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 6 +++++
libjava/java/lang/StringBuffer.java | 38 ++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9040d6d17a27..e0a3a742279b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-08 Anthony Green <green@cygnus.com>
+
+ * java/lang/StringBuffer.java (ensureCapacity): Don't call Math::max.
+ (ensureCapacity_unsynchronized): New private method.
+ (append): Use ensureCapacity_unsynchronized.
+
2000-04-08 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java
index 7f6e42ec9c94..4034e79a2f2b 100644
--- a/libjava/java/lang/StringBuffer.java
+++ b/libjava/java/lang/StringBuffer.java
@@ -28,7 +28,7 @@ public final class StringBuffer implements Serializable
public synchronized StringBuffer append (char ch)
{
- ensureCapacity (count + 1);
+ ensureCapacity_unsynchronized (count + 1);
value[count++] = ch;
return this;
}
@@ -63,7 +63,7 @@ public final class StringBuffer implements Serializable
if (str == null)
str = "null";
int len = str.length();
- ensureCapacity (count + len);
+ ensureCapacity_unsynchronized (count + len);
str.getChars(0, len, value, count);
count += len;
return this;
@@ -76,7 +76,7 @@ public final class StringBuffer implements Serializable
public synchronized StringBuffer append (char[] data, int offset, int count)
{
- ensureCapacity (this.count + count);
+ ensureCapacity_unsynchronized (this.count + count);
System.arraycopy(data, offset, value, this.count, count);
this.count += count;
return this;
@@ -104,7 +104,27 @@ public final class StringBuffer implements Serializable
int max = (minimumCapacity > value.length
? value.length*2+2
: value.length);
- minimumCapacity = Math.max(minimumCapacity, max);
+ minimumCapacity = (minimumCapacity < max ? max : minimumCapacity);
+ char[] nb = new char[minimumCapacity];
+ System.arraycopy(value, 0, nb, 0, count);
+ value = nb;
+ shared = false;
+ }
+ }
+
+ // ensureCapacity is used by several synchronized methods in StringBuffer.
+ // There's no need to synchronize again.
+ private void ensureCapacity_unsynchronized (int minimumCapacity)
+ {
+ if (shared || minimumCapacity > value.length)
+ {
+ // We don't want to make a larger vector when `shared' is
+ // set. If we do, then setLength becomes very inefficient
+ // when repeatedly reusing a StringBuffer in a loop.
+ int max = (minimumCapacity > value.length
+ ? value.length*2+2
+ : value.length);
+ minimumCapacity = (minimumCapacity < max ? max : minimumCapacity);
char[] nb = new char[minimumCapacity];
System.arraycopy(value, 0, nb, 0, count);
value = nb;
@@ -132,7 +152,7 @@ public final class StringBuffer implements Serializable
{
if (offset < 0 || offset > count)
throw new StringIndexOutOfBoundsException (offset);
- ensureCapacity (count+1);
+ ensureCapacity_unsynchronized (count+1);
System.arraycopy(value, offset, value, offset+1, count-offset);
value[offset] = ch;
count++;
@@ -172,7 +192,7 @@ public final class StringBuffer implements Serializable
if (str == null)
str = "null";
int len = str.length();
- ensureCapacity(count+len);
+ ensureCapacity_unsynchronized (count+len);
System.arraycopy(value, offset, value, offset+len, count-offset);
str.getChars(0, len, value, offset);
count += len;
@@ -184,7 +204,7 @@ public final class StringBuffer implements Serializable
if (offset < 0 || offset > count)
throw new StringIndexOutOfBoundsException (offset);
int len = data.length;
- ensureCapacity (count+len);
+ ensureCapacity_unsynchronized (count+len);
System.arraycopy(value, offset, value, offset+len, count-offset);
System.arraycopy(data, 0, value, offset, len);
count += len;
@@ -212,7 +232,7 @@ public final class StringBuffer implements Serializable
if (index < 0 || index >= count)
throw new StringIndexOutOfBoundsException (index);
// Call ensureCapacity to enforce copy-on-write.
- ensureCapacity (count);
+ ensureCapacity_unsynchronized (count);
value[index] = ch;
}
@@ -221,7 +241,7 @@ public final class StringBuffer implements Serializable
if (newLength < 0)
throw new StringIndexOutOfBoundsException (newLength);
- ensureCapacity (newLength);
+ ensureCapacity_unsynchronized (newLength);
for (int i = count; i < newLength; ++i)
value[i] = '\0';
count = newLength;
--
GitLab