open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve synchronization of debug library

Browse Source
This commit is contained in:
James Roseborough
2015-03-18 15:52:49 +00:00
parent 237c384d55
commit 87f19030cb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/org/luaj/vm2/lib/DebugLib.java
View File

@@ -490,11 +490,11 @@ public class DebugLib extends TwoArgFunction {
CallStack() {} CallStack() {}
int currentline() { synchronized int currentline() {
return calls > 0? frame[calls-1].currentline(): -1; return calls > 0? frame[calls-1].currentline(): -1;
} }
private CallFrame pushcall() { private synchronized CallFrame pushcall() {
if (calls >= frame.length) { if (calls >= frame.length) {
int n = Math.max(4, frame.length * 3 / 2); int n = Math.max(4, frame.length * 3 / 2);
CallFrame[] f = new CallFrame[n]; CallFrame[] f = new CallFrame[n];
@@ -508,21 +508,22 @@ public class DebugLib extends TwoArgFunction {
return frame[calls++]; return frame[calls++];
} }
final void onCall(LuaFunction function) { final synchronized void onCall(LuaFunction function) {
pushcall().set(function); pushcall().set(function);
} }
final void onCall(LuaClosure function, Varargs varargs, LuaValue[] stack) { final synchronized void onCall(LuaClosure function, Varargs varargs, LuaValue[] stack) {
pushcall().set(function, varargs, stack); pushcall().set(function, varargs, stack);
} }
final void onReturn() { final synchronized void onReturn() {
if (calls > 0) if (calls > 0)
frame[--calls].reset(); frame[--calls].reset();
} }
final void onInstruction(int pc, Varargs v, int top) { final synchronized void onInstruction(int pc, Varargs v, int top) {
frame[calls-1].instr(pc, v, top); if (calls > 0)
frame[calls-1].instr(pc, v, top);
} }
/** /**
@@ -530,7 +531,7 @@ public class DebugLib extends TwoArgFunction {
* @param level * @param level
* @return String containing the traceback. * @return String containing the traceback.
*/ */
String traceback(int level) { synchronized String traceback(int level) {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
sb.append( "stack traceback:" ); sb.append( "stack traceback:" );
for (DebugLib.CallFrame c; (c = getCallFrame(level++)) != null; ) { for (DebugLib.CallFrame c; (c = getCallFrame(level++)) != null; ) {
@@ -555,13 +556,13 @@ public class DebugLib extends TwoArgFunction {
return sb.toString(); return sb.toString();
} }
DebugLib.CallFrame getCallFrame(int level) { synchronized DebugLib.CallFrame getCallFrame(int level) {
if (level < 1 || level > calls) if (level < 1 || level > calls)
return null; return null;
return frame[calls-level]; return frame[calls-level];
} }
DebugLib.CallFrame findCallFrame(LuaValue func) { synchronized DebugLib.CallFrame findCallFrame(LuaValue func) {
for (int i = 1; i <= calls; ++i) for (int i = 1; i <= calls; ++i)
if (frame[calls-i].f == func) if (frame[calls-i].f == func)
return frame[i]; return frame[i];
@@ -569,7 +570,7 @@ public class DebugLib extends TwoArgFunction {
} }
DebugInfo auxgetinfo(String what, LuaFunction f, CallFrame ci) { synchronized DebugInfo auxgetinfo(String what, LuaFunction f, CallFrame ci) {
DebugInfo ar = new DebugInfo(); DebugInfo ar = new DebugInfo();
for (int i = 0, n = what.length(); i < n; ++i) { for (int i = 0, n = what.length(); i < n; ++i) {
switch (what.charAt(i)) { switch (what.charAt(i)) {