mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +02:00
Code Issues Wiki Activity

Bug 441385 - Binary editor on big files blocks UI

Browse source 
Change-Id: I4ac0c8eff4e77045657f0fe5921a86a966a22922
Signed-off-by: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Reviewed-on: https://git.eclipse.org/r/31238
Tested-by: Hudson CI
This commit is contained in:
Alena Laskavaia 2014-08-07 16:33:31 -04:00 • committed by Elena Laskavaia
parent b89c530f09
commit 15402f6488
4 changed files with 65 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Objdump.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.utils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@ -45,7 +46,7 @@ public class Objdump {
public Objdump(String command, String[] params, String file) throws IOException {
init(command, params, file);
}
public Objdump(String file) throws IOException {
this("objdump", new String[0], file); //$NON-NLS-1$
}
@ -60,18 +61,54 @@ public class Objdump {
}
}
public byte[] getOutput() throws IOException {
Process objdump = ProcessFactory.getFactory().exec(args);
StringBuffer buffer = new StringBuffer();
BufferedReader stdout = new BufferedReader(new InputStreamReader(objdump.getInputStream()));
char[] buf = new char[512];
int len;
while ((len = stdout.read(buf, 0, buf.length)) != -1) {
buffer.append(buf, 0, len);
@Override
public String toString() {
StringBuilder b = new StringBuilder();
b.append(args[0]);
for (int i = 1; i < args.length; i++) {
b.append(" "); //$NON-NLS-1$
b.append(args[i]);
}
stdout.close();
objdump.destroy();
return buffer.toString().getBytes();
return b.toString();
}
/**
* Limit output to number of bytes
*/
public byte[] getOutput(int limitBytes) throws IOException {
Process objdump = ProcessFactory.getFactory().exec(args);
try {
StringBuffer buffer = new StringBuffer();
BufferedReader stdout = new BufferedReader(new InputStreamReader(
objdump.getInputStream()));
char[] buf = new char[4096];
int len;
while ((len = stdout.read(buf, 0, buf.length)) != -1) {
if (limitBytes > 0 && buffer.length() + len >= limitBytes) {
buffer.append(buf, 0, Math.min(len, limitBytes - buffer.length()));
break;
}
buffer.append(buf, 0, len);
}
try {
stdout.close();
} catch (IOException e) {
// ignore that
}
return buffer.toString().getBytes();
} finally {
objdump.destroy();
}
}
public byte[] getOutput() throws IOException {
return getOutput(0);
}
public InputStream getInputStream() throws IOException {
Process objdump = ProcessFactory.getFactory().exec(args);
objdump.getOutputStream().close();
objdump.getErrorStream().close();
return objdump.getInputStream();
}
public void dispose() {

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.java
View file

@ -61,6 +61,7 @@ public final class CEditorMessages extends NLS {
public static String OverrideIndicatorManager_overrides;
public static String OverrideIndicatorManager_shadows;
public static String OverrideIndicatorManager_via;
public static String DefaultBinaryFileEditor_TruncateMessage;
public static String DefaultCEditorTextHover_html_name;
public static String DefaultCEditorTextHover_html_prototype;
public static String DefaultCEditorTextHover_html_description;

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
View file

@ -49,6 +49,7 @@ OverrideIndicatorManager_overrides=Overrides
OverrideIndicatorManager_shadows=Shadows
OverrideIndicatorManager_via=via
DefaultBinaryFileEditor_TruncateMessage=Truncated, result is too large, use command line objdump
DefaultCEditorTextHover_html_name=<b>Name:</b>
DefaultCEditorTextHover_html_prototype=<br><b>Prototype:</b>
DefaultCEditorTextHover_html_description=<br><b>Description:</b><br>

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
View file

@ -119,10 +119,22 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor {
if (object != null) {
IGnuToolFactory factory= (IGnuToolFactory) object.getBinaryParser().getAdapter(IGnuToolFactory.class);
if (factory != null) {
Objdump objdump= factory.getObjdump(object.getPath());
Objdump objdump = factory.getObjdump(object.getPath());
if (objdump != null) {
try {
fStorage= new FileStorage(new ByteArrayInputStream(objdump.getOutput()), object.getPath());
// limit editor to X MB, if more - users should use objdump in command
// this is UI blocking call, on 56M binary it takes more than 15 min
// and generates at least 2.5G of assembly
int limitBytes = 6 * 1024 * 1024; // this can run reasonably within seconds
byte[] output = objdump.getOutput(limitBytes);
if (output.length >= limitBytes) {
// add a message for user
String text = CEditorMessages.DefaultBinaryFileEditor_TruncateMessage;
String message = "\n\n--- " + text + " ---\n" + objdump.toString(); //$NON-NLS-1$ //$NON-NLS-2$
System.arraycopy(message.getBytes(), 0, output,
limitBytes - message.length(), message.length());
}
fStorage = new FileStorage(new ByteArrayInputStream(output), object.getPath());
} catch (IOException exc) {
CUIPlugin.log(exc);
}