mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-19 14:19:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

natIconv.cc (done): New methods.

Browse Source 
2001-07-30  Tom Tromey  <tromey@redhat.com>
	    Corey Minyard  <minyard@acm.org>

	* gnu/gcj/convert/natIconv.cc (done): New methods.
	* gnu/gcj/convert/Output_iconv.java (done): New method.
	* gnu/gcj/convert/Input_iconv.java (done): New method.
	* gnu/gcj/convert/UnicodeToBytes.java (defaultEncodingClass):
	Removed.
	(getDefaultEncodingClass): Removed.
	(getDefaultEncoder): Use getEncoder.
	(done): New method.
	(defaultEncoding, CACHE_SIZE, encoderCache, currCachePos): New
	static fields.
	* gnu/gcj/convert/BytesToUnicode.java (defaultDecodingClass):
	Removed.
	(defaultEncoding, CACHE_SIZE, decoderCache, currCachePos): New
	static fields.
	(getDefaultDecodingClass): Removed.
	(getDefaultDecoder): Use getDecoder.
	(getDecoder): Look up decoder in cache.
	(done): New method.
	* java/lang/natString.cc (init): Call `done' on converter.
	(getBytes): Likewise.

Co-Authored-By: Corey Minyard <minyard@acm.org>

From-SVN: r44484
This commit is contained in:
Tom Tromey 2001-07-30 20:24:18 +00:00 committed by Tom Tromey
parent a08b260482
commit 3d5aea8366
7 changed files with 207 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libjava/ChangeLog
View File

@ -1,3 +1,27 @@
2001-07-30 Tom Tromey <tromey@redhat.com>
Corey Minyard <minyard@acm.org>
* gnu/gcj/convert/natIconv.cc (done): New methods.
* gnu/gcj/convert/Output_iconv.java (done): New method.
* gnu/gcj/convert/Input_iconv.java (done): New method.
* gnu/gcj/convert/UnicodeToBytes.java (defaultEncodingClass):
Removed.
(getDefaultEncodingClass): Removed.
(getDefaultEncoder): Use getEncoder.
(done): New method.
(defaultEncoding, CACHE_SIZE, encoderCache, currCachePos): New
static fields.
* gnu/gcj/convert/BytesToUnicode.java (defaultDecodingClass):
Removed.
(defaultEncoding, CACHE_SIZE, decoderCache, currCachePos): New
static fields.
(getDefaultDecodingClass): Removed.
(getDefaultDecoder): Use getDecoder.
(getDecoder): Look up decoder in cache.
(done): New method.
* java/lang/natString.cc (init): Call `done' on converter.
(getBytes): Likewise.
2001-07-30 Tom Tromey <tromey@redhat.com>
* java/lang/Integer.java: Merged with Classpath.

106
libjava/gnu/gcj/convert/BytesToUnicode.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000 Free Software Foundation
/* Copyright (C) 1999, 2000, 2001 Free Software Foundation
This file is part of libgcj.
@ -18,27 +18,20 @@ public abstract class BytesToUnicode extends IOConverter
/** End of valid bytes in buffer. */
public int inlength;
static Class defaultDecodingClass;
// The name of the default encoding.
static String defaultEncoding;
static synchronized void getDefaultDecodingClass()
{
// Test (defaultDecodingClass == null) again in case of race condition.
if (defaultDecodingClass == null)
{
String encoding = canonicalize (System.getProperty("file.encoding"));
String className = "gnu.gcj.convert.Input_"+encoding;
try
{
defaultDecodingClass = Class.forName(className);
}
catch (ClassNotFoundException ex)
{
throw new NoClassDefFoundError("missing default encoding "
+ encoding + " (class "
+ className + " not found)");
}
}
}
/* These keep a small cache of decoders for reuse. The array holds
the actual decoders. The currCachePos is the next value we are
going to replace in the cache. We don't just throw the data away
if the cache is full, because if the cache filled up with stuff
we don't need then the cache would be worthless. We instead
circulate through the cache the implement kind of an LRU
algorithm. */
private static final int CACHE_SIZE = 4; // A power of 2 for speed
private static BytesToUnicode[] decoderCache
= new BytesToUnicode[CACHE_SIZE];
private static int currCachePos = 0;
public abstract String getName();
@ -46,20 +39,33 @@ public abstract class BytesToUnicode extends IOConverter
{
try
{
if (defaultDecodingClass == null)
getDefaultDecodingClass();
return (BytesToUnicode) defaultDecodingClass.newInstance();
synchronized (BytesToUnicode.class)
{
if (defaultEncoding == null)
{
String encoding
= canonicalize (System.getProperty("file.encoding",
"8859_1"));
String className = "gnu.gcj.convert.Input_" + encoding;
try
{
Class defaultDecodingClass = Class.forName(className);
defaultEncoding = encoding;
}
catch (ClassNotFoundException ex)
{
throw new NoClassDefFoundError("missing default encoding "
+ encoding + " (class "
+ className
+ " not found)");
}
}
}
return getDecoder (defaultEncoding);
}
catch (Throwable ex)
{
try
{
return new Input_iconv (System.getProperty ("file.encoding"));
}
catch (Throwable ex2)
{
return new Input_8859_1();
}
return new Input_8859_1();
}
}
@ -67,6 +73,24 @@ public abstract class BytesToUnicode extends IOConverter
public static BytesToUnicode getDecoder (String encoding)
throws java.io.UnsupportedEncodingException
{
/* First hunt in our cache to see if we have a decoder that is
already allocated. */
synchronized (BytesToUnicode.class)
{
int i;
for (i = 0; i < decoderCache.length; ++i)
{
if (decoderCache[i] != null
&& encoding.equals(decoderCache[i].getName ()))
{
BytesToUnicode rv = decoderCache[i];
decoderCache[i] = null;
return rv;
}
}
}
// It's not in the cache, so now we have to do real work.
String className = "gnu.gcj.convert.Input_" + canonicalize (encoding);
Class decodingClass;
try
@ -120,4 +144,22 @@ public abstract class BytesToUnicode extends IOConverter
* of the length parameter for a read request).
*/
public abstract int read (char[] outbuffer, int outpos, int count);
/** Indicate that the converter is resuable.
* This class keeps track of converters on a per-encoding basis.
* When done with an encoder you may call this method to indicate
* that it can be reused later.
*/
public void done ()
{
synchronized (BytesToUnicode.class)
{
this.inbuffer = null;
this.inpos = 0;
this.inlength = 0;
decoderCache[currCachePos] = this;
currCachePos = (currCachePos + 1) % CACHE_SIZE;
}
}
}

3
libjava/gnu/gcj/convert/Input_iconv.java
View File

@ -1,6 +1,6 @@
// Input_iconv.java -- Java side of iconv() reader.
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2001 Free Software Foundation
This file is part of libgcj.
@ -33,6 +33,7 @@ public class Input_iconv extends BytesToUnicode
private native void init (String encoding)
throws UnsupportedEncodingException;
public native int read (char[] outbuffer, int outpos, int count);
public native void done ();
// The encoding we're using.
private String encoding;

3
libjava/gnu/gcj/convert/Output_iconv.java
View File

@ -1,6 +1,6 @@
// Output_iconv.java -- Java side of iconv() writer.
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2001 Free Software Foundation
This file is part of libgcj.
@ -33,6 +33,7 @@ public class Output_iconv extends UnicodeToBytes
private native void init (String encoding)
throws UnsupportedEncodingException;
public native int write (char[] inbuffer, int inpos, int count);
public native void done ();
// The encoding we're using.
private String encoding;

108
libjava/gnu/gcj/convert/UnicodeToBytes.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000 Free Software Foundation
/* Copyright (C) 1999, 2000, 2001 Free Software Foundation
This file is part of libgcj.
@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.convert;
public abstract class UnicodeToBytes extends IOConverter
{
/** Buffer to emit bytes to.
@ -15,28 +15,20 @@ public abstract class UnicodeToBytes extends IOConverter
public byte[] buf;
public int count;
static Class defaultEncodingClass;
// The name of the default encoding.
static String defaultEncoding;
static synchronized void getDefaultEncodingClass()
{
// Test (defaultEncodingClass == null) again in case of race condition.
if (defaultEncodingClass == null)
{
String encoding = canonicalize (System.getProperty("file.encoding"));
String className = "gnu.gcj.convert.Output_"+encoding;
try
{
defaultEncodingClass = Class.forName(className);
}
catch (ClassNotFoundException ex)
{
throw new NoClassDefFoundError("missing default encoding "
+ encoding + " (class "
+ className + " not found)");
}
}
}
/* These keep a small cache of encoders for reuse. The array holds
the actual encoders. The currCachePos is the next value we are
going to replace in the cache. We don't just throw the data away
if the cache is full, because if the cache filled up with stuff we
don't need then the cache would be worthless. We instead
circulate through the cache the implement kind of an LRU
algorithm. */
private static final int CACHE_SIZE = 4; // A power of 2 for speed
private static UnicodeToBytes[] encoderCache
= new UnicodeToBytes[CACHE_SIZE];
private static int currCachePos = 0;
public abstract String getName();
@ -44,20 +36,34 @@ public abstract class UnicodeToBytes extends IOConverter
{
try
{
if (defaultEncodingClass == null)
getDefaultEncodingClass();
return (UnicodeToBytes) defaultEncodingClass.newInstance();
synchronized (UnicodeToBytes.class)
{
if (defaultEncoding == null)
{
String encoding
= canonicalize (System.getProperty("file.encoding",
"8859_1"));
String className = "gnu.gcj.convert.Output_" + encoding;
try
{
Class defaultEncodingClass = Class.forName(className);
defaultEncoding = encoding;
}
catch (ClassNotFoundException ex)
{
throw new NoClassDefFoundError("missing default encoding "
+ encoding + " (class "
+ className
+ " not found)");
}
}
}
return getEncoder (defaultEncoding);
}
catch (Throwable ex)
{
try
{
return new Output_iconv (System.getProperty ("file.encoding"));
}
catch (Throwable ex2)
{
return new Output_8859_1();
}
return new Output_8859_1();
}
}
@ -65,6 +71,23 @@ public abstract class UnicodeToBytes extends IOConverter
public static UnicodeToBytes getEncoder (String encoding)
throws java.io.UnsupportedEncodingException
{
/* First hunt in our cache to see if we have a encoder that is
already allocated. */
synchronized (UnicodeToBytes.class)
{
int i;
for (i = 0; i < encoderCache.length; ++i)
{
if (encoderCache[i] != null
&& encoding.equals(encoderCache[i].getName ()))
{
UnicodeToBytes rv = encoderCache[i];
encoderCache[i] = null;
return rv;
}
}
}
String className = "gnu.gcj.convert.Output_" + canonicalize (encoding);
Class encodingClass;
try
@ -122,4 +145,21 @@ public abstract class UnicodeToBytes extends IOConverter
str.getChars(inpos, srcEnd, work, 0);
return write(work, inpos, inlength);
}
/** Indicate that the converter is resuable.
* This class keeps track of converters on a per-encoding basis.
* When done with an encoder you may call this method to indicate
* that it can be reused later.
*/
public void done ()
{
synchronized (UnicodeToBytes.class)
{
this.buf = null;
this.count = 0;
encoderCache[currCachePos] = this;
currCachePos = (currCachePos + 1) % CACHE_SIZE;
}
}
}

30
libjava/gnu/gcj/convert/natIconv.cc
View File

@ -91,7 +91,7 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
if (r == (size_t) -1)
{
// Incomplete character.
if (errno == EINVAL)
if (errno == EINVAL || errno == E2BIG)
return 0;
throw new java::io::CharConversionException ();
}
@ -115,6 +115,20 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
#endif /* HAVE_ICONV */
}
void
gnu::gcj::convert::Input_iconv::done ()
{
// 50 bytes should be enough for any reset sequence.
size_t avail = 50;
char tmp[avail];
char *p = tmp;
// Calling iconv() with a NULL INBUF pointer will cause iconv() to
// switch to its initial state. We don't care about the output that
// might be generated in that situation.
iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
BytesToUnicode::done ();
}
void
gnu::gcj::convert::Output_iconv::init (jstring encoding)
{
@ -251,3 +265,17 @@ gnu::gcj::convert::IOConverter::iconv_init (void)
#endif /* HAVE_ICONV */
return result;
}
void
gnu::gcj::convert::Output_iconv::done ()
{
// 50 bytes should be enough for any reset sequence.
size_t avail = 50;
char tmp[avail];
char *p = tmp;
// Calling iconv() with a NULL INBUF pointer will cause iconv() to
// switch to its initial state. We don't care about the output that
// might be generated in that situation.
iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
UnicodeToBytes::done ();
}

2
libjava/java/lang/natString.cc
View File

@ -523,6 +523,7 @@ java::lang::String::init (jbyteArray bytes, jint offset, jint count,
avail -= done;
}
}
converter->done ();
this->data = array;
this->boffset = (char *) elements (array) - (char *) array;
this->count = outpos;
@ -604,6 +605,7 @@ java::lang::String::getBytes (jstring enc)
todo -= converted;
}
}
converter->done ();
if (bufpos == buflen)
return buffer;
jbyteArray result = JvNewByteArray(bufpos);