mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
David McKnight 2011-11-14 19:52:44 +00:00
parent b2efe1be7a
commit eaa9240362
1 changed files with 23 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,27 +75,11 @@ public class DefaultFileServiceCodePageConverter implements
bufInputStream.read(buffer, 0, fileLength); bufInputStream.read(buffer, 0, fileLength);
bufInputStream.close(); bufInputStream.close();
inputStream.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 = new FileOutputStream(file);
outStream.write(localBuffer, 0, lclBuf.limit()); convertBuffer(buffer, rmtDecoder, fileLength, localEncoding, outStream);
} }
else { // read and write sections of file at a time else { // read and write sections of file at a time
int inOffset = 0; int inOffset = 0;
int outOffset = 0;
File altFile = new File(file.getAbsolutePath() + "~"); //$NON-NLS-1$ File altFile = new File(file.getAbsolutePath() + "~"); //$NON-NLS-1$
outStream = new FileOutputStream(altFile); // using alternate file because we're writing while reading outStream = new FileOutputStream(altFile); // using alternate file because we're writing while reading
@ -104,28 +88,10 @@ public class DefaultFileServiceCodePageConverter implements
if (inOffset + MAX_READ > fileLength){ if (inOffset + MAX_READ > fileLength){
readSize = fileLength - inOffset; readSize = fileLength - inOffset;
} }
byte[] buffer = new byte[readSize]; byte[] buffer = new byte[readSize];
inputStream.read(buffer, 0, readSize); inputStream.read(buffer, 0, readSize);
inOffset += readSize; inOffset += readSize;
ByteBuffer rmtBuf = ByteBuffer.wrap(buffer, 0, readSize); convertBuffer(buffer, rmtDecoder, readSize, localEncoding, outStream);
// 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(); inputStream.close();
outStream.close(); outStream.close();
@ -151,6 +117,27 @@ public class DefaultFileServiceCodePageConverter implements
} }
} }
} }
private void convertBuffer(byte[] buffer, CharsetDecoder rmtDecoder, int readSize, String localEncoding, FileOutputStream outStream) throws Exception{
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);
}
public boolean isServerEncodingSupported(String remoteEncoding, public boolean isServerEncodingSupported(String remoteEncoding,
IFileService fs) { IFileService fs) {