@quenk/potoo 4.1.2 → 4.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/actor/system/vm/allocator/map.d.ts +0 -5
- package/lib/actor/system/vm/allocator/map.js +7 -8
- package/lib/actor/system/vm/allocator/map.js.map +1 -1
- package/lib/actor/system/vm/thread/runner.d.ts +1 -1
- package/lib/actor/system/vm/thread/runner.js +6 -6
- package/lib/actor/system/vm/thread/runner.js.map +1 -1
- package/lib/actor/system/vm/thread/shared/js.d.ts +4 -2
- package/lib/actor/system/vm/thread/shared/js.js +10 -3
- package/lib/actor/system/vm/thread/shared/js.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,6 @@ import { Lazy } from '@quenk/noni/lib/data/lazy';
|
|
|
3
3
|
import { Address } from '../../../address';
|
|
4
4
|
import { Template } from '../../../template';
|
|
5
5
|
import { Thread } from '../thread';
|
|
6
|
-
import { Actor } from '../../..';
|
|
7
6
|
import { VM } from '..';
|
|
8
7
|
import { Allocator } from './';
|
|
9
8
|
/**
|
|
@@ -25,10 +24,6 @@ export interface ActorTableEntry {
|
|
|
25
24
|
* template used to create the actor.
|
|
26
25
|
*/
|
|
27
26
|
template: Template;
|
|
28
|
-
/**
|
|
29
|
-
* actor instance for the entry.
|
|
30
|
-
*/
|
|
31
|
-
actor: Actor;
|
|
32
27
|
/**
|
|
33
28
|
* thread for the entry.
|
|
34
29
|
*/
|
|
@@ -9,6 +9,7 @@ const lazy_1 = require("@quenk/noni/lib/data/lazy");
|
|
|
9
9
|
const address_1 = require("../../../address");
|
|
10
10
|
const event_1 = require("../event");
|
|
11
11
|
const factory_1 = require("../thread/factory");
|
|
12
|
+
const js_1 = require("../thread/shared/js");
|
|
12
13
|
const MAX_THREAD_KILL_PER_CYCLE = 25;
|
|
13
14
|
/**
|
|
14
15
|
* MapAllocator stores actor information in a map structure where each
|
|
@@ -67,9 +68,12 @@ class MapAllocator {
|
|
|
67
68
|
mparentEntry = this.getEntry(parent);
|
|
68
69
|
if (mparentEntry.isNothing())
|
|
69
70
|
return future_1.Future.raise(new errors.InvalidThreadErr(parent));
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
.actor.
|
|
71
|
+
let parentThread = mparentEntry.get().thread;
|
|
72
|
+
if (parentThread instanceof js_1.JSThread) {
|
|
73
|
+
parentCons = parentThread.actor.isJust()
|
|
74
|
+
? parentThread.actor.get().constructor.name.toLowerCase()
|
|
75
|
+
: 'js';
|
|
76
|
+
}
|
|
73
77
|
}
|
|
74
78
|
let aid = this.nextAID++;
|
|
75
79
|
let id = (_a = template.id) !== null && _a !== void 0 ? _a : `instance::${parentCons}::aid::${aid}`;
|
|
@@ -79,15 +83,11 @@ class MapAllocator {
|
|
|
79
83
|
if (this.actors.has(address))
|
|
80
84
|
return future_1.Future.raise(new errors.DuplicateAddressErr(address));
|
|
81
85
|
let thread = factory_1.ThreadFactory.create(platform, address, template);
|
|
82
|
-
let actor = template.create
|
|
83
|
-
? template.create(thread)
|
|
84
|
-
: thread;
|
|
85
86
|
let entry = {
|
|
86
87
|
address,
|
|
87
88
|
parent: mparentEntry,
|
|
88
89
|
thread,
|
|
89
90
|
template,
|
|
90
|
-
actor: actor !== null && actor !== void 0 ? actor : thread,
|
|
91
91
|
children: []
|
|
92
92
|
};
|
|
93
93
|
this.actors.set(address, entry);
|
|
@@ -132,7 +132,6 @@ class MapAllocator {
|
|
|
132
132
|
}
|
|
133
133
|
let { events, collector, groups } = (0, lazy_1.evaluate)(this.platform);
|
|
134
134
|
await future_1.Future.batch((0, array_1.distribute)(targets.map(current => future_1.Future.do(async () => {
|
|
135
|
-
await current.actor.stop();
|
|
136
135
|
await current.thread.stop();
|
|
137
136
|
await collector.unmark(current.thread);
|
|
138
137
|
await events.dispatchActorEvent(current.thread.address, current.thread.address, event_1.EVENT_ACTOR_STOPPED);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../../../src/actor/system/vm/allocator/map.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE3C,sDAAmD;AACnD,iEAA8D;AAC9D,sDAA+D;AAC/D,oDAA2D;AAE3D,8CAA+D;AAE/D,oCAIkB;AAClB,+CAAkD;
|
|
1
|
+
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../../../src/actor/system/vm/allocator/map.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE3C,sDAAmD;AACnD,iEAA8D;AAC9D,sDAA+D;AAC/D,oDAA2D;AAE3D,8CAA+D;AAE/D,oCAIkB;AAClB,+CAAkD;AAClD,4CAA+C;AAK/C,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAmCrC;;;GAGG;AACH,MAAa,YAAY;IACrB,YACW,QAAkB,EAClB,SAAS,IAAI,GAAG,EAAE,EAClB,UAAU,CAAC;QAFX,aAAQ,GAAR,QAAQ,CAAU;QAClB,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAAI;IACnB,CAAC;IAEJ;;OAEG;IACH,QAAQ,CAAC,MAAc;QACnB,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO,aAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,aAAK,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,SAAS,CAAC,OAAgB;QACtB,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO;gBAAE,OAAO,aAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,aAAK,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,OAAmB;QAC1B,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnE,IAAI,IAAI,GAAG,EAAE,CAAC;QAEd,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACvB,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,OAAgB;QACxB,OAAO,aAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACnD,CAAC,KAAsB,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAC7C,CAAC;IACN,CAAC;IAED,WAAW,CAAC,MAAc;QACtB,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,MAAM,CAAC,SAAS,EAAE;YAAE,OAAO,EAAE,CAAC;QAElC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAc,EAAE,QAAkB;;QAC7C,IAAI,QAAQ,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEvC,IAAI,MAAM,GAAG,MAAM,KAAK,QAAQ,CAAC;QAEjC,IAAI,UAAU,GAAG,IAAI,CAAC;QAEtB,IAAI,YAAY,GAAG,aAAK,CAAC,OAAO,EAAmB,CAAC;QAEpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAErC,IAAI,YAAY,CAAC,SAAS,EAAE;gBACxB,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;YAE7D,IAAI,YAAY,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;YAC7C,IAAI,YAAY,YAAY,aAAQ,EAAE,CAAC;gBACnC,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE;oBACpC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE;oBACzD,CAAC,CAAC,IAAI,CAAC;YACf,CAAC;QACL,CAAC;QAED,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAEzB,IAAI,EAAE,GAAG,MAAA,QAAQ,CAAC,EAAE,mCAAI,aAAa,UAAU,UAAU,GAAG,EAAE,CAAC;QAE/D,IAAI,IAAA,sBAAY,EAAS,EAAE,CAAC;YACxB,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QAErD,IAAI,OAAO,GAAG,IAAA,cAAI,EAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;YACxB,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QAEjE,IAAI,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/D,IAAI,KAAK,GAAG;YACR,OAAO;YACP,MAAM,EAAE,YAAY;YACpB,MAAM;YACN,QAAQ;YACR,QAAQ,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEhC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAElE,IAAI,QAAQ,CAAC,KAAK;YAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEpE,IAAI,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,CAC/C,MAAM,EACN,MAAM,EACN,QAAQ,CAAC,YAAY,CACxB,CAAC;QAEF,MAAM,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CACpC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,6BAAqB,CACxB,CAAC;QAEF,yBAAyB;QACzB,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAElC,MAAM,cAAc,CAAC;QAErB,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC3B,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEnC,kCAAkC;QAClC,IAAI,MAAM,CAAC,SAAS,EAAE;YAClB,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAE7D,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC;QAE3B,2CAA2C;QAC3C,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtE,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC3B,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,MAAM,CAAC,SAAS,EAAE;YAAE,OAAO,CAAC,sBAAsB;QAEtD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QAEzB,sCAAsC;QACtC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACtB,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;QAEtB,IAAI,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAErC,OAAO,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,EAAE,CAAC;YACrB,IAAI,OAAO,GAAoB,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,gCAAgC;YAEhF,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YAE5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkC;QAChE,CAAC;QAED,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5D,MAAM,eAAM,CAAC,KAAK,CACd,IAAA,kBAAU,EACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAClB,eAAM,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;YACjB,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAE5B,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEvC,MAAM,MAAM,CAAC,kBAAkB,CAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,2BAAmB,CACtB,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEpC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,MAAM,MAAM,CAAC,kBAAkB,CAC3B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EACnC,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,+BAAuB,CAC1B,CAAC;QACV,CAAC,CAAC,CACL,EACD,yBAAyB,CAC5B,CACJ,CAAC;QAEF,mCAAmC;QACnC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;YACrB,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;CACJ;AA1MD,oCA0MC"}
|
|
@@ -46,14 +46,14 @@ class ThreadRunner {
|
|
|
46
46
|
* In that case we wait until the child threads have been removed.
|
|
47
47
|
* This will not hinder intentional exits.
|
|
48
48
|
*/
|
|
49
|
-
async runThread(
|
|
49
|
+
async runThread(thread) {
|
|
50
50
|
let { events, collector } = (0, lazy_1.evaluate)(this.vm);
|
|
51
51
|
// Ideally this should be done in the thread itself
|
|
52
|
-
await events.dispatchActorEvent(
|
|
53
|
-
if (
|
|
54
|
-
collector.mark(
|
|
55
|
-
await
|
|
56
|
-
await collector.collect(
|
|
52
|
+
await events.dispatchActorEvent(thread.address, thread.address, event_1.EVENT_ACTOR_STARTED);
|
|
53
|
+
if (thread.template.run)
|
|
54
|
+
collector.mark(thread);
|
|
55
|
+
await thread.start();
|
|
56
|
+
await collector.collect(thread);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
exports.ThreadRunner = ThreadRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../src/actor/system/vm/thread/runner.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAG3D,gDAO2B;AAC3B,oCAOkB;AAIlB,MAAM,YAAY,GAAG,CAAC,6BAAqB,EAAE,+BAAuB,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAsB;IACrC,CAAC,kCAAuB,CAAC,EAAE,6BAAqB;IAChD,CAAC,gCAAqB,CAAC,EAAE,2BAAmB;IAC5C,CAAC,kCAAuB,CAAC,EAAE,2BAAmB;IAC9C,CAAC,gCAAqB,CAAC,EAAE,2BAAmB;CAC/C,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,KAAwB,EAAE,EAAE,WACpD,OAAA,MAAA,aAAa,CAAC,KAAK,CAAC,mCAAI,6BAAqB,CAAA,EAAA,CAAC;AAElD;;;GAGG;AACH,MAAa,YAAY;IACrB,YAAmB,EAAY;QAAZ,OAAE,GAAF,EAAE,CAAU;IAAG,CAAC;IAEnC;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAChB,MAAc,EACd,KAAa,EACb,QAA2B,kCAAuB;QAElD,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEpC,sEAAsE;QACtE,mEAAmE;QACnE,OAAO,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../src/actor/system/vm/thread/runner.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAG3D,gDAO2B;AAC3B,oCAOkB;AAIlB,MAAM,YAAY,GAAG,CAAC,6BAAqB,EAAE,+BAAuB,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAsB;IACrC,CAAC,kCAAuB,CAAC,EAAE,6BAAqB;IAChD,CAAC,gCAAqB,CAAC,EAAE,2BAAmB;IAC5C,CAAC,kCAAuB,CAAC,EAAE,2BAAmB;IAC9C,CAAC,gCAAqB,CAAC,EAAE,2BAAmB;CAC/C,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,KAAwB,EAAE,EAAE,WACpD,OAAA,MAAA,aAAa,CAAC,KAAK,CAAC,mCAAI,6BAAqB,CAAA,EAAA,CAAC;AAElD;;;GAGG;AACH,MAAa,YAAY;IACrB,YAAmB,EAAY;QAAZ,OAAE,GAAF,EAAE,CAAU;IAAG,CAAC;IAEnC;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAChB,MAAc,EACd,KAAa,EACb,QAA2B,kCAAuB;QAElD,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEpC,sEAAsE;QACtE,mEAAmE;QACnE,OAAO,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,SAAS,CAAC,MAAc;QAC1B,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE9C,mDAAmD;QACnD,MAAM,MAAM,CAAC,kBAAkB,CAC3B,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,2BAAmB,CACtB,CAAC;QAEF,IAAwB,MAAM,CAAC,QAAS,CAAC,GAAG;YAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErE,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACJ;AAlDD,oCAkDC"}
|
|
@@ -2,9 +2,10 @@ import { Err } from '@quenk/noni/lib/control/error';
|
|
|
2
2
|
import { Case } from '@quenk/noni/lib/control/match/case';
|
|
3
3
|
import { SharedTemplate, Spawnable } from '../../../../template';
|
|
4
4
|
import { Address } from '../../../../address';
|
|
5
|
-
import { Message } from '../../../..';
|
|
5
|
+
import { Actor, Message } from '../../../..';
|
|
6
6
|
import { VM } from '../../';
|
|
7
7
|
import { SharedThread, ThreadState } from '.';
|
|
8
|
+
import { Maybe } from '@quenk/noni/lib/data/maybe';
|
|
8
9
|
export declare const ERR_THREAD_INVALID = "ERR_THREAD_INVALID";
|
|
9
10
|
/**
|
|
10
11
|
* JSThread is used by actors that run in the same event loop as the VM.
|
|
@@ -15,7 +16,8 @@ export declare class JSThread implements SharedThread {
|
|
|
15
16
|
address: Address;
|
|
16
17
|
mailbox: Message[];
|
|
17
18
|
state: ThreadState;
|
|
18
|
-
|
|
19
|
+
actor: Maybe<Actor>;
|
|
20
|
+
constructor(vm: VM, template: SharedTemplate, address: Address, mailbox?: Message[], state?: ThreadState, actor?: Maybe<Actor>);
|
|
19
21
|
readonly self: string;
|
|
20
22
|
_assertValid(): void;
|
|
21
23
|
isValid(): boolean;
|
|
@@ -11,18 +11,20 @@ const scheduler_1 = require("../../scheduler");
|
|
|
11
11
|
const _1 = require(".");
|
|
12
12
|
const event_1 = require("../../event");
|
|
13
13
|
const type_1 = require("@quenk/noni/lib/data/type");
|
|
14
|
+
const maybe_1 = require("@quenk/noni/lib/data/maybe");
|
|
14
15
|
const defaultCases = [new case_1.Default(function_1.identity)];
|
|
15
16
|
exports.ERR_THREAD_INVALID = 'ERR_THREAD_INVALID';
|
|
16
17
|
/**
|
|
17
18
|
* JSThread is used by actors that run in the same event loop as the VM.
|
|
18
19
|
*/
|
|
19
20
|
class JSThread {
|
|
20
|
-
constructor(vm, template, address, mailbox = [], state = _1.ThreadState.IDLE) {
|
|
21
|
+
constructor(vm, template, address, mailbox = [], state = _1.ThreadState.IDLE, actor = maybe_1.Maybe.nothing()) {
|
|
21
22
|
this.vm = vm;
|
|
22
23
|
this.template = template;
|
|
23
24
|
this.address = address;
|
|
24
25
|
this.mailbox = mailbox;
|
|
25
26
|
this.state = state;
|
|
27
|
+
this.actor = actor;
|
|
26
28
|
this.self = this.address;
|
|
27
29
|
}
|
|
28
30
|
_assertValid() {
|
|
@@ -40,7 +42,9 @@ class JSThread {
|
|
|
40
42
|
await run(this);
|
|
41
43
|
}
|
|
42
44
|
else if ((0, type_1.isFunction)(create)) {
|
|
43
|
-
await create(this)
|
|
45
|
+
let actor = await create(this);
|
|
46
|
+
this.actor = maybe_1.Maybe.just(actor);
|
|
47
|
+
await actor.start();
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
50
|
async notify(msg) {
|
|
@@ -50,7 +54,10 @@ class JSThread {
|
|
|
50
54
|
this.resume();
|
|
51
55
|
this.vm.scheduler.run();
|
|
52
56
|
}
|
|
53
|
-
async stop() {
|
|
57
|
+
async stop() {
|
|
58
|
+
if (this.actor.isJust())
|
|
59
|
+
await this.actor.get().stop();
|
|
60
|
+
}
|
|
54
61
|
async watch(task) {
|
|
55
62
|
this._assertValid();
|
|
56
63
|
await future_1.Future.do(task).catch(err => this.raise(err));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../../../src/actor/system/vm/thread/shared/js.ts"],"names":[],"mappings":";;;AACA,iEAA8D;AAC9D,sDAAmD;AACnD,6DAI4C;AAC5C,4DAAyD;AAEzD,mDAM8B;AAC9B,iDAA+D;AAC/D,+CAAuC;AAGvC,wBAA8C;AAC9C,uCAIqB;AACrB,oDAAuD;
|
|
1
|
+
{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../../../src/actor/system/vm/thread/shared/js.ts"],"names":[],"mappings":"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"}
|