TudbuT/isbpl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempts at fixing multithread functionstack/garbage collector issues

Browse source
This commit is contained in:
Daniella / Tove 2022-04-29 18:30:10 +02:00
parent a161775ea6
commit eb5bbd42b8
1 changed files with 78 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
bootstrap/ISBPL.java
View file

@ -21,13 +21,13 @@ public class ISBPL {
static boolean debug = false, printCalls = false; static boolean debug = false, printCalls = false;
public ISBPLDebugger.IPC debuggerIPC = new ISBPLDebugger.IPC(); public ISBPLDebugger.IPC debuggerIPC = new ISBPLDebugger.IPC();
ArrayList<ISBPLType> types = new ArrayList<>(); ArrayList<ISBPLType> types = new ArrayList<>();
HashMap<String, ISBPLCallable> level0 = new HashMap<>(); ISBPLFrame level0 = new ISBPLFrame();
final ISBPLThreadLocal<Stack<HashMap<String, ISBPLCallable>>> functionStack = ISBPLThreadLocal.withInitial(() -> {
Stack<HashMap<String, ISBPLCallable>> stack = new Stack<>();
stack.push(level0);
return stack;
});
final ISBPLThreadLocal<Stack<File>> fileStack = ISBPLThreadLocal.withInitial(Stack::new); final ISBPLThreadLocal<Stack<File>> fileStack = ISBPLThreadLocal.withInitial(Stack::new);
final ISBPLThreadLocal<Stack<ISBPLFrame>> frameStack = ISBPLThreadLocal.withInitial(() -> {
Stack<ISBPLFrame> frames = new Stack<>();
frames.push(level0);
return frames;
});
HashMap<ISBPLCallable, Object> varLinks = new HashMap<>(); HashMap<ISBPLCallable, Object> varLinks = new HashMap<>();
HashMap<Object, ISBPLObject> vars = new HashMap<>(); HashMap<Object, ISBPLObject> vars = new HashMap<>();
final ISBPLThreadLocal<ArrayList<String>> lastWords = ISBPLThreadLocal.withInitial(() -> new ArrayList<>(16)); final ISBPLThreadLocal<ArrayList<String>> lastWords = ISBPLThreadLocal.withInitial(() -> new ArrayList<>(16));
@ -62,7 +62,7 @@ public class ISBPL {
return (idx, words, file, stack) -> { return (idx, words, file, stack) -> {
idx++; idx++;
AtomicInteger i = new AtomicInteger(idx); AtomicInteger i = new AtomicInteger(idx);
ISBPLCallable callable = readBlock(i, words, file, false); ISBPLCallable callable = readBlock(i, words, file);
if(stack.pop().isTruthy()) { if(stack.pop().isTruthy()) {
callable.call(stack); callable.call(stack);
} }
@ -72,9 +72,9 @@ public class ISBPL {
return (idx, words, file, stack) -> { return (idx, words, file, stack) -> {
idx++; idx++;
AtomicInteger i = new AtomicInteger(idx); AtomicInteger i = new AtomicInteger(idx);
ISBPLCallable cond = readBlock(i, words, file, false); ISBPLCallable cond = readBlock(i, words, file);
i.getAndIncrement(); i.getAndIncrement();
ISBPLCallable block = readBlock(i, words, file, false); ISBPLCallable block = readBlock(i, words, file);
cond.call(stack); cond.call(stack);
while (stack.pop().isTruthy()) { while (stack.pop().isTruthy()) {
block.call(stack); block.call(stack);
@ -105,9 +105,9 @@ public class ISBPL {
} }
} }
AtomicInteger i = new AtomicInteger(idx); AtomicInteger i = new AtomicInteger(idx);
ISBPLCallable block = readBlock(i, words, file, false); ISBPLCallable block = readBlock(i, words, file);
i.getAndIncrement(); i.getAndIncrement();
ISBPLCallable catcher = readBlock(i, words, file, false); ISBPLCallable catcher = readBlock(i, words, file);
try { try {
block.call(stack); block.call(stack);
} catch (ISBPLError error) { } catch (ISBPLError error) {
@ -135,9 +135,9 @@ public class ISBPL {
return (idx, words, file, stack) -> { return (idx, words, file, stack) -> {
idx++; idx++;
AtomicInteger i = new AtomicInteger(idx); AtomicInteger i = new AtomicInteger(idx);
ISBPLCallable block = readBlock(i, words, file, false); ISBPLCallable block = readBlock(i, words, file);
i.getAndIncrement(); i.getAndIncrement();
ISBPLCallable catcher = readBlock(i, words, file, false); ISBPLCallable catcher = readBlock(i, words, file);
try { try {
block.call(stack); block.call(stack);
} finally { } finally {
@ -149,15 +149,7 @@ public class ISBPL {
case "{": case "{":
return (idx, words, file, stack) -> { return (idx, words, file, stack) -> {
AtomicInteger i = new AtomicInteger(idx); AtomicInteger i = new AtomicInteger(idx);
ISBPLCallable block = readBlock(i, words, file, true); ISBPLCallable block = readBlock(i, words, file);
stack.push(new ISBPLObject(getType("func"), block));
return i.get();
};
// Returns open function (lambda behaviour)
case "?":
return (idx, words, file, stack) -> {
AtomicInteger i = new AtomicInteger(idx + 1);
ISBPLCallable block = readBlock(i, words, file, false);
stack.push(new ISBPLObject(getType("func"), block)); stack.push(new ISBPLObject(getType("func"), block));
return i.get(); return i.get();
}; };
@ -170,8 +162,7 @@ public class ISBPL {
for(ISBPLObject obj : stack) { for(ISBPLObject obj : stack) {
s.push(obj); s.push(obj);
} }
// This cant be a non-function, unless we clone vars aswell to avoid garbage collecting them accidentally. ISBPLCallable block = readBlock(i, words, file);
ISBPLCallable block = readBlock(i, words, file, true);
long tid = Thread.currentThread().getId(); long tid = Thread.currentThread().getId();
new Thread(() -> { new Thread(() -> {
debuggerIPC.run.put(Thread.currentThread().getId(), debuggerIPC.run.getOrDefault(tid, -1) == -1 ? -1 : 0); debuggerIPC.run.put(Thread.currentThread().getId(), debuggerIPC.run.getOrDefault(tid, -1) == -1 ? -1 : 0);
@ -333,7 +324,7 @@ public class ISBPL {
ISBPLObject i = stack.pop(); ISBPLObject i = stack.pop();
ISBPLObject s = stack.pop(); ISBPLObject s = stack.pop();
i.checkType(getType("int")); i.checkType(getType("int"));
functionStack.get().get(functionStack.get().size() - 1 - ((int) i.object)).get(toJavaString(s)).call(stack); frameStack.get().get(frameStack.get().size() - 1 - ((int) i.object)).resolve(toJavaString(s)).call(stack);
}; };
break; break;
case "reload": case "reload":
@ -842,11 +833,11 @@ public class ISBPL {
break; break;
case "_getvars": case "_getvars":
func = (Stack<ISBPLObject> stack) -> { func = (Stack<ISBPLObject> stack) -> {
ISBPLObject[] objects = new ISBPLObject[functionStack.get().size()]; ISBPLObject[] objects = new ISBPLObject[frameStack.get().size()];
int i = 0; int i = 0;
for (HashMap<String, ISBPLCallable> map : functionStack.get()) { for (ISBPLFrame map : frameStack.get()) {
ArrayList<ISBPLObject> strings = new ArrayList<>(); ArrayList<ISBPLObject> strings = new ArrayList<>();
for (String key : map.keySet()) { for (String key : map.all().keySet()) {
if(key.startsWith("=")) { if(key.startsWith("=")) {
strings.add(toISBPLString(key.substring(1))); strings.add(toISBPLString(key.substring(1)));
} }
@ -1224,8 +1215,8 @@ public class ISBPL {
} }
public void addFunction(String name, ISBPLCallable callable) { public void addFunction(String name, ISBPLCallable callable) {
functionStack.get().peek().put(name, callable); frameStack.get().peek().add(name, callable);
functionStack.get().peek().put("&" + name, stack -> stack.push(new ISBPLObject(getType("func"), callable))); frameStack.get().peek().add("&" + name, stack -> stack.push(new ISBPLObject(getType("func"), callable)));
} }
private String getFilePathForInclude(Stack<ISBPLObject> stack, Stack<File> file) { private String getFilePathForInclude(Stack<ISBPLObject> stack, Stack<File> file) {
@ -1253,13 +1244,13 @@ public class ISBPL {
i++; i++;
String name = words[i]; String name = words[i];
AtomicInteger integer = new AtomicInteger(++i); AtomicInteger integer = new AtomicInteger(++i);
ISBPLCallable callable = readBlock(integer, words, file, true); ISBPLCallable callable = readBlock(integer, words, file);
i = integer.get(); i = integer.get();
addFunction(name, callable); addFunction(name, callable);
return i; return i;
} }
private ISBPLCallable readBlock(AtomicInteger idx, String[] words, File file, boolean isFunction) { private ISBPLCallable readBlock(AtomicInteger idx, String[] words, File file) {
ArrayList<String> newWords = new ArrayList<>(); ArrayList<String> newWords = new ArrayList<>();
int i = idx.get(); int i = idx.get();
i++; i++;
@ -1276,10 +1267,24 @@ public class ISBPL {
} }
idx.set(i); idx.set(i);
String[] theWords = newWords.toArray(new String[0]); String[] theWords = newWords.toArray(new String[0]);
ISBPLFrame frame = frameStack.get().peek();
return (stack) -> { return (stack) -> {
fileStack.get().push(file); fileStack.get().push(file);
interpretRaw(theWords, stack, isFunction); frameStack.get().push(new ISBPLFrame(frame));
fileStack.get().pop(); try {
interpretRaw(theWords, stack);
} finally {
HashMap<String, ISBPLCallable> fstack = frameStack.get().pop().map;
for(Map.Entry<String, ISBPLCallable> c : fstack.entrySet()) {
if(varLinks.containsKey(c.getValue())) {
vars.remove(varLinks.remove(c.getValue()));
if(printCalls) {
System.err.println("Garbage collector: removed " + c.getKey());
}
}
}
fileStack.get().pop();
}
}; };
} }
@ -1332,13 +1337,11 @@ public class ISBPL {
fileStack.get().push(file); fileStack.get().push(file);
code = cleanCode(code); code = cleanCode(code);
String[] words = splitWords(code); String[] words = splitWords(code);
interpretRaw(words, stack, false); interpretRaw(words, stack);
fileStack.get().pop(); fileStack.get().pop();
} }
private void interpretRaw(String[] words, Stack<ISBPLObject> stack, boolean isFunction) { private void interpretRaw(String[] words, Stack<ISBPLObject> stack) {
if(isFunction)
functionStack.get().push(new HashMap<>());
try { try {
nextWord: for (int i = 0 ; i < words.length ; i++) { nextWord: for (int i = 0 ; i < words.length ; i++) {
String word = words[i]; String word = words[i];
@ -1346,7 +1349,7 @@ public class ISBPL {
continue; continue;
if(printCalls) { if(printCalls) {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
for (int x = 0 ; x < functionStack.get().size() ; x++) { for (int x = 0 ; x < frameStack.get().size() ; x++) {
s.append("\t"); s.append("\t");
} }
System.err.println(s + word + "\t\t" + (debug ? stack : "")); System.err.println(s + word + "\t\t" + (debug ? stack : ""));
@ -1397,12 +1400,7 @@ public class ISBPL {
} }
} }
} }
ISBPLCallable func = functionStack.get().peek().get(word); ISBPLCallable func = frameStack.get().peek().resolve(word);
if(func != null) {
func.call(stack);
continue;
}
func = functionStack.get().get(0).get(word);
if(func != null) { if(func != null) {
func.call(stack); func.call(stack);
continue; continue;
@ -1437,19 +1435,6 @@ public class ISBPL {
catch (InterruptedException e) { catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
finally {
if(isFunction) {
HashMap<String, ISBPLCallable> fstack = functionStack.get().pop();
for(Map.Entry<String, ISBPLCallable> c : fstack.entrySet()) {
if(varLinks.containsKey(c.getValue())) {
vars.remove(varLinks.remove(c.getValue()));
if(printCalls) {
System.err.println("Garbage collector: removed " + c.getKey());
}
}
}
}
}
} }
// Magic, please test before pushing changes! // Magic, please test before pushing changes!
@ -1867,10 +1852,11 @@ class ISBPLDebugger extends Thread {
case "dump": case "dump":
try { try {
System.err.println("VAR DUMP\n----------------"); System.err.println("VAR DUMP\n----------------");
for (HashMap<String, ISBPLCallable> map : isbpl.functionStack.map.get(tid)) { for (ISBPLFrame map : isbpl.frameStack.map.get(tid)) {
for (String key : map.keySet()) { HashMap<String, ISBPLCallable> all = map.all();
for (String key : all.keySet()) {
if (key.startsWith("=")) { if (key.startsWith("=")) {
map.get(key.substring(1)).call(isbpl.debuggerIPC.stack.get(tid)); all.get(key.substring(1)).call(isbpl.debuggerIPC.stack.get(tid));
System.err.println("\t" + key.substring(1) + ": \t" + isbpl.debuggerIPC.stack.get(tid).pop()); System.err.println("\t" + key.substring(1) + ": \t" + isbpl.debuggerIPC.stack.get(tid).pop());
} }
} }
@ -2138,8 +2124,37 @@ class ISBPLStack<T> extends Stack<T> {
@Override @Override
public T push(T t) { public T push(T t) {
//if(t == null) if(t == null && false)
//throw new IllegalArgumentException("item is null"); throw new IllegalArgumentException("item is null");
return super.push(t); return super.push(t);
} }
} }
class ISBPLFrame {
public ISBPLFrame parent;
public HashMap<String, ISBPLCallable> map = new HashMap<>();
public ISBPLFrame() { }
public ISBPLFrame(ISBPLFrame parentFrame) {
parent = parentFrame;
}
public ISBPLCallable resolve(String name) {
if(map.containsKey(name))
return map.get(name);
if(parent != null)
return parent.resolve(name);
return null;
}
public void add(String name, ISBPLCallable callable) {
map.put(name, callable);
}
public HashMap<String, ISBPLCallable> all() {
HashMap<String, ISBPLCallable> r = parent == null ? new HashMap<>() : parent.all();
r.putAll(map);
return r;
}
}