diff --git a/README.md b/README.md index b5008a9..0bc1d95 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Generators/Futures for Java 24+ +# Coroutines for Java 24+ -Futures/Generators implemented as state machines integrated into standard java. +Coroutines implemented as state machines integrated into standard java. - Futures/Generators are lazy and only make progress when called upon - Integrated as much as possible into java to work with the type system as much as possible @@ -150,16 +150,16 @@ This library requires the application be ran with a custom class loader as follo ```java public static void main(String[] args) { // loads the current class with a custom class loader and calls *this* method with the provided arguments. - // *this* method - the one used to call `runWithStateMachines` - RT.runWithStateMachines(StateMachineClassLoader.Config.builtin(), (Object) args); + // *this* method - the one used to call `runWithCoroutine` + RT.runWithCoroutine(CoroutineClassLoader.Config.builtin(), (Object) args); - // past this point generators will be created on methods which match the criteria + // past this point Coroutines will be created on methods which match the criteria } ``` Once finished any class loaded will be scanned for methods which match a particular signature. -When matched a shim is introduced into the source method and a class is constructed which stores all state for the future/generator +When matched a shim is introduced into the source method and a class is constructed which stores all state for the coroutine A basic example here where we have some parameters ```java diff --git a/app/src/main/java/basic/Main.java b/app/src/main/java/basic/Main.java index 1b4bd16..3037dc9 100644 --- a/app/src/main/java/basic/Main.java +++ b/app/src/main/java/basic/Main.java @@ -1,14 +1,14 @@ package basic; import com.parkertenbroeck.bcsm.RT; -import com.parkertenbroeck.bcsm.loadtime.StateMachineClassLoader; +import com.parkertenbroeck.bcsm.loadtime.CoroutineClassLoader; import com.parkertenbroeck.generator.Gen; public class Main { public static void main(String[] args) { - RT.runWithStateMachines(StateMachineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); + RT.runWithCoroutine(CoroutineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); - primes(); + primes(); } static void primes(){ diff --git a/app/src/main/java/lexer/Main.java b/app/src/main/java/lexer/Main.java index 0c3ecea..ecf43c9 100644 --- a/app/src/main/java/lexer/Main.java +++ b/app/src/main/java/lexer/Main.java @@ -2,11 +2,11 @@ package lexer; import com.parkertenbroeck.generator.Gen; import com.parkertenbroeck.bcsm.RT; -import com.parkertenbroeck.bcsm.loadtime.StateMachineClassLoader; +import com.parkertenbroeck.bcsm.loadtime.CoroutineClassLoader; public class Main { public static void main(String[] args) { - RT.runWithStateMachines(StateMachineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); + RT.runWithCoroutine(CoroutineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); lexer(); } diff --git a/app/src/main/java/sockets/Main.java b/app/src/main/java/sockets/Main.java index 0d9122d..3cbc958 100644 --- a/app/src/main/java/sockets/Main.java +++ b/app/src/main/java/sockets/Main.java @@ -2,11 +2,11 @@ package sockets; import com.parkertenbroeck.async_runtime.Jokio; import com.parkertenbroeck.bcsm.RT; -import com.parkertenbroeck.bcsm.loadtime.StateMachineClassLoader; +import com.parkertenbroeck.bcsm.loadtime.CoroutineClassLoader; public class Main { public static void main(String[] args) { - RT.runWithStateMachines(StateMachineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); + RT.runWithCoroutine(CoroutineClassLoader.Config.builtin().write_classes("build/modified/generators/"), (Object) args); await(); } diff --git a/lib/src/main/java/com/parkertenbroeck/async_runtime/AsyncExecutor.java b/lib/src/main/java/com/parkertenbroeck/async_runtime/AsyncExecutor.java new file mode 100644 index 0000000..20d48df --- /dev/null +++ b/lib/src/main/java/com/parkertenbroeck/async_runtime/AsyncExecutor.java @@ -0,0 +1,9 @@ +package com.parkertenbroeck.async_runtime; + +import java.util.concurrent.Executors; + +public class AsyncExecutor { + void test(){ + Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); + } +} diff --git a/lib/src/main/java/com/parkertenbroeck/async_runtime/Delay.java b/lib/src/main/java/com/parkertenbroeck/async_runtime/Delay.java index fc2cc73..a972cca 100644 --- a/lib/src/main/java/com/parkertenbroeck/async_runtime/Delay.java +++ b/lib/src/main/java/com/parkertenbroeck/async_runtime/Delay.java @@ -7,15 +7,10 @@ import java.util.Timer; import java.util.TimerTask; public class Delay implements Future { - private final static Timer timer; + private final static Timer timer = new Timer(true); + private TimerTask task; - - static { - timer = new Timer(true); - } - private int delay; - private boolean ready; protected Delay(int ms) { if (ms < 0) throw new IllegalArgumentException("async_example.Delay cannot be negative"); @@ -33,16 +28,12 @@ public class Delay implements Future { @Override public synchronized Object poll(Waker waker) { - if (delay == 0) { - ready = true; - delay = -1; - return null; - } - if (delay != -1) { + if (delay == 0) return null; + if (delay > 0) { task = new TimerTask() { @Override public void run() { - ready = true; + delay = 0; waker.wake(); } }; @@ -50,7 +41,6 @@ public class Delay implements Future { delay = -1; } - if (ready) return null; return Pending.INSTANCE; } } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/RT.java b/lib/src/main/java/com/parkertenbroeck/bcsm/RT.java index cc8202b..af2bf76 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/RT.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/RT.java @@ -1,7 +1,7 @@ package com.parkertenbroeck.bcsm; -import com.parkertenbroeck.bcsm.loadtime.StateMachineClassLoader; +import com.parkertenbroeck.bcsm.loadtime.CoroutineClassLoader; import java.lang.reflect.Modifier; import java.util.Set; @@ -9,10 +9,10 @@ import java.util.Set; import static java.lang.StackWalker.Option.*; public class RT { - public static void runWithStateMachines(StateMachineClassLoader.Config config, Object... params){ - if(RT.class.getClassLoader() instanceof StateMachineClassLoader)return; + public static void runWithCoroutine(CoroutineClassLoader.Config config, Object... params){ + if(RT.class.getClassLoader() instanceof CoroutineClassLoader)return; - var loader = new StateMachineClassLoader(RT.class.getClassLoader(), config); + var loader = new CoroutineClassLoader(RT.class.getClassLoader(), config); try{ StackWalker walker = StackWalker.getInstance(Set.of(RETAIN_CLASS_REFERENCE, SHOW_REFLECT_FRAMES, SHOW_HIDDEN_FRAMES)); var frame = walker.walk(s -> s.skip(1).findFirst()).get(); diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineBuilder.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineBuilder.java similarity index 97% rename from lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineBuilder.java rename to lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineBuilder.java index 3f1a706..5334129 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineBuilder.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineBuilder.java @@ -12,9 +12,7 @@ import java.lang.reflect.AccessFlag; import java.util.*; import java.util.stream.Collectors; -import static java.lang.constant.ConstantDescs.*; - -public abstract class StateMachineBuilder> { +public abstract class CoroutineBuilder> { public final static String PARAM_PREFIX = "param_"; public final static String LOCAL_PREFIX = "local_"; public final static String STATE_NAME = "state"; @@ -50,7 +48,7 @@ public abstract class StateMachineBuilder> { } } - public StateMachineBuilder(ClassModel src_clm, MethodModel src_mem, CodeModel src_com, String namePostfix){ + public CoroutineBuilder(ClassModel src_clm, MethodModel src_mem, CodeModel src_com, String namePostfix){ this.src_clm = src_clm; this.src_mem = src_mem; this.src_com = src_com; @@ -93,7 +91,7 @@ public abstract class StateMachineBuilder> { for (int i = 0; i < params.length; i++) { var param = params[i]; for(var attr : param_attrs.get(i)) - parameterVariableAnnotations.add(new ParameterVariableAnnotation(attr, StateMachineBuilder.PARAM_PREFIX + offset, param)); + parameterVariableAnnotations.add(new ParameterVariableAnnotation(attr, CoroutineBuilder.PARAM_PREFIX + offset, param)); offset += TypeKind.from(param).slotSize(); } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineClassLoader.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineClassLoader.java similarity index 92% rename from lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineClassLoader.java rename to lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineClassLoader.java index 1f45dd6..4a90214 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateMachineClassLoader.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/CoroutineClassLoader.java @@ -14,14 +14,14 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -public class StateMachineClassLoader extends ClassLoader { +public class CoroutineClassLoader extends ClassLoader { private final HashMap> customClazzMap = new HashMap<>(); private final List skip; private final HashMap builders; private final String write_classes_path; public interface SMBB{ - StateMachineBuilder build(ClassModel src_clm, MethodModel src_mem, CodeModel src_com); + CoroutineBuilder build(ClassModel src_clm, MethodModel src_mem, CodeModel src_com); } public static class Config{ HashSet skip = new HashSet<>(); @@ -59,11 +59,11 @@ public class StateMachineClassLoader extends ClassLoader { } } - public StateMachineClassLoader(ClassLoader parent) { + public CoroutineClassLoader(ClassLoader parent) { this(parent, Config.builtin()); } - public StateMachineClassLoader(ClassLoader parent, Config config) { + public CoroutineClassLoader(ClassLoader parent, Config config) { super(parent); skip = config.skip.stream().toList(); builders = new HashMap<>(config.builders); @@ -93,7 +93,7 @@ public class StateMachineClassLoader extends ClassLoader { var p = "/" + name.replace('.', '/') + ".class"; - try (var stream = StateMachineClassLoader.class.getResourceAsStream(p)) { + try (var stream = CoroutineClassLoader.class.getResourceAsStream(p)) { var bytes = Objects.requireNonNull(stream).readAllBytes(); add(name, searchReplaceableMethods(bytes)); return customClazzMap.get(name); @@ -114,7 +114,7 @@ public class StateMachineClassLoader extends ClassLoader { return ClassFile.of(ClassFile.AttributesProcessingOption.PASS_ALL_ATTRIBUTES, ClassFile.StackMapsOption.STACK_MAPS_WHEN_REQUIRED).build(clm.thisClass().asSymbol(), cb -> { for (var ce : clm) { if (ce instanceof MethodModel mem && mem.code().isPresent()) { - StateMachineBuilder builder = builders + CoroutineBuilder builder = builders .getOrDefault( mem.methodTypeSymbol().returnType(), (_, _, _) -> null diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/Frame.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/Frame.java index 71cb34b..9bbe8ed 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/Frame.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/Frame.java @@ -16,7 +16,7 @@ public record Frame(FrameTracker.Type[] locals, FrameTracker.Type[] stack, int b + "]"; } - public void save_locals(StateMachineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int loc_off){ + public void save_locals(CoroutineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int loc_off){ int slot = 0; for (var entry : locals) { slot++;// <----- @@ -28,20 +28,20 @@ public record Frame(FrameTracker.Type[] locals, FrameTracker.Type[] stack, int b sst.save_local(smb, cob, entry.toCD(), slot - smb.paramSlotOff + loc_off - 1); //minus one cause increment before here } } - public void save_stack(StateMachineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int stack_off) { + public void save_stack(CoroutineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int stack_off) { for(int i = stack.length-1-stack_off; i >= 0; i --){ if(stack[i].isCategory2_2nd())continue; sst.save_stack(smb, cob, stack[i].toCD()); } } - public SavedStateTracker save(StateMachineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int loc_off, int stack_off) { + public SavedStateTracker save(CoroutineBuilder smb, CodeBuilder cob, SavedStateTracker sst, int loc_off, int stack_off) { save_locals(smb, cob, sst, loc_off); save_stack(smb, cob, sst, stack_off); return sst; } - public SavedStateTracker save(StateMachineBuilder smb, CodeBuilder cob, int loc_off, int stack_off) { + public SavedStateTracker save(CoroutineBuilder smb, CodeBuilder cob, int loc_off, int stack_off) { var sst = new SavedStateTracker(); return save(smb, cob, sst, loc_off, stack_off); } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/FrameTracker.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/FrameTracker.java index ead6041..9c7f9d0 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/FrameTracker.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/FrameTracker.java @@ -7,7 +7,6 @@ import java.lang.classfile.attribute.StackMapFrameInfo; import java.lang.classfile.attribute.StackMapTableAttribute; import java.lang.classfile.instruction.*; import java.lang.constant.*; -import java.lang.reflect.AccessFlag; import java.util.*; import static java.lang.constant.ConstantDescs.*; @@ -30,7 +29,7 @@ public class FrameTracker { ITEM_LONG_2ND = 13, ITEM_DOUBLE_2ND = 14; - public static ArrayList frames(StateMachineBuilder smb, CodeModel src_com) { + public static ArrayList frames(CoroutineBuilder smb, CodeModel src_com) { var ft = new FrameTracker(smb, src_com); var frames = new ArrayList(); for(var coe : src_com){ @@ -163,7 +162,7 @@ public class FrameTracker { final ArrayList stack = new ArrayList<>(); final ArrayList locals = new ArrayList<>(); - final StateMachineBuilder smb; + final CoroutineBuilder smb; LineNumber current_line_number = null; int bci = 0; @@ -176,7 +175,7 @@ public class FrameTracker { final HashMap> annotationEndMap = new HashMap<>(); - FrameTracker(StateMachineBuilder smb, CodeModel com) { + FrameTracker(CoroutineBuilder smb, CodeModel com) { this.smb = smb; int offset = 0; diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SavedStateTracker.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SavedStateTracker.java index 12965e9..e5490be 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SavedStateTracker.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SavedStateTracker.java @@ -18,18 +18,18 @@ public class SavedStateTracker { } - private String get_name(StateMachineBuilder smb, ClassDesc desc){ + private String get_name(CoroutineBuilder smb, ClassDesc desc){ var value = smb.lstate.stream() // find unused state .filter(v -> saved.stream().noneMatch(s -> s.name().equals(v.name()))) .filter(v -> v.cd().equals(desc)).findFirst(); if(value.isPresent()) return value.get().name(); - var name = StateMachineBuilder.LOCAL_PREFIX+smb.lstate.size(); - smb.lstate.add(new StateMachineBuilder.LState(name, desc)); + var name = CoroutineBuilder.LOCAL_PREFIX+smb.lstate.size(); + smb.lstate.add(new CoroutineBuilder.LState(name, desc)); return name; } - public SavedState save_stack(StateMachineBuilder smb, CodeBuilder cob, ClassDesc desc){ + public SavedState save_stack(CoroutineBuilder smb, CodeBuilder cob, ClassDesc desc){ var name = get_name(smb, desc); if(TypeKind.from(desc).slotSize()==2){ @@ -43,7 +43,7 @@ public class SavedStateTracker { return s; } - public SavedState save_local(StateMachineBuilder smb, CodeBuilder cob, ClassDesc desc, int slot){ + public SavedState save_local(CoroutineBuilder smb, CodeBuilder cob, ClassDesc desc, int slot){ var name = get_name(smb, desc); cob.aload(0).loadLocal(TypeKind.from(desc), slot).putfield(smb.CD_this, name, desc); @@ -63,7 +63,7 @@ public class SavedStateTracker { throw new RuntimeException(); } - public SavedStateTracker restore(StateMachineBuilder smb, CodeBuilder cob, SavedState s){ + public SavedStateTracker restore(CoroutineBuilder smb, CodeBuilder cob, SavedState s){ if(!saved.remove(s))throw new IllegalStateException(); switch(s){ case LocalState(var name, var desc, int slot) -> @@ -74,21 +74,21 @@ public class SavedStateTracker { return this; } - public void restore_stack(StateMachineBuilder smb, CodeBuilder cob){ + public void restore_stack(CoroutineBuilder smb, CodeBuilder cob){ for(int i = saved.size()-1; i >= 0; i --){ if(saved.get(i) instanceof StackState) restore(smb, cob, saved.get(i)); } } - public void restore_locals(StateMachineBuilder smb, CodeBuilder cob){ + public void restore_locals(CoroutineBuilder smb, CodeBuilder cob){ for(int i = saved.size()-1; i >= 0; i --){ if(saved.get(i) instanceof StackState) restore(smb, cob, saved.get(i)); } } - public void restore_all(StateMachineBuilder smb, CodeBuilder cob) { + public void restore_all(CoroutineBuilder smb, CodeBuilder cob) { while(!saved.isEmpty()) restore(smb, cob, saved.getLast()); } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodBuilder.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodBuilder.java index e6b8a4b..15733e4 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodBuilder.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodBuilder.java @@ -2,6 +2,6 @@ package com.parkertenbroeck.bcsm.loadtime; import java.lang.classfile.CodeBuilder; -public interface SpecialMethodBuilder> { +public interface SpecialMethodBuilder> { SpecialMethodHandler build(T smb, CodeBuilder cob, Frame frame, StateBuilder sb); } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodHandler.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodHandler.java index 09eb72c..2208b64 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodHandler.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/SpecialMethodHandler.java @@ -2,7 +2,7 @@ package com.parkertenbroeck.bcsm.loadtime; import java.lang.classfile.CodeBuilder; -public interface SpecialMethodHandler { +public interface SpecialMethodHandler { void build_prelude(T smb, CodeBuilder cob, Frame frame); default boolean removeCall() { diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateBuilder.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateBuilder.java index 292513e..48454a9 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateBuilder.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/StateBuilder.java @@ -12,8 +12,8 @@ public class StateBuilder { cob.labelBinding(label); } - public void setState(StateMachineBuilder smb, CodeBuilder cob){ - cob.aload(0).loadConstant(id).putfield(smb.CD_this, StateMachineBuilder.STATE_NAME, ConstantDescs.CD_int); + public void setState(CoroutineBuilder smb, CodeBuilder cob){ + cob.aload(0).loadConstant(id).putfield(smb.CD_this, CoroutineBuilder.STATE_NAME, ConstantDescs.CD_int); } } diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/future/FutureSMBuilder.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/future/FutureSMBuilder.java index 1cdc2b0..1ce1e52 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/future/FutureSMBuilder.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/future/FutureSMBuilder.java @@ -11,7 +11,7 @@ import java.lang.reflect.Method; import java.util.*; import java.util.function.Consumer; -public class FutureSMBuilder extends StateMachineBuilder { +public class FutureSMBuilder extends CoroutineBuilder { public final static ClassDesc CD_Future = ClassDesc.ofDescriptor(Future.class.descriptorString()); public final static ClassDesc CD_Waker = ClassDesc.ofDescriptor(Waker.class.descriptorString()); diff --git a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/gen/GenSMBuilder.java b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/gen/GenSMBuilder.java index 38a9702..7f565e5 100644 --- a/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/gen/GenSMBuilder.java +++ b/lib/src/main/java/com/parkertenbroeck/bcsm/loadtime/gen/GenSMBuilder.java @@ -9,7 +9,7 @@ import java.lang.constant.ConstantDescs; import java.lang.constant.MethodTypeDesc; import java.util.List; -public class GenSMBuilder extends StateMachineBuilder { +public class GenSMBuilder extends CoroutineBuilder { public final static ClassDesc CD_Gen = ClassDesc.ofDescriptor(Gen.class.descriptorString()); public final static ClassDesc CD_Res = ClassDesc.ofDescriptor(Gen.Res.class.descriptorString()); diff --git a/settings.gradle.kts b/settings.gradle.kts index e234720..c86935e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,5 +3,5 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" } -rootProject.name = "generators" +rootProject.name = "coroutines" include("lib", "app") \ No newline at end of file