git ssb

0+

wanderer🌟 / js-primea-hypervisor



Commit b507f49239a73767abbee979b4e637a6ca469764

Browse Files

rename exInterface to kernel

wanderer committed on 6/28/2017, 11:22:45 PM
Parent: bc2da75d6a6f6ec2b96cc47e79e74b6646010684

Files changed

index.jschanged
portManager.jschanged
exoInterface.jsdeleted
kernel.jsadded
index.jsView
@@ -1,7 +1,7 @@
11 const Graph = require('ipld-graph-builder')
22 const Message = require('primea-message')
3-const ExoInterface = require('./exoInterface.js')
3+const Kernel = require('./kernel.js')
44 const Scheduler = require('./scheduler.js')
55 const DFSchecker = require('./dfsChecker.js')
66
77 const ROOT_ID = 'zdpuAm6aTdLVMUuiZypxkwtA7sKm7BWERy8MPbaCrFsmiyzxr'
@@ -47,18 +47,18 @@
4747 const state = await this.graph.get(this.state, id)
4848 const container = this._containerTypes[state.type]
4949
5050 // create a new kernel instance
51- const exoInterface = new ExoInterface({
51+ const kernel = new Kernel({
5252 hypervisor: this,
5353 state: state,
5454 container: container,
5555 id: id
5656 })
5757
5858 // save the newly created instance
59- this.scheduler.update(exoInterface)
60- return exoInterface
59+ this.scheduler.update(kernel)
60+ return kernel
6161 }
6262
6363 /**
6464 * gets an existsing container instances
portManager.jsView
@@ -96,9 +96,9 @@
9696 * @param {string} name
9797 */
9898 delete (name) {
9999 const port = this.ports[name]
100- this.exInterface.send(port, new DeleteMessage())
100+ this.kernel.send(port, new DeleteMessage())
101101 this._delete(name)
102102 }
103103
104104 _delete (name) {
@@ -110,9 +110,9 @@
110110 * clears any unbounded ports referances
111111 */
112112 clearUnboundedPorts () {
113113 this._unboundPorts.forEach(port => {
114- this.exInterface.send(port, new DeleteMessage())
114+ this.kernel.send(port, new DeleteMessage())
115115 })
116116 this._unboundPorts.clear()
117117 if (Object.keys(this.ports).length === 0) {
118118 this.hypervisor.addNodeToCheck(this.id)
@@ -234,10 +234,10 @@
234234 while (!saturated && // end if there are messages on all the ports
235235 // end if we have a message older then slowest containers
236236 !((message && oldestTime >= message._fromTicks) ||
237237 // end if there are no messages and this container is the oldest contaner
238- (!message && oldestTime === this.exInterface.ticks))) {
239- const ticksToWait = message ? message._fromTicks : this.exInterface.ticks
238+ (!message && oldestTime === this.kernel.ticks))) {
239+ const ticksToWait = message ? message._fromTicks : this.kernel.ticks
240240
241241 await Promise.race([
242242 this.hypervisor.scheduler.wait(ticksToWait, this.id).then(() => {
243243 message = this._peekNextMessage()
exoInterface.jsView
@@ -1,146 +1,0 @@
1-const Message = require('primea-message')
2-const PortManager = require('./portManager.js')
3-const DeleteMessage = require('./deleteMessage')
4-
5-module.exports = class ExoInterface {
6- /**
7- * the ExoInterface manages the varous message passing functions and provides
8- * an interface for the containers to use
9- * @param {Object} opts
10- * @param {Object} opts.id
11- * @param {Object} opts.state
12- * @param {Object} opts.hypervisor
13- * @param {Object} opts.Container
14- */
15- constructor (opts) {
16- this.state = opts.state
17- this.hypervisor = opts.hypervisor
18- this.id = opts.id
19- this.container = new opts.container.Constructor(this, opts.container.args)
20-
21- this.ticks = 0
22- this.containerState = 'idle'
23-
24- // create the port manager
25- this.ports = new PortManager(Object.assign({
26- exInterface: this
27- }, opts))
28- }
29-
30- /**
31- * adds a message to this containers message queue
32- * @param {string} portName
33- * @param {object} message
34- */
35- queue (portName, message) {
36- message._hops++
37- if (portName) {
38- this.ports.queue(portName, message)
39- if (this.containerState !== 'running') {
40- this.containerState = 'running'
41- this._runNextMessage()
42- }
43- } else {
44- // initailiazation message
45- this.containerState = 'running'
46- this.run(message, true)
47- }
48- }
49-
50- // waits for the next message
51- async _runNextMessage () {
52- // check if the ports are saturated, if so we don't have to wait on the
53- // scheduler
54- const message = await this.ports.getNextMessage()
55-
56- if (!message) {
57- // if no more messages then shut down
58- this.hypervisor.scheduler.done(this.id)
59- } else {
60- message.fromPort.messages.shift()
61- // if the message we recived had more ticks then we currently have the
62- // update it
63- if (message._fromTicks > this.ticks) {
64- this.ticks = message._fromTicks
65- }
66- this.hypervisor.scheduler.update(this)
67- // run the next message
68- this.run(message)
69- }
70- }
71-
72- /**
73- * run the kernels code with a given enviroment
74- * The Kernel Stores all of its state in the Environment. The Interface is used
75- * to by the VM to retrive infromation from the Environment.
76- * @returns {Promise}
77- */
78- async run (message, init = false) {
79- let result
80- message.ports.forEach(port => this.ports._unboundPorts.add(port))
81- if (message.constructor === DeleteMessage) {
82- this.ports._delete(message.fromName)
83- } else {
84- const method = init ? 'initailize' : 'run'
85- try {
86- result = await this.container[method](message) || {}
87- } catch (e) {
88- result = {
89- exception: true,
90- exceptionError: e
91- }
92- }
93- }
94- this.ports.clearUnboundedPorts()
95- // message.response(result)
96- this._runNextMessage()
97- return result
98- }
99-
100- /**
101- * updates the number of ticks that the container has run
102- * @param {Number} count - the number of ticks to add
103- */
104- incrementTicks (count) {
105- this.ticks += count
106- this.hypervisor.scheduler.update(this)
107- }
108-
109- /**
110- * creates a new message
111- * @param {*} data
112- */
113- createMessage (opts) {
114- const message = new Message(opts)
115- for (const port of message.ports) {
116- if (this.ports.isBound(port)) {
117- throw new Error('message must not contain bound ports')
118- }
119- }
120- return message
121- }
122-
123- /**
124- * sends a message to a given port
125- * @param {Object} portRef - the port
126- * @param {Message} message - the message
127- */
128- async send (port, message) {
129- // set the port that the message came from
130- message._fromTicks = this.ticks
131- message.ports.forEach(port => this.ports._unboundPorts.delete(port))
132-
133- // if (this.currentMessage !== message && !message.responsePort) {
134- // this.currentMessage._addSubMessage(message)
135- // }
136-
137- if (port.destId) {
138- const id = port.destId
139- const instance = await this.hypervisor.getInstance(id)
140- instance.queue(port.destName, message)
141- } else {
142- // port is unbound
143- port.destPort.messages.push(message)
144- }
145- }
146-}
kernel.jsView
@@ -1,0 +1,146 @@
1+const Message = require('primea-message')
2+const PortManager = require('./portManager.js')
3+const DeleteMessage = require('./deleteMessage')
4+
5+module.exports = class Kernel {
6+ /**
7+ * the ExoInterface manages the varous message passing functions and provides
8+ * an interface for the containers to use
9+ * @param {Object} opts
10+ * @param {Object} opts.id
11+ * @param {Object} opts.state
12+ * @param {Object} opts.hypervisor
13+ * @param {Object} opts.Container
14+ */
15+ constructor (opts) {
16+ this.state = opts.state
17+ this.hypervisor = opts.hypervisor
18+ this.id = opts.id
19+ this.container = new opts.container.Constructor(this, opts.container.args)
20+
21+ this.ticks = 0
22+ this.containerState = 'idle'
23+
24+ // create the port manager
25+ this.ports = new PortManager(Object.assign({
26+ kernel: this
27+ }, opts))
28+ }
29+
30+ /**
31+ * adds a message to this containers message queue
32+ * @param {string} portName
33+ * @param {object} message
34+ */
35+ queue (portName, message) {
36+ message._hops++
37+ if (portName) {
38+ this.ports.queue(portName, message)
39+ if (this.containerState !== 'running') {
40+ this.containerState = 'running'
41+ this._runNextMessage()
42+ }
43+ } else {
44+ // initailiazation message
45+ this.containerState = 'running'
46+ this.run(message, true)
47+ }
48+ }
49+
50+ // waits for the next message
51+ async _runNextMessage () {
52+ // check if the ports are saturated, if so we don't have to wait on the
53+ // scheduler
54+ const message = await this.ports.getNextMessage()
55+
56+ if (!message) {
57+ // if no more messages then shut down
58+ this.hypervisor.scheduler.done(this.id)
59+ } else {
60+ message.fromPort.messages.shift()
61+ // if the message we recived had more ticks then we currently have the
62+ // update it
63+ if (message._fromTicks > this.ticks) {
64+ this.ticks = message._fromTicks
65+ }
66+ this.hypervisor.scheduler.update(this)
67+ // run the next message
68+ this.run(message)
69+ }
70+ }
71+
72+ /**
73+ * run the kernels code with a given enviroment
74+ * The Kernel Stores all of its state in the Environment. The Interface is used
75+ * to by the VM to retrive infromation from the Environment.
76+ * @returns {Promise}
77+ */
78+ async run (message, init = false) {
79+ let result
80+ message.ports.forEach(port => this.ports._unboundPorts.add(port))
81+ if (message.constructor === DeleteMessage) {
82+ this.ports._delete(message.fromName)
83+ } else {
84+ const method = init ? 'initailize' : 'run'
85+ try {
86+ result = await this.container[method](message) || {}
87+ } catch (e) {
88+ result = {
89+ exception: true,
90+ exceptionError: e
91+ }
92+ }
93+ }
94+ this.ports.clearUnboundedPorts()
95+ // message.response(result)
96+ this._runNextMessage()
97+ return result
98+ }
99+
100+ /**
101+ * updates the number of ticks that the container has run
102+ * @param {Number} count - the number of ticks to add
103+ */
104+ incrementTicks (count) {
105+ this.ticks += count
106+ this.hypervisor.scheduler.update(this)
107+ }
108+
109+ /**
110+ * creates a new message
111+ * @param {*} data
112+ */
113+ createMessage (opts) {
114+ const message = new Message(opts)
115+ for (const port of message.ports) {
116+ if (this.ports.isBound(port)) {
117+ throw new Error('message must not contain bound ports')
118+ }
119+ }
120+ return message
121+ }
122+
123+ /**
124+ * sends a message to a given port
125+ * @param {Object} portRef - the port
126+ * @param {Message} message - the message
127+ */
128+ async send (port, message) {
129+ // set the port that the message came from
130+ message._fromTicks = this.ticks
131+ message.ports.forEach(port => this.ports._unboundPorts.delete(port))
132+
133+ // if (this.currentMessage !== message && !message.responsePort) {
134+ // this.currentMessage._addSubMessage(message)
135+ // }
136+
137+ if (port.destId) {
138+ const id = port.destId
139+ const instance = await this.hypervisor.getInstance(id)
140+ instance.queue(port.destName, message)
141+ } else {
142+ // port is unbound
143+ port.destPort.messages.push(message)
144+ }
145+ }
146+}

Built with git-ssb-web