split mesh ui/work, change client/worker contract
This commit is contained in:
Stewart Allen
parent
aae6a5659a
commit
5153fb2ad9
5 changed files with 198 additions and 145 deletions
5
app.js
5
app.js
|
|
@ -446,7 +446,7 @@ const script = {
|
|||
"load/file",
|
||||
"moto/broker",
|
||||
"moto/idb",
|
||||
"main/mesh"
|
||||
"main/mesh-ui"
|
||||
],
|
||||
mesh_work : [
|
||||
"moto/worker",
|
||||
|
|
@ -468,7 +468,8 @@ const script = {
|
|||
"geo/polygons",
|
||||
"geo/mesh",
|
||||
"moto/broker",
|
||||
"moto/idb"
|
||||
"moto/idb",
|
||||
"main/mesh-work"
|
||||
]
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ let DOC = document,
|
|||
|
||||
function init() {
|
||||
let moto = self.moto,
|
||||
sky = false;
|
||||
sky = false,
|
||||
dark = false,
|
||||
ortho = false,
|
||||
zoomrev = true;
|
||||
zoomrev = true,
|
||||
zoomspd = 1,
|
||||
space = moto.Space,
|
||||
platform = space.platform;
|
||||
7
src/main/mesh-work.js
Normal file
7
src/main/mesh-work.js
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
|
||||
|
||||
"use strict";
|
||||
|
||||
(function() {
|
||||
|
||||
})();
|
||||
|
|
@ -6,47 +6,111 @@
|
|||
|
||||
let gapp = self.gapp = self.gapp || {},
|
||||
moto = self.moto = self.moto || {},
|
||||
time = function() { return new Date().getTime() },
|
||||
restarting = false,
|
||||
running = {},
|
||||
workurl = null,
|
||||
worker = null,
|
||||
seqid = 1;
|
||||
ccvalue = self.navigator ? navigator.hardwareConcurrency || 1 : 1,
|
||||
ccmax = ccvalue > 3 ? ccvalue - 1 : 0,
|
||||
workcc = false, // concurrent or not
|
||||
workurl = null, // url to load worker
|
||||
worknum = 1, // number of workers to start
|
||||
workers = [], // array of all workers
|
||||
queue = []; // array of work requests
|
||||
|
||||
if (moto.client) return;
|
||||
|
||||
/**
|
||||
* @param {Function} fn name of function in moto.worker
|
||||
* @param {Object} data to send to server
|
||||
* @param {Function} onreply function to call on reply messages
|
||||
* @param {Object[]} zerocopy array of objects to pass using zerocopy
|
||||
*/
|
||||
function send(fn, data, onreply, zerocopy) {
|
||||
let seq = seqid++;
|
||||
|
||||
if (onreply) {
|
||||
// establish listener and track replies
|
||||
running[seq] = { fn:onreply };
|
||||
}
|
||||
let msg = {
|
||||
seq: seq,
|
||||
task: fn,
|
||||
time: time(),
|
||||
data: data
|
||||
};
|
||||
try {
|
||||
worker.postMessage(msg, zerocopy);
|
||||
} catch (error) {
|
||||
console.trace('work send error', {data, error});
|
||||
}
|
||||
}
|
||||
|
||||
// code is running in the browser / client context
|
||||
let client = moto.client = {
|
||||
send: send,
|
||||
|
||||
active: () => {
|
||||
return workers.length;
|
||||
},
|
||||
|
||||
call: (task, data, options = {}) => {
|
||||
let { direct, stream } = options;
|
||||
return new Promise((resolve, reject) => {
|
||||
let ondata, ondone, onerror = reject;
|
||||
if (!stream) {
|
||||
let accum = [];
|
||||
ondata = (data) => {
|
||||
accum.push(data);
|
||||
};
|
||||
ondone = () => {
|
||||
resolve(accum);
|
||||
};
|
||||
} else {
|
||||
ondata = stream;
|
||||
ondone = resolve;
|
||||
}
|
||||
client.queue(task, data, { direct, ondata, ondone, onerror });
|
||||
});
|
||||
},
|
||||
|
||||
queue: (task, data, options = {}) => {
|
||||
queue.push({task, data, options});
|
||||
client.kick();
|
||||
},
|
||||
|
||||
kick: () => {
|
||||
if (queue.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
let rec, worker;
|
||||
outer: for (let qrec of queue) {
|
||||
let { options } = qrec;
|
||||
let { index } = options;
|
||||
if (index >= 0) {
|
||||
// worker designated by index
|
||||
let mod = index % workers.length;
|
||||
if (workers[mod].run === null) {
|
||||
worker = workers[mod];
|
||||
rec = qrec;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// first available worker
|
||||
for (let i=0; i<workers.length; i++) {
|
||||
if (workers[i].run === null) {
|
||||
worker = workers[i];
|
||||
rec = qrec;
|
||||
break outer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!rec) {
|
||||
// nothing runnable
|
||||
return;
|
||||
}
|
||||
|
||||
// remove queue item
|
||||
let qindex = queue.indexOf(rec);
|
||||
if (qindex < 0) {
|
||||
throw "invalid queue record";
|
||||
}
|
||||
queue.splice(qindex,1);
|
||||
|
||||
let { task, data, options } = rec;
|
||||
let { direct, ondone, ondata, onerror } = options;
|
||||
|
||||
if (ondone || ondata) {
|
||||
worker.run = { ondone, ondata, onerror };
|
||||
}
|
||||
|
||||
let msg = {
|
||||
task,
|
||||
data,
|
||||
stream: ondata ? true : false
|
||||
};
|
||||
|
||||
try {
|
||||
worker.postMessage(msg, direct);
|
||||
} catch (error) {
|
||||
console.trace('work send error', {data, error});
|
||||
}
|
||||
},
|
||||
|
||||
// factory can be overridden
|
||||
newWorker: function(url = workurl) {
|
||||
spawn: function(url = workurl) {
|
||||
if (self.createWorker) {
|
||||
return self.createWorker();
|
||||
} else {
|
||||
|
|
@ -55,76 +119,80 @@ let client = moto.client = {
|
|||
},
|
||||
|
||||
// return number of running requests
|
||||
current: function() {
|
||||
let current = 0;
|
||||
for (let rec of Object.values(running)) {
|
||||
if (rec.fn) current++;
|
||||
}
|
||||
return current;
|
||||
running: function() {
|
||||
return workers.filter(w => w.run).length;
|
||||
},
|
||||
|
||||
stop: function() {
|
||||
if (worker) {
|
||||
worker.terminate();
|
||||
worker = null;
|
||||
for (let w of workers) {
|
||||
w.terminate();
|
||||
}
|
||||
workers = [];
|
||||
},
|
||||
|
||||
// same as restart
|
||||
start: function(url) {
|
||||
client.restart(url);
|
||||
start: function(url = workurl, cc = workcc) {
|
||||
workcc = cc;
|
||||
worknum = cc ? ccmax : 1;
|
||||
workurl = url;
|
||||
client.restart(url, cc);
|
||||
},
|
||||
|
||||
restart: function(url) {
|
||||
// prevent re-entry from cancel callback
|
||||
if (restarting) {
|
||||
return;
|
||||
}
|
||||
|
||||
restart: function() {
|
||||
client.stop();
|
||||
|
||||
restarting = true;
|
||||
|
||||
for (let key in running) {
|
||||
let rec = running[key];
|
||||
if (rec.fn) {
|
||||
rec.fn({error: "cancelled operation"});
|
||||
// send cancel/error notification to requestors
|
||||
for (let w of workers.filter(w => w.run)) {
|
||||
if (w.run.ondone) {
|
||||
w.run.ondone({error: "cancelled operation"});
|
||||
}
|
||||
}
|
||||
|
||||
running = {};
|
||||
worker = client.newWorker(url);
|
||||
for (let i=0; i<worknum; i++) {
|
||||
let worker = client.spawn(workurl);
|
||||
|
||||
// bind to client to enable synth injections
|
||||
client.onmessage = worker.onmessage = function(e) {
|
||||
let now = time(),
|
||||
reply = e.data,
|
||||
record = running[reply.seq],
|
||||
onreply = record ? record.fn : undefined;
|
||||
worker.run = null;
|
||||
worker.index = i;
|
||||
worker.onmessage = function(e) {
|
||||
if (worker.run === null) {
|
||||
console.log({unhandled: e});
|
||||
throw "message on idle worker";
|
||||
}
|
||||
|
||||
if (reply.register) {
|
||||
// console.log({register: reply.register});
|
||||
return;
|
||||
}
|
||||
let reply = e.data;
|
||||
let { done, data, error } = reply;
|
||||
let { ondone, ondata, onerror } = worker.run;
|
||||
let handled = false;
|
||||
|
||||
if (reply.done) {
|
||||
delete running[reply.seq];
|
||||
}
|
||||
if (error) {
|
||||
onerror(error);
|
||||
worker.run = null;
|
||||
handled = true;
|
||||
client.kick();
|
||||
}
|
||||
|
||||
// calculate and replace recv time
|
||||
reply.time_recv = now - reply.time_recv;
|
||||
if (ondata && data) {
|
||||
ondata(data);
|
||||
handled = true;
|
||||
}
|
||||
|
||||
if (onreply) {
|
||||
onreply(reply.data, reply);
|
||||
} else {
|
||||
console.log({drop_reply: reply});
|
||||
}
|
||||
};
|
||||
if (done) {
|
||||
ondone();
|
||||
worker.run = null;
|
||||
handled = true;
|
||||
client.kick();
|
||||
}
|
||||
|
||||
// signal worker client is ready
|
||||
worker.postMessage("--init--");
|
||||
if (!handled) {
|
||||
console.log({unhandled: e});
|
||||
throw "unhandled reply";
|
||||
}
|
||||
};
|
||||
|
||||
restarting = false;
|
||||
workers.push(worker);
|
||||
}
|
||||
|
||||
client.kick();
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ if (moto.worker) return;
|
|||
// allow license to inject module
|
||||
self.gapp = self.gapp || moto;
|
||||
|
||||
let isinit = false;
|
||||
let endpoints = {};
|
||||
|
||||
// code is running in the worker / server context
|
||||
|
|
@ -21,74 +20,52 @@ const dispatch = moto.worker = {
|
|||
|
||||
register: (name, fn) => {
|
||||
endpoints[name] = fn;
|
||||
sync(name);
|
||||
},
|
||||
|
||||
send: (msg) => {
|
||||
self.postMessage(msg);
|
||||
},
|
||||
|
||||
sync: (name) => {
|
||||
if (name) {
|
||||
if (isinit) dispatch.send({register: [name]});
|
||||
} else {
|
||||
dispatch.send({register: Object.keys(endpoints)});
|
||||
}
|
||||
},
|
||||
|
||||
onmessage: (e) => {
|
||||
|
||||
if (e.data === '--init--') {
|
||||
isinit = true;
|
||||
dispatch.sync();
|
||||
return;
|
||||
}
|
||||
|
||||
let time_recv = time(),
|
||||
msg = e.data || {},
|
||||
let msg = e.data,
|
||||
run = endpoints[msg.task],
|
||||
done = false,
|
||||
send = {
|
||||
data : function(data,direct) {
|
||||
dispatch.send({
|
||||
seq: msg.seq,
|
||||
task: msg.task,
|
||||
done: false,
|
||||
data: data
|
||||
}, direct);
|
||||
data: (data, direct) => {
|
||||
if (canSend(data)) {
|
||||
dispatch.send({ done: false, data: data }, direct);
|
||||
}
|
||||
},
|
||||
done : function(data,direct) {
|
||||
dispatch.send({
|
||||
seq: msg.seq,
|
||||
task: msg.task,
|
||||
done: true,
|
||||
data: data
|
||||
}, direct);
|
||||
done: (data, direct) => {
|
||||
if (canSend(data)) {
|
||||
dispatch.send({ done: true, data: data }, direct);
|
||||
done = true;
|
||||
}
|
||||
},
|
||||
error: (data) => {
|
||||
dispatch.send({ error: data });
|
||||
}
|
||||
},
|
||||
canSend = (data) => {
|
||||
if (done) {
|
||||
console.log("unexpected reply dropped", {data, msg});
|
||||
}
|
||||
return !done;
|
||||
};
|
||||
|
||||
if (run) {
|
||||
try {
|
||||
let time_xfer = (time_recv - msg.time),
|
||||
output = run(msg.data, send),
|
||||
time_send = time(),
|
||||
time_proc = time_send - time_recv;
|
||||
|
||||
if (output) dispatch.send({
|
||||
seq: msg.seq,
|
||||
task: msg.task,
|
||||
time_send: time_xfer,
|
||||
time_proc: time_proc,
|
||||
// replaced on reply side
|
||||
time_recv: time(),
|
||||
data: output
|
||||
});
|
||||
} catch (wrkerr) {
|
||||
// console.log(wrkerr);
|
||||
console.trace(wrkerr.stack);
|
||||
send.done({error: wrkerr.toString()});
|
||||
let data = run(msg.data, send);
|
||||
if (data) {
|
||||
send.done(data);
|
||||
}
|
||||
} catch (error) {
|
||||
console.trace(error.stack);
|
||||
dispatch.send({ data: {error: error.toString()}, done: true });
|
||||
}
|
||||
} else {
|
||||
console.log({worker_unhandled: e, msg, fn: dispatch[msg.task]});
|
||||
console.log({worker_unhandled: e});
|
||||
send.error(`no registered endpoint: ${msg.task}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue