git ssb - added gas accnting · wanderer🌟/js-primea-hypervisor@5013b5ed

Commit 5013b5ed5b183c9bd021b9b9b20f7df558b0a664

added gas accnting

Signed-off-by: wanderer <mjbecze@gmail.com>

wanderer committed on 3/2/2018, 7:05:41 AM
Parent: 1911acb3f97dde2484d79904419eb7e656a3a336

Files changed

index.js	changed
systemObjects.js	changed
tests/wasm/funcRef_reciever.wasm	changed
tests/wasmContainer.js	changed
tests/wast/funcRef_caller.wast	changed
tests/wast/funcRef_reciever.wast	changed
wasmContainer.js	changed

index.jsView
		@@ -76,9 +76,9 @@
76	76	await this.tree.graph.set(node.root, '1', code)
77	77	}
78	78	return {
79	79	id: idHash,
80		- module: module
	80	+ module
81	81	}
82	82	}
83	83
84	84	// get a hash from a POJO

systemObjects.jsView
		@@ -21,8 +21,9 @@
21	21	this.private = privateFunc
22	22	this.identifier = identifier
23	23	this.destId = id
24	24	this.params = params
	25	+ this.gas = 0
25	26	}
26	27
27	28	encodeCBOR (gen) {
28	29	return gen.write(new cbor.Tagged(TAGS.func, [

tests/wasm/funcRef_reciever.wasmView
		@@ -1,3 +1,3 @@
1	1	asmtypes``typeMap
2		-``funcinternalizeptablereceive
3		- AAA
	2	+``*funcinternalizefuncset_gas_budgetptablereceive
	3	+ A�� AAA

tests/wasmContainer.jsView
		@@ -47,11 +47,13 @@
47	47	const hypervisor = new Hypervisor(tree)
48	48	hypervisor.registerContainer(TestWasmContainer)
49	49
50	50	const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
	51	+ const funcRef = module.getFuncRef('receive')
	52	+ funcRef.gas = 300
51	53
52	54	const message = new Message({
53		- funcRef: module.getFuncRef('receive'),
	55	+ funcRef,
54	56	funcArguments: [5]
55	57	})
56	58	hypervisor.send(message)
57	59	const stateRoot = await hypervisor.createStateRoot()
		@@ -74,11 +76,15 @@
74	76	hypervisor.registerContainer(TestWasmContainer)
75	77
76	78	const {module: receiverMod} = await hypervisor.createActor(TestWasmContainer.typeId, recieverWasm)
77	79	const {module: callerMod} = await hypervisor.createActor(TestWasmContainer.typeId, callerWasm)
	80	+ const callFuncRef = callerMod.getFuncRef('call')
	81	+ const recvFuncRef = receiverMod.getFuncRef('receive')
	82	+ callFuncRef.gas = 100000
	83	+ recvFuncRef.gas = 1000
78	84	const message = new Message({
79		- funcRef: callerMod.getFuncRef('call'),
80		- funcArguments: [receiverMod.getFuncRef('receive')]
	85	+ funcRef: callFuncRef,
	86	+ funcArguments: [recvFuncRef]
81	87	})
82	88
83	89	hypervisor.send(message)
84	90	const stateRoot = await hypervisor.createStateRoot()
		@@ -104,19 +110,24 @@
104	110
105	111	const {module: callerMod} = await hypervisor.createActor(TestWasmContainer.typeId, callerWasm)
106	112	const {module: receiverMod} = await hypervisor.createActor(TestWasmContainer.typeId, recieverWasm)
107	113
	114	+ const callFuncRef = callerMod.getFuncRef('call')
	115	+ const recvFuncRef = receiverMod.getFuncRef('receive')
	116	+ callFuncRef.gas = 100000
	117	+ recvFuncRef.gas = 100000
	118	+
108	119	const message = new Message({
109		- funcRef: callerMod.getFuncRef('call'),
110		- funcArguments: [receiverMod.getFuncRef('receive')]
	120	+ funcRef: callFuncRef,
	121	+ funcArguments: [recvFuncRef]
111	122	})
112	123
113	124	hypervisor.send(message)
114	125	const stateRoot = await hypervisor.createStateRoot()
115	126	// t.deepEquals(stateRoot, expectedState, 'expected root!')
116	127	})
117	128
118		-tape('two communicating actors with callback', async t => {
	129	+tape('two communicating actors with private callback', async t => {
119	130	t.plan(1)
120	131	tester = t
121	132	const expectedState = {
122	133	'/': Buffer.from('9bf27cf07b75a90e0af530e2df73e3102482b24a', 'hex')
		@@ -134,12 +145,17 @@
134	145
135	146	const {module: callerMod} = await hypervisor.createActor(TestWasmContainer.typeId, callerWasm)
136	147	const {module: receiverMod} = await hypervisor.createActor(TestWasmContainer.typeId, recieverWasm)
137	148
	149	+ const callFuncRef = callerMod.getFuncRef('call')
	150	+ const recvFuncRef = receiverMod.getFuncRef('receive')
	151	+ callFuncRef.gas = 100000
	152	+ recvFuncRef.gas = 100000
	153	+
138	154	const message = new Message({
139		- funcRef: callerMod.getFuncRef('call'),
140		- funcArguments: [receiverMod.getFuncRef('receive')]
141		- }).on('execution:error', (e) => {console.log(e)})
	155	+ funcRef: callFuncRef,
	156	+ funcArguments: [recvFuncRef]
	157	+ })
142	158
143	159	hypervisor.send(message)
144	160	const stateRoot = await hypervisor.createStateRoot()
145	161	// t.deepEquals(stateRoot, expectedState, 'expected root!')
		@@ -157,12 +173,12 @@
157	173	const hypervisor = new Hypervisor(tree)
158	174	hypervisor.registerContainer(TestWasmContainer)
159	175
160	176	const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
	177	+ const funcRef = module.getFuncRef('test')
	178	+ funcRef.gas = 10000
161	179
162		- const message = new Message({
163		- funcRef: module.getFuncRef('test')
164		- }).on('done', actor => {
	180	+ const message = new Message({funcRef}).on('done', actor => {
165	181	const a = actor.container.getMemory(0, 5)
166	182	const b = actor.container.getMemory(5, 5)
167	183	t.deepEquals(a, b, 'should copy memory correctly')
168	184	})
		@@ -181,11 +197,12 @@
181	197	hypervisor.registerContainer(TestWasmContainer)
182	198
183	199	const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
184	200
185		- const message = new Message({
186		- funcRef: module.getFuncRef('test')
187		- }).on('done', actor => {
	201	+ const funcRef = module.getFuncRef('test')
	202	+ funcRef.gas = 10000
	203	+
	204	+ const message = new Message({funcRef}).on('done', actor => {
188	205	const a = actor.container.getMemory(0, 8)
189	206	const b = actor.container.getMemory(8, 8)
190	207	t.deepEquals(a, b, 'should copy memory correctly')
191	208	})
		@@ -206,19 +223,23 @@
206	223
207	224	const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm)
208	225
209	226	await new Promise((resolve, reject) => {
	227	+ const funcRef = module.getFuncRef('store')
	228	+ funcRef.gas = 400
210	229	const message = new Message({
211		- funcRef: module.getFuncRef('store')
	230	+ funcRef
212	231	}).on('done', actor => {
213	232	resolve()
214	233	})
215	234	hypervisor.send(message)
216	235	})
217	236
218	237	await new Promise((resolve, reject) => {
	238	+ const funcRef = module.getFuncRef('load')
	239	+ funcRef.gas = 400
219	240	const message = new Message({
220		- funcRef: module.getFuncRef('load')
	241	+ funcRef
221	242	}).on('done', actor => {
222	243	resolve()
223	244	const b = actor.container.getMemory(5, 4)
224	245	const result = Buffer.from(b).toString()

tests/wast/funcRef_caller.wastView
		@@ -10,8 +10,9 @@
10	10	call $self
11	11	i32.const 0
12	12	i32.const 8
13	13	call $exports
	14	+
14	15	i32.const 0
15	16	get_local 0
16	17	call $internalize
17	18	i32.const 0

tests/wast/funcRef_reciever.wastView
		@@ -1,9 +1,14 @@
1	1	(module
2	2	(import "func" "internalize" (func $internalize (param i32 i32)))
	3	+ (import "func" "set_gas_budget" (func $set_gas_budget (param i32 i32)))
3	4	(table (export "table") 1 1 anyfunc)
4	5	(func $receive (param i32)
5	6	get_local 0
	7	+ i32.const 10500
	8	+ call $set_gas_budget
	9	+
	10	+ get_local 0
6	11	i32.const 0
7	12	call $internalize
8	13	i32.const 5
9	14	i32.const 0

wasmContainer.jsView
		@@ -115,10 +115,16 @@
115	115	const {funcRef} = self.refs.get(ref, FunctionRef)
116	116	const {funcRef: catchFunc} = self.refs.get(ref, FunctionRef)
117	117	funcRef.catch = catchFunc
118	118	},
119		- getGasAmount: (funcRef) => {},
120		- setGasAmount: (funcRef) => {}
	119	+ get_gas_budget: (funcRef) => {
	120	+ const func = self.refs.get(funcRef, 'func')
	121	+ return func.gas
	122	+ },
	123	+ set_gas_budget: (funcRef, amount) => {
	124	+ const func = self.refs.get(funcRef, 'func')
	125	+ func.gas = amount
	126	+ }
121	127	},
122	128	link: {
123	129	wrap: ref => {
124	130	const obj = this.refs.get(ref)
		@@ -180,8 +186,9 @@
180	186	}
181	187	},
182	188	metering: {
183	189	usegas: amount => {
	190	+ this.actor.incrementTicks(amount)
184	191	funcRef.gas -= amount
185	192	if (funcRef.gas < 0) {
186	193	throw new Error('out of gas! :(')
187	194	}
		@@ -191,9 +198,8 @@
191	198	}
192	199
193	200	async onMessage (message) {
194	201	const funcRef = message.funcRef
195		- // console.log(funcRef)
196	202	const intef = this.getInterface(funcRef)
197	203	this.instance = WebAssembly.Instance(this.mod, intef)
198	204	// map table indexes
199	205	const table = this.instance.exports.table

Built with git-ssb-web

wanderer🌟 / js-primea-hypervisor

Commit 5013b5ed5b183c9bd021b9b9b20f7df558b0a664

added gas accnting

Files changed