Skip to content

CPO support for reactor networking #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: horizon
Choose a base branch
from
Draft

CPO support for reactor networking #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions src/web/js/trove/world.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
{ "import-type": "builtin", "name": "image-lib" },
{ "import-type": "builtin", "name": "world-lib" },
{ "import-type": "builtin", "name": "valueskeleton" },
{ "import-type": "builtin", "name": "reactors" }
{ "import-type": "builtin", "name": "reactors" },
{ "import-type": "builtin", "name": "reactor-events" },
],
nativeRequires: ["pyret-base/js/js-numbers"],
provides: {
Expand Down Expand Up @@ -52,7 +53,7 @@
"WorldConfigOption": ["data", "WorldConfigOption", ["a"], [], {}]
}
},
theModule: function(runtime, namespace, uri, imageLibraryLib, rawJsworld, VSlib, reactors, jsnums) {
theModule: function(runtime, namespace, uri, imageLibraryLib, rawJsworld, VSlib, reactors, reactorEvents, jsnums) {
var imageLibrary = runtime.getField(imageLibraryLib, "internal");
var isImage = imageLibrary.isImage;
var VS = runtime.getField(VSlib, "values");
Expand Down Expand Up @@ -153,7 +154,7 @@
});
}

function bigBangFromDict(init, dict, tracer) {
function bigBangFromDict(init, dict, tracer, connector) {
var handlers = [];
function add(k, constr) {
if(dict.hasOwnProperty(k)) {
Expand All @@ -174,6 +175,11 @@
handlers.push(runtime.makeOpaque(new OnTick(dict["on-tick"], DEFAULT_TICK_DELAY * 1000)));
}
}

if (dict.hasOwnProperty["on-recieve-send"]) {
handlers.push(runtime.makeOpaque(new OnRecieveSend(dict["on-recieve-send"], connector)));
}

add("on-mouse", OnMouse);
add("on-key", OnKey);
add("on-raw-key", OnRawKey);
Expand Down Expand Up @@ -293,7 +299,7 @@
// NOTE(joe): This expects there to be no active run for runtime
// (it should be paused). The run gets paused by pauseStack() in the
// call to bigBang, so these runs will all be fresh
var adaptWorldFunction = function(worldFunction) {
var adaptWorldFunction = function(worldFunction, connector) {
return function() {
// Consumes any number of arguments.
var success = arguments[arguments.length - 1];
Expand All @@ -312,7 +318,13 @@
{ sync: false },
function(result) {
if(runtime.isSuccessResult(result)) {
success(result.result);
runtime.ffi.cases(runtime.getField(reactorEvents, "is-SendingHandlerResult"), "SendingHandlerResult", result.result, {
update: success,
send(newState, toSend) {
runtime.getField(connector, "handle-message-return").app(toSend);
success(newState);
}
});
}
else {
return rawJsworld.shutdown({errorShutdown: result.exn});
Expand Down Expand Up @@ -464,6 +476,22 @@
});
};

class OnRecieveSend extends WorldConfigOption {
constructor(handler, connector) {
super("on-recieve-send");
this.handler = handler;
this.connector = connector;
}

toRawHandler(topLevelNode) {
const worldFunction = adaptWorldFunction(this.handler, this.connector);
return rawJsworld.on_message(
(w, message, success) =>
worldFunction(w, message, success)
);
}
}




Expand Down