Skip to content

Commit

Permalink
Staged
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohanson
mohanson committed Oct 8, 2024
1 parent 077b77d commit 8332c55
Show file tree
Hide file tree
Showing 5 changed files with 152 additions and 68 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ Mkfile.old
dkms.conf

.vscode

build/*
1 change: 0 additions & 1 deletion build/.gitignore
View file

This file was deleted.

64 changes: 39 additions & 25 deletions examples/spawn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,45 @@
#include "ckb_syscalls.h"

int main() {
const char *argv[] = {"-e", "local m = arg[2] .. arg[3]; ckb.set_content(m)",
"hello", "world"};
uint8_t content[80] = {};
uint64_t content_length = 80;
int8_t exit_code = -1;
int err = 0;

spawn_args_t spgs = {
.memory_limit = 8,
.exit_code = &exit_code,
.content = content,
.content_length = &content_length,
};
uint64_t rw_pipe[2] = {0};
err = ckb_pipe(rw_pipe);
if (err != 0) {
return err;
}

int success = ckb_spawn(1, 3, 0, 4, argv, &spgs);
if (success != 0) {
return 1;
}
if (exit_code != 0) {
return 1;
}
if (strlen((char *)content) != 10) {
return 1;
}
if (strcmp((char *)content, "helloworld") != 0) {
return 1;
}
return 0;
const char *argv[] = {
"-e",
"local m = arg[2] .. arg[3]; \
local inherited_fds, err = ckb.inherited_fds(); \
local n, err = ckb.write(inherited_fds[1], m); \
ckb.close(inherited_fds[1]); \
assert(n == 10);",
"hello",
"world",
};
uint64_t pid = 0;
uint64_t inherited_fds[2] = {rw_pipe[1], 0};
spawn_args_t spgs = {
.argc = 4,
.argv = argv,
.process_id = &pid,
.inherited_fds = inherited_fds,
};

err = ckb_spawn(1, 3, 0, 0, &spgs);
if (err != 0) {
return err;
}
uint8_t buffer[80] = {0};
uint64_t length = 80;
err = ckb_read(rw_pipe[0], buffer, &length);
if (err != 0) {
return err;
}
if (strcmp((char *)buffer, "helloworld") != 0) {
return 1;
}
return 0;
}
137 changes: 103 additions & 34 deletions lua-loader/lua-ckb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,46 +813,115 @@ int lua_ckb_load_header_by_field(lua_State *L) {
return CKB_LOAD6(L, ckb_load_header_by_field);
}

int lua_ckb_spawn(lua_State *L) {
printf("spawn is currently not implementd in ckb-lua-vm\n");
lua_pushinteger(L, LUA_ERROR_NOT_IMPLEMENTED);
return 1;
}

int lua_ckb_spawn_cell(lua_State *L) {
printf("spawn_cell is currently not implementd in lua\n");
lua_pushinteger(L, LUA_ERROR_NOT_IMPLEMENTED);
return 1;
}

int lua_ckb_set_content(lua_State *L) {
// int lua_ckb_spawn(lua_State *L) {
// printf("spawn is currently not implementd in ckb-lua-vm\n");
// lua_pushinteger(L, LUA_ERROR_NOT_IMPLEMENTED);
// return 1;
// }

// int lua_ckb_spawn_cell(lua_State *L) {
// printf("spawn_cell is currently not implementd in lua\n");
// lua_pushinteger(L, LUA_ERROR_NOT_IMPLEMENTED);
// return 1;
// }

// int lua_ckb_set_content(lua_State *L) {
// FIELD fields[] = {
// {"buffer", BUFFER},
// };
// GET_FIELDS_WITH_CHECK(L, fields, 1, 1);
// uint64_t length = fields[0].arg.buffer.length;
// int ret = ckb_set_content(fields[0].arg.buffer.buffer, &length);
// if (ret != 0) {
// lua_pushinteger(L, ret);
// return 1;
// }
// if (length != fields[0].arg.buffer.length) {
// printf("Passed content too large\n");
// lua_pushinteger(L, LUA_ERROR_INVALID_STATE);
// return 1;
// }
// lua_pushnil(L);
// return 1;
// }

// int lua_ckb_get_memory_limit(lua_State *L) {
// int ret = ckb_get_memory_limit();
// if (ret != 0) {
// lua_pushinteger(L, ret);
// return 1;
// }
// lua_pushnil(L);
// return 1;
// }


// int ckb_spawn(size_t index, size_t source, size_t place, size_t bounds,
// spawn_args_t* spawn_args);

// int ckb_spawn_cell(const uint8_t* code_hash, uint8_t hash_type, uint32_t offset,
// uint32_t length, spawn_args_t* spawn_args);

// int ckb_wait(uint64_t pid, int8_t* exit_code);

// uint64_t ckb_process_id();

// int ckb_pipe(uint64_t fds[2]);

// int ckb_read(uint64_t fd, void* buffer, size_t* length);

int lua_ckb_write(lua_State *L) {
FIELD fields[] = {
{"fd", UINT64},
{"buffer", BUFFER},
};
GET_FIELDS_WITH_CHECK(L, fields, 1, 1);
uint64_t length = fields[0].arg.buffer.length;
int ret = ckb_set_content(fields[0].arg.buffer.buffer, &length);
GET_FIELDS_WITH_CHECK(L, fields, 2, 2);
uint64_t fd = fields[0].arg.integer;
uint64_t length = fields[1].arg.buffer.length;
int ret = ckb_write(fd, fields[1].arg.buffer.buffer, &length);
if (ret != 0) {
lua_pushnil(L);
lua_pushinteger(L, ret);
return 1;
}
if (length != fields[0].arg.buffer.length) {
printf("Passed content too large\n");
lua_pushinteger(L, LUA_ERROR_INVALID_STATE);
return 1;
return 2;
}
lua_pushinteger(L, length);
lua_pushnil(L);
return 1;
return 2;
}

int lua_ckb_get_memory_limit(lua_State *L) {
int ret = ckb_get_memory_limit();
if (ret != 0) {
lua_pushinteger(L, ret);
return 1;
int lua_ckb_inherited_fds(lua_State *L) {
int err = 0;
uint64_t fds[64];
uint64_t length = 64;
err = ckb_inherited_fds(fds, &length);
if (err != 0) {
lua_pushnil(L);
lua_pushinteger(L, err);
return 2;
}
lua_newtable(L);
for (int i = 0; i < length; i++) {
lua_pushinteger(L, fds[i]);
lua_rawseti(L, -2, i+1);
}
lua_pushnil(L);
return 1;
return 2;
}

int lua_ckb_close(lua_State *L) {
int err = 0;
FIELD fields[] = {
{"fd", UINT64},
};
GET_FIELDS_WITH_CHECK(L, fields, 1, 1);
uint64_t fd = fields[0].arg.integer;
err = ckb_close(fd);
lua_pushinteger(L, err);
return 2;
}

int lua_ckb_load_block_extension(lua_State *L) {
return CKB_LOAD5(L, ckb_load_block_extension);
}

static const luaL_Reg ckb_syscall[] = {
Expand Down Expand Up @@ -882,11 +951,11 @@ static const luaL_Reg ckb_syscall[] = {
{"load_input_by_field", lua_ckb_load_input_by_field},
{"load_header_by_field", lua_ckb_load_header_by_field},

// Requires spawn syscall, which will be available in next hardfork
{"spawn", lua_ckb_spawn},
{"spawn_cell", lua_ckb_spawn_cell},
{"set_content", lua_ckb_set_content},
{"get_memory_limit", lua_ckb_get_memory_limit},
{"write", lua_ckb_write},
{"inherited_fds", lua_ckb_inherited_fds},
{"close", lua_ckb_close},
{"load_block_extension", lua_ckb_load_block_extension},

{NULL, NULL}};

LUAMOD_API int luaopen_ckb(lua_State *L) {
Expand Down
16 changes: 8 additions & 8 deletions tests/test_cases/spawn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"output": {
"capacity": "0x10000000",
"lock": {
"code_hash": "{{ hash ../../build/spawnexample }}",
"hash_type": "data1",
"code_hash": "0x{{ hash ../../build/spawnexample }}",
"hash_type": "data2",
"args": "0x"
},
"type": null
Expand All @@ -35,12 +35,12 @@
"capacity": "0x10000000",
"lock": {
"code_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"hash_type": "data1",
"hash_type": "data2",
"args": "0x"
},
"type": null
},
"data": "{{ data ../../build/spawnexample }}",
"data": "0x{{ data ../../build/spawnexample }}",
"header": null
},
{
Expand All @@ -55,12 +55,12 @@
"capacity": "0x10000000",
"lock": {
"code_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"hash_type": "data1",
"hash_type": "data2",
"args": "0x"
},
"type": null
},
"data": "{{ data ../../build/lua-loader }}",
"data": "0x{{ data ../../build/lua-loader }}",
"header": null
}
],
Expand Down Expand Up @@ -99,12 +99,12 @@
"capacity": "0x0",
"lock": {
"code_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"hash_type": "data1",
"hash_type": "data2",
"args": "0x"
},
"type": {
"code_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"hash_type": "data1",
"hash_type": "data2",
"args": "0x"
}
}
Expand Down

0 comments on commit 8332c55

Please sign in to comment.