mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-18 22:45:23 +02:00
Code Issues Wiki Activity

[280453] [performance] DefaultFileServiceCodePageConverter is wasteful with main memory

Browse source
This commit is contained in:
David McKnight 2011-02-25 14:30:51 +00:00
parent c723b0f0e3
commit a99967b64a
1 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/DefaultFileServiceCodePageConverter.java
View file

@ -15,6 +15,7 @@
* David McKnight (IBM) -[279014] [dstore][encoding] text file corruption can occur when downloading from UTF8 to cp1252
* David McKnight (IBM) -[324669] [dstore] IBM-eucJP to UTF-8 char conversion appends nulls to end of file during text-mode download
* David McKnight (IBM) -[280451] IFileServiceCodePageConverter.convertClientStringToRemoteBytes() should throw runtime exception
* David McKnight (IBM) -[280453] [performance] DefaultFileServiceCodePageConverter is wasteful with main memory
********************************************************************************/
package org.eclipse.rse.services.files;
@ -55,33 +56,82 @@ public class DefaultFileServiceCodePageConverter implements
// read in the file
try
{
// decoder to go from remote encoding to UTF8
Charset rmtCharset = Charset.forName(remoteEncoding);
CharsetDecoder rmtDecoder = rmtCharset.newDecoder();
inputStream = new FileInputStream(file);
int fileLength = (int)file.length();
BufferedInputStream bufInputStream = new BufferedInputStream(inputStream, fileLength);
if (fileLength > 0){
inputStream = new FileInputStream(file);
BufferedInputStream bufInputStream = new BufferedInputStream(inputStream, fileLength);
byte[] buffer = new byte[fileLength];
bufInputStream.read(buffer, 0, fileLength);
bufInputStream.close();
ByteBuffer rmtBuf = ByteBuffer.wrap(buffer, 0, fileLength);
// decoder to go from remote encoding to UTF8
Charset rmtCharset = Charset.forName(remoteEncoding);
CharsetDecoder rmtDecoder = rmtCharset.newDecoder();
// convert from the remote encoding
CharBuffer decodedBuf = null;
decodedBuf = rmtDecoder.decode(rmtBuf);
// for conversion to the local encoding
Charset charset = Charset.forName(localEncoding);
CharsetEncoder encoder = charset.newEncoder();
byte[] localBuffer = null;
// convert to the specified local encoding
ByteBuffer lclBuf = encoder.encode(decodedBuf);
localBuffer = lclBuf.array();
outStream = new FileOutputStream(file);
// use the limit rather than the array length to avoid unwanted nulls
outStream.write(localBuffer, 0, lclBuf.limit());
int MAX_READ = 10000;
if (fileLength <= MAX_READ){ // read the whole file at once
byte[] buffer = new byte[fileLength];
bufInputStream.read(buffer, 0, fileLength);
bufInputStream.close();
inputStream.close();
ByteBuffer rmtBuf = ByteBuffer.wrap(buffer, 0, fileLength);
// convert from the remote encoding
CharBuffer decodedBuf = null;
decodedBuf = rmtDecoder.decode(rmtBuf);
// for conversion to the local encoding
Charset charset = Charset.forName(localEncoding);
CharsetEncoder encoder = charset.newEncoder();
byte[] localBuffer = null;
// convert to the specified local encoding
ByteBuffer lclBuf = encoder.encode(decodedBuf);
localBuffer = lclBuf.array();
// use the limit rather than the array length to avoid unwanted nulls
outStream = new FileOutputStream(file);
outStream.write(localBuffer, 0, lclBuf.limit());
}
else { // read and write sections of file at a time
int inOffset = 0;
int outOffset = 0;
File altFile = new File(file.getAbsolutePath() + "~"); //$NON-NLS-1$
outStream = new FileOutputStream(altFile); // using alternate file because we're writing while reading
while (inOffset < fileLength){
int readSize = MAX_READ;
if (inOffset + MAX_READ > fileLength){
readSize = fileLength - inOffset;
}
byte[] buffer = new byte[readSize];
inputStream.read(buffer, 0, readSize);
inOffset += readSize;
ByteBuffer rmtBuf = ByteBuffer.wrap(buffer, 0, readSize);
// convert from the remote encoding
CharBuffer decodedBuf = null;
decodedBuf = rmtDecoder.decode(rmtBuf);
// for conversion to the local encoding
Charset charset = Charset.forName(localEncoding);
CharsetEncoder encoder = charset.newEncoder();
byte[] localBuffer = null;
// convert to the specified local encoding
ByteBuffer lclBuf = encoder.encode(decodedBuf);
localBuffer = lclBuf.array();
// use the limit rather than the array length to avoid unwanted nulls
int writeSize = lclBuf.limit();
outStream.write(localBuffer, 0, writeSize);
outOffset += writeSize;
}
inputStream.close();
outStream.close();
altFile.renameTo(file);
}
}
} catch (Exception e) {
// outstream could not be written properly: report