git ssb

0+

wanderer🌟 / js-primea-hypervisor



Commit 69542e9b41cc18d3434269b364a714712a5a5631

Browse Files

rename exports to module

wanderer committed on 2/13/2018, 12:46:27 AM
Parent: e729c860b2eaa16901cefd395558a96c683a5cad

Files changed

index.jschanged
tests/index.jschanged
tests/wasm/caller.wasmchanged
tests/wasmContainer.jschanged
tests/wast2wasm.jschanged
wasmContainer.jschanged
index.jsView
@@ -58,9 +58,9 @@
5858 async createActor (type, code, id = {nonce: this.nonce++, parent: null}) {
5959 const Container = this._containerTypes[type]
6060 const encoded = encodedID(id)
6161 const idHash = await this._getHashFromObj(encoded)
62- const exports = await Container.onCreation(code, idHash, this.tree.dag._dag)
62+ const module = await Container.onCreation(code, idHash, this.tree.dag._dag)
6363 const metaData = Actor.serializeMetaData(type)
6464
6565 // save the container in the state
6666 this.tree.set(idHash, metaData)
@@ -68,9 +68,9 @@
6868 this.tree.set(Buffer.concat([idHash, Buffer.from([0])]), code)
6969 }
7070 return {
7171 id: idHash,
72- exports: exports
72+ module: module
7373 }
7474 }
7575
7676 // get a hash from a POJO
tests/index.jsView
@@ -47,12 +47,12 @@
4747
4848 const hypervisor = new Hypervisor(tree)
4949 hypervisor.registerContainer(testVMContainer)
5050
51- const {exports} = await hypervisor.createActor(testVMContainer.typeId)
51+ const {module} = await hypervisor.createActor(testVMContainer.typeId)
5252
5353 const message = new Message({
54- funcRef: exports.main,
54+ funcRef: module.main,
5555 funcArguments: [1]
5656 })
5757 hypervisor.send(message)
5858
@@ -93,14 +93,14 @@
9393 const hypervisor = new Hypervisor(tree)
9494 hypervisor.registerContainer(testVMContainerA)
9595 hypervisor.registerContainer(testVMContainerB)
9696
97- const {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
98- const {exports: exportsA} = await hypervisor.createActor(testVMContainerA.typeId)
97+ const {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
98+ const {module: moduleA} = await hypervisor.createActor(testVMContainerA.typeId)
9999
100100 const message = new Message({
101- funcRef: exportsA.main,
102- funcArguments: [exportsB.main]
101+ funcRef: moduleA.main,
102+ funcArguments: [moduleB.main]
103103 })
104104
105105 hypervisor.send(message)
106106
@@ -141,20 +141,20 @@
141141 const hypervisor = new Hypervisor(tree)
142142 hypervisor.registerContainer(testVMContainerA)
143143 hypervisor.registerContainer(testVMContainerB)
144144
145- let {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
146- let {exports: exportsA0} = await hypervisor.createActor(testVMContainerA.typeId)
147- let {exports: exportsA1} = await hypervisor.createActor(testVMContainerA.typeId)
145+ let {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
146+ let {module: moduleA0} = await hypervisor.createActor(testVMContainerA.typeId)
147+ let {module: moduleA1} = await hypervisor.createActor(testVMContainerA.typeId)
148148
149149 const message0 = new Message({
150- funcRef: exportsA0.main,
151- funcArguments: [exportsB.main]
150+ funcRef: moduleA0.main,
151+ funcArguments: [moduleB.main]
152152 })
153153
154154 const message1 = new Message({
155- funcRef: exportsA1.main,
156- funcArguments: [exportsB.main]
155+ funcRef: moduleA1.main,
156+ funcArguments: [moduleB.main]
157157 })
158158
159159 await hypervisor.send(message0)
160160 await hypervisor.send(message1)
@@ -202,14 +202,14 @@
202202 let actorA0 = await hypervisor.createActor(testVMContainerA.typeId)
203203 let actorA1 = await hypervisor.createActor(testVMContainerA.typeId)
204204
205205 const message0 = new Message({
206- funcRef: actorA0.exports.main,
207- funcArguments: [actorB.exports.main]
206+ funcRef: actorA0.module.main,
207+ funcArguments: [actorB.module.main]
208208 })
209209 const message1 = new Message({
210- funcRef: actorA1.exports.main,
211- funcArguments: [actorB.exports.main]
210+ funcRef: actorA1.module.main,
211+ funcArguments: [actorB.module.main]
212212 })
213213
214214 hypervisor.send(message0)
215215 hypervisor.send(message1)
@@ -254,13 +254,13 @@
254254 const hypervisor = new Hypervisor(tree)
255255 hypervisor.registerContainer(testVMContainerA)
256256 hypervisor.registerContainer(testVMContainerB)
257257
258- let {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
259- let {exports: exportsA} = await hypervisor.createActor(testVMContainerA.typeId)
258+ let {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
259+ let {module: moduleA} = await hypervisor.createActor(testVMContainerA.typeId)
260260 const message = new Message({
261- funcRef: exportsA.main,
262- funcArguments: [exportsB.main]
261+ funcRef: moduleA.main,
262+ funcArguments: [moduleB.main]
263263 })
264264 hypervisor.send(message)
265265 const stateRoot = await hypervisor.createStateRoot()
266266 t.deepEquals(stateRoot, expectedState, 'expected root!')
@@ -277,11 +277,11 @@
277277 })
278278
279279 class testVMContainerA extends BaseContainer {
280280 async start (funcRef) {
281- const {exports} = await this.actor.createActor(testVMContainerB.typeId)
281+ const {module} = await this.actor.createActor(testVMContainerB.typeId)
282282 const message = new Message({
283- funcRef: exports.main,
283+ funcRef: module.main,
284284 funcArguments: [this.actor.getFuncRef('main')]
285285 })
286286 this.actor.send(message)
287287 }
@@ -303,10 +303,10 @@
303303 const hypervisor = new Hypervisor(tree)
304304 hypervisor.registerContainer(testVMContainerA)
305305 hypervisor.registerContainer(testVMContainerB)
306306
307- const {exports} = await hypervisor.createActor(testVMContainerA.typeId)
308- await hypervisor.send(new Message({funcRef: exports.start}))
307+ const {module} = await hypervisor.createActor(testVMContainerA.typeId)
308+ await hypervisor.send(new Message({funcRef: module.start}))
309309
310310 const stateRoot = await hypervisor.createStateRoot()
311311 t.deepEquals(stateRoot, expectedState, 'expected root!')
312312 })
@@ -366,13 +366,13 @@
366366 const hypervisor = new Hypervisor(tree)
367367 hypervisor.registerContainer(testVMContainerA)
368368 hypervisor.registerContainer(testVMContainerB)
369369
370- const {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
371- const {exports: exportsA} = await hypervisor.createActor(testVMContainerA.typeId)
370+ const {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
371+ const {module: moduleA} = await hypervisor.createActor(testVMContainerA.typeId)
372372 const message = new Message({
373- funcRef: exportsA.main,
374- funcArguments: [exportsB.main]
373+ funcRef: moduleA.main,
374+ funcArguments: [moduleB.main]
375375 })
376376 hypervisor.send(message)
377377
378378 const stateRoot = await hypervisor.createStateRoot()
@@ -423,25 +423,25 @@
423423 const hypervisor = new Hypervisor(tree)
424424 hypervisor.registerContainer(testVMContainerA)
425425 hypervisor.registerContainer(testVMContainerB)
426426
427- let {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
427+ let {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
428428 hypervisor.send(new Message({
429- funcRef: exportsB.main,
429+ funcRef: moduleB.main,
430430 funcArguments: ['first']
431431 }))
432432
433- const {exports: exportsA0} = await hypervisor.createActor(testVMContainerA.typeId)
433+ const {module: moduleA0} = await hypervisor.createActor(testVMContainerA.typeId)
434434
435435 hypervisor.send(new Message({
436- funcRef: exportsA0.main,
437- funcArguments: [exportsB.main, 'second']
436+ funcRef: moduleA0.main,
437+ funcArguments: [moduleB.main, 'second']
438438 }))
439439
440- const {exports: exportsA1} = await hypervisor.createActor(testVMContainerA.typeId)
440+ const {module: moduleA1} = await hypervisor.createActor(testVMContainerA.typeId)
441441 hypervisor.send(new Message({
442- funcRef: exportsA1.main,
443- funcArguments: [exportsB.main, 'third']
442+ funcRef: moduleA1.main,
443+ funcArguments: [moduleB.main, 'third']
444444 }))
445445
446446 const stateRoot = await hypervisor.createStateRoot()
447447 t.deepEquals(stateRoot, expectedState, 'expected root!')
@@ -493,14 +493,14 @@
493493 const hypervisor = new Hypervisor(tree)
494494 hypervisor.registerContainer(testVMContainerA)
495495 hypervisor.registerContainer(testVMContainerB)
496496
497- const {exports: exportsB} = await hypervisor.createActor(testVMContainerB.typeId)
498- const {exports: exportsA} = await hypervisor.createActor(testVMContainerA.typeId)
497+ const {module: moduleB} = await hypervisor.createActor(testVMContainerB.typeId)
498+ const {module: moduleA} = await hypervisor.createActor(testVMContainerA.typeId)
499499
500500 const message = new Message({
501- funcRef: exportsA.main,
502- funcArguments: [exportsB.main]
501+ funcRef: moduleA.main,
502+ funcArguments: [moduleB.main]
503503 })
504504
505505 hypervisor.send(message)
506506
@@ -543,10 +543,10 @@
543543
544544 const refernces = []
545545 let _numOfActors = numOfActors
546546 while (_numOfActors--) {
547- const {exports} = await hypervisor.createActor(BenchmarkContainer.typeId)
548- refernces.push(exports.main)
547+ const {module} = await hypervisor.createActor(BenchmarkContainer.typeId)
548+ refernces.push(module.main)
549549 }
550550 _numOfActors = numOfActors
551551 let msgs = []
552552 while (_numOfActors--) {
tests/wasm/caller.wasmView
@@ -1,4 +1,3 @@
1-asm
2-type`` typeMap
1+asm
32 ``func internalizeptablecall
43 A AA
tests/wasmContainer.jsView
@@ -34,9 +34,9 @@
3434 return this.refs.add(obj)
3535 }
3636 }
3737
38-tape('basic', async t => {
38+tape.only('basic', async t => {
3939 t.plan(2)
4040 tester = t
4141 const expectedState = {
4242 '/': Buffer.from('4494963fb0e02312510e675fbca8b60b6e03bd00', 'hex')
@@ -50,12 +50,12 @@
5050
5151 const hypervisor = new Hypervisor(tree)
5252 hypervisor.registerContainer(TestWasmContainer)
5353
54- const {exports} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
54+ const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
5555
5656 const message = new Message({
57- funcRef: exports.receive,
57+ funcRef: module.getFuncRef('receive'),
5858 funcArguments: [5]
5959 })
6060 hypervisor.send(message)
6161 const stateRoot = await hypervisor.createStateRoot()
@@ -89,10 +89,10 @@
8989 const stateRoot = await hypervisor.createStateRoot()
9090 t.deepEquals(stateRoot, expectedState, 'expected root!')
9191 })
9292
93-tape.skip('two communicating actors with callback', async t => {
94- t.plan(2)
93+tape('two communicating actors with callback', async t => {
94+ // t.plan(2)
9595 tester = t
9696 const expectedState = {
9797 '/': Buffer.from('f3cc5ba63d6b1737bea2c33bd1942e5488787b82', 'hex')
9898 }
@@ -100,10 +100,10 @@
100100 const tree = new RadixTree({
101101 db
102102 })
103103
104- const recieverWasm = fs.readFileSync('./wasm/reciever.wasm')
105- const callerWasm = fs.readFileSync('./wasm/caller.wasm')
104+ const recieverWasm = fs.readFileSync('./wasm/funcRef_reciever.wasm')
105+ const callerWasm = fs.readFileSync('./wasm/funcRef_caller.wasm')
106106
107107 const hypervisor = new Hypervisor(tree)
108108 hypervisor.registerContainer(TestWasmContainer)
109109
@@ -116,9 +116,10 @@
116116 })
117117
118118 hypervisor.send(message)
119119 const stateRoot = await hypervisor.createStateRoot()
120- t.deepEquals(stateRoot, expectedState, 'expected root!')
120+ // t.deepEquals(stateRoot, expectedState, 'expected root!')
121+ t.end()
121122 })
122123
123124 // Increment a counter.
124125 tape.skip('increment', async t => {
tests/wast2wasm.jsView
@@ -17,13 +17,14 @@
1717 }
1818
1919 console.log(wat)
2020 const mod = wabt.parseWat('module.wast', wat)
21- let binary = Buffer.from(mod.toBinary({log: true}).buffer)
21+ const r = mod.toBinary({log: true})
22+ let binary = Buffer.from(r.buffer)
2223 if (json) {
2324 console.log(json)
2425 const buf = types.encodeJSON(json)
25- binary = types.injectCustomSection(buf, binary)
26+ // binary = types.injectCustomSection(buf, binary)
2627 }
2728 fs.writeFileSync(`${__dirname}/wasm/${file}.wasm`, binary)
2829 }
2930 }
wasmContainer.jsView
@@ -29,8 +29,9 @@
2929 0x60: 'func',
3030 0x40: 'block_type'
3131 }
3232
33+
3334 class ElementBuffer {
3435 constructor (size) {
3536 this._array = new Array(size)
3637 }
@@ -102,16 +103,35 @@
102103 this._container = container
103104 }
104105 }
105106
107+class ModuleRef {
108+ constructor (json, id) {
109+ this._json = json
110+ this.id = id
111+ }
112+
113+ getFuncRef (name) {
114+ return new FunctionRef(name, this._json, this.id)
115+ }
116+
117+ serialize () {
118+ return this._json
119+ }
120+
121+ static deserialize (serialized) {}
122+}
123+
106124 module.exports = class WasmContainer {
107125 constructor (actor) {
108126 this.actor = actor
109127 this.refs = new ReferanceMap()
110128 }
111129
112130 static async onCreation (wasm, id, cachedb) {
113- WebAssembly.validate(wasm)
131+ if (!WebAssembly.validate(wasm)) {
132+ throw new Error('invalid wasm binary')
133+ }
114134 let moduleJSON = wasm2json(wasm)
115135 const json = mergeTypeSections(moduleJSON)
116136 moduleJSON = wasmMetering.meterJSON(moduleJSON, {
117137 meterType: 'i32'
@@ -124,19 +144,11 @@
124144 new Promise((resolve, reject) => {
125145 cachedb.put(id.toString() + 'code', wasm.toString('hex'), resolve)
126146 })
127147 ])
128- const refs = {}
129- Object.keys(json.typeMap).forEach(key => {
130- refs[key] = new FunctionRef(key, json, id)
131- })
132- return refs
148+ return new ModuleRef(json, id)
133149 }
134150
135- sendMessage () {
136- console.log('send')
137- }
138-
139151 getInterface (funcRef) {
140152 const self = this
141153 return {
142154 func: {
@@ -168,11 +180,17 @@
168180 }
169181 },
170182 module: {
171183 new: code => {},
172- exports: (mod, name) => {},
184+ exports: (modRef, offset, length) => {
185+ const mod = this.refs.get(modRef, 'mod')
186+ let name = this.getMemory(offset, length)
187+ name = Buffer.from(name).toString()
188+ const funcRef = new FunctionRef(name, mod, this.actor.id)
189+ return this.refs.add(funcRef)
190+ },
173191 self: () => {
174- return this.refs.add(this.json)
192+ return this.refs.add(this.json, 'mod')
175193 }
176194 },
177195 memory: {
178196 externalize: (index, length) => {
@@ -292,9 +310,9 @@
292310 this.json = json
293311 }
294312
295313 getMemory (offset, length) {
296- return new DataBuffer(this.instance.exports.memory.buffer, offset, length)
314+ return new Uint8Array(this.instance.exports.memory.buffer, offset, length)
297315 }
298316
299317 static get typeId () {
300318 return 9

Built with git-ssb-web