natas_hw
/
intrace
mirror of https://github.com/mchr3k/org.intrace
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce filter related memory allocation 

Increase amount of trace which can be collected
This commit is contained in:
mchr3k 2011-05-02 13:21:16 +01:00
parent 9a3a158e06
commit b97eb2a06d
2 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
org.intrace/src/org/intrace/client/gui/TraceWindow.java
View File

@ -75,7 +75,7 @@ public class TraceWindow
MigLayout windowLayout = new MigLayout("fill", "", "[][grow]");
sWindow = new Shell();
sWindow.setText("Trace Window");
sWindow.setText("InTrace UI");
sWindow.setLayout(windowLayout);
sWindow.setSize(new Point(800, 800));
sWindow.setMinimumSize(new Point(800, 480));
@ -740,14 +740,7 @@ public class TraceWindow
@Override
public void widgetSelected(SelectionEvent arg0)
{
sWindow.getDisplay().asyncExec(new Runnable()
{
@Override
public void run()
{
filterThread.setClearTrace();
}
});
filterThread.setClearTrace();
}
});
@ -879,44 +872,62 @@ public class TraceWindow
filterThread = new TraceFilterThread(new TraceTextHandler()
{
// Re-usable class to avoid object allocations
class SetTextRunnable implements Runnable
{
String traceText = null;
@Override
public void run()
{
textOutput.setRedraw(false);
textOutput.setText(traceText);
if (autoScroll)
{
textOutput.setTopIndex(Integer.MAX_VALUE);
}
textOutput.setRedraw(true);
}
}
SetTextRunnable mSetTextRunnable = new SetTextRunnable();
@Override
public void setText(final String traceText)
public void setText(String traceText)
{
if (sWindow.isDisposed())
return;
sWindow.getDisplay().syncExec(new Runnable()
{
@Override
public void run()
{
textOutput.setRedraw(false);
textOutput.setText(traceText);
if (autoScroll)
{
textOutput.setTopIndex(Integer.MAX_VALUE);
}
textOutput.setRedraw(true);
}
});
mSetTextRunnable.traceText = traceText;
sWindow.getDisplay().syncExec(mSetTextRunnable);
mSetTextRunnable.traceText = null;
}
// Re-usable class to avoid object allocations
class AppendTextRunnable implements Runnable
{
String traceText = null;
@Override
public void run()
{
textOutput.append(traceText);
if (autoScroll)
{
textOutput.setTopIndex(Integer.MAX_VALUE);
}
}
}
AppendTextRunnable mAppendTextRunnable = new AppendTextRunnable();
@Override
public void appendText(final String traceText)
{
if (sWindow.isDisposed())
return;
sWindow.getDisplay().syncExec(new Runnable()
{
@Override
public void run()
{
textOutput.append(traceText);
if (autoScroll)
{
textOutput.setTopIndex(Integer.MAX_VALUE);
}
}
});
mAppendTextRunnable.traceText = traceText;
sWindow.getDisplay().syncExec(mAppendTextRunnable);
mAppendTextRunnable.traceText = null;
}
@Override
@ -984,18 +995,27 @@ public class TraceWindow
}
}
// Re-usable class to avoid object allocations
class SetOutputStatusRunnable implements Runnable
{
int displayed;
int total;
@Override
public void run()
{
statusLabel.setText("Displayed lines: " + displayed + ", Total lines: " + total);
}
}
SetOutputStatusRunnable mSetOutputStatusRunnable = new SetOutputStatusRunnable();
public void setOutputStatus(final int displayed, final int total)
{
if (!sWindow.isDisposed())
{
sWindow.getDisplay().asyncExec(new Runnable()
{
@Override
public void run()
{
statusLabel.setText("Displayed lines: " + displayed + ", Total lines: " + total);
}
});
mSetOutputStatusRunnable.displayed = displayed;
mSetOutputStatusRunnable.total = total;
sWindow.getDisplay().syncExec(mSetOutputStatusRunnable);
}
}

8
org.intrace/src/org/intrace/client/gui/helper/TraceFilterThread.java
View File

@ -48,7 +48,7 @@ public class TraceFilterThread implements Runnable
/**
* Low memory warning
*/
private static final String LOW_MEMORY = "Warning: Low memory - dropping trace.";
private static final String LOW_MEMORY = "Warning: Low memory - no further trace will be collected.";
/**
* Pattern which matches anything
@ -216,9 +216,9 @@ public class TraceFilterThread implements Runnable
// I expected a factor of 2 due to trace strings being held by this
// thread along with another copy held by the UI. However, profiling
// shows a factor of 5 is necessary. This is because we need to be able
// shows a factor of 18 is necessary. This is because we need to be able
// to handle entire copies of the active data when adding new strings.
numChars += (20 * newTraceLine.length());
numChars += (18 * newTraceLine.length());
traceLines.add(newTraceLine);
totalLines.incrementAndGet();
@ -297,6 +297,8 @@ public class TraceFilterThread implements Runnable
2);
if (lastPercentage != roundedPercantage)
{
// Try and ensure that we are GC-ing regularly
System.gc();
cancelled = progressCallback
.setProgress((int) (100 * roundedPercantage));
if (cancelled)