walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

arena_allocator: return lxl_arena instead of initializing an existing struct

This commit is contained in:
takase1121 2024-07-09 18:49:57 +08:00 committed by Guldoman
parent a25ab3c535
commit a5d466d6cf
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/process.c
View File

@ -355,7 +355,7 @@ static bool signal_process(process_t* proc, signal_e sig) {
} }
static int process_start(lua_State* L) { static int process_start(lua_State* L) {
int r, retval = 1; int retval = 1;
process_t *self = NULL; process_t *self = NULL;
int deadline = 10, detach = false, new_fds[3] = { STDIN_FD, STDOUT_FD, STDERR_FD }; int deadline = 10, detach = false, new_fds[3] = { STDIN_FD, STDOUT_FD, STDERR_FD };
@ -366,7 +366,7 @@ static int process_start(lua_State* L) {
#endif #endif
lua_settop(L, 3); lua_settop(L, 3);
lxl_arena A; lxl_arena_init(L, &A); lxl_arena *A = lxl_arena_init(L);
// copy command line arguments // copy command line arguments
#ifdef _WIN32 #ifdef _WIN32
if ( !(commandline = utfconv_fromutf8(&A, luaL_checkstring(L, 1))) ) if ( !(commandline = utfconv_fromutf8(&A, luaL_checkstring(L, 1))) )
@ -374,9 +374,9 @@ static int process_start(lua_State* L) {
#else #else
luaL_checktype(L, 1, LUA_TTABLE); luaL_checktype(L, 1, LUA_TTABLE);
int len = luaL_len(L, 1); int len = luaL_len(L, 1);
cmd = lxl_arena_zero(&A, (len + 1) * sizeof(char *)); cmd = lxl_arena_zero(A, (len + 1) * sizeof(char *));
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
cmd[i] = lxl_arena_strdup(&A, (lua_rawgeti(L, 1, i+1), luaL_checkstring(L, -1))); cmd[i] = lxl_arena_strdup(A, (lua_rawgeti(L, 1, i+1), luaL_checkstring(L, -1)));
} }
#endif #endif
@ -401,7 +401,7 @@ static int process_start(lua_State* L) {
if (!env) return (FreeEnvironmentStringsW(system_env), luaL_error(L, "%s", UTFCONV_ERROR_INVALID_CONVERSION)); if (!env) return (FreeEnvironmentStringsW(system_env), luaL_error(L, "%s", UTFCONV_ERROR_INVALID_CONVERSION));
if (!eq) return (FreeEnvironmentStringsW(system_env), luaL_error(L, "invalid environment variable")); if (!eq) return (FreeEnvironmentStringsW(system_env), luaL_error(L, "invalid environment variable"));
lua_pushlstring(L, env, eq - env); lua_pushstring(L, eq+1); lua_pushlstring(L, env, eq - env); lua_pushstring(L, eq+1);
lxl_arena_free(&A, (void *) env); lxl_arena_free(A, (void *) env);
lua_rawset(L, -3); lua_rawset(L, -3);
envp += wcslen(envp) + 1; envp += wcslen(envp) + 1;
} }
@ -421,9 +421,9 @@ static int process_start(lua_State* L) {
lua_newtable(L); lua_newtable(L);
lua_call(L, 1, 1); lua_call(L, 1, 1);
size_t len = 0; env = lua_tolstring(L, -1, &len); size_t len = 0; env = lua_tolstring(L, -1, &len);
env = lxl_arena_copy(&A, (void *) env, len+1); env = lxl_arena_copy(A, (void *) env, len+1);
} }
cwd = lxl_arena_strdup(&A, (lua_getfield(L, 2, "cwd"), luaL_optstring(L, -1, NULL))); cwd = lxl_arena_strdup(A, (lua_getfield(L, 2, "cwd"), luaL_optstring(L, -1, NULL)));
lua_pop(L, 2); lua_pop(L, 2);
#endif #endif
} }

12
src/arena_allocator.c
View File

@ -3,9 +3,17 @@
#include <string.h> #include <string.h>
#include <lauxlib.h> #include <lauxlib.h>
void lxl_arena_init(lua_State *L, lxl_arena *arena) { struct lxl_arena {
lua_State *L;
int ref;
};
lxl_arena *lxl_arena_init(lua_State *L) {
lua_newtable(L); lua_newtable(L);
arena->L = L; arena->ref = lua_gettop(L); lxl_arena *arena = lua_newuserdata(L, sizeof(lxl_arena));
arena->L = L; arena->ref = lua_gettop(L)-1;
lua_rawseti(L, -2, 1);
return arena;
} }
void *lxl_arena_malloc(lxl_arena *arena, size_t size) { void *lxl_arena_malloc(lxl_arena *arena, size_t size) {

7
src/arena_allocator.h
View File

@ -10,12 +10,9 @@
#include <lua.h> #include <lua.h>
typedef struct lxl_arena { typedef struct lxl_arena lxl_arena;
lua_State *L;
int ref;
} lxl_arena;
void lxl_arena_init(lua_State *L, lxl_arena *arena); lxl_arena *lxl_arena_init(lua_State *L);
void *lxl_arena_malloc(lxl_arena *arena, size_t size); void *lxl_arena_malloc(lxl_arena *arena, size_t size);
void *lxl_arena_zero(lxl_arena *arena, size_t size); void *lxl_arena_zero(lxl_arena *arena, size_t size);
char *lxl_arena_copy(lxl_arena *arena, void *ptr, size_t len); char *lxl_arena_copy(lxl_arena *arena, void *ptr, size_t len);