diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/chunk_file.c (renamed from io/param.c) | 154 | ||||
| -rw-r--r-- | io/chunk_file.h | 22 | ||||
| -rw-r--r-- | io/init.c | 6 | ||||
| -rw-r--r-- | io/init.lua | 26 | ||||
| -rw-r--r-- | io/param.h | 22 |
5 files changed, 115 insertions, 115 deletions
diff --git a/io/param.c b/io/chunk_file.c index a57b183..ce346c5 100644 --- a/io/param.c +++ b/io/chunk_file.c @@ -2,19 +2,19 @@ #include <ctype.h> #include <string.h> #include "../common.h" -#include "param.h" +#include "chunk_file.h" #define INVALID_FORMAT_ERROR(fn) \ - nerv_error(L, "Invalid param file: %s", fn) + nerv_error(L, "Invalid chunk file: %s", fn) #define CHECK_FORMAT(exp, ret, fname) \ do { \ if ((exp) != (ret)) INVALID_FORMAT_ERROR(fn); \ } while (0) -const char *nerv_param_file_tname = "nerv.ParamFile"; -const char *nerv_param_file_handle_tname = "nerv.ParamFileHandle"; -const char *nerv_param_chunk_info_tname = "nerv.ParamChunkInfo"; -const char *nerv_param_chunk_data_tname = "nerv.ParamChunkData"; +const char *nerv_chunk_file_tname = "nerv.ChunkFile"; +const char *nerv_chunk_file_handle_tname = "nerv.ChunkFileHandle"; +const char *nerv_chunk_info_tname = "nerv.ChunkInfo"; +const char *nerv_chunk_data_tname = "nerv.ChunkData"; #define PARAM_HEADER_SIZE 16 @@ -26,7 +26,7 @@ enum { WRITE_ERROR }; -size_t read_param_header_plain(FILE *fp, int *status) { +size_t read_chunk_header_plain(FILE *fp, int *status) { static char buff[PARAM_HEADER_SIZE]; int i; size_t size = 0; @@ -51,7 +51,7 @@ size_t read_param_header_plain(FILE *fp, int *status) { nerv_error(L, "error while writing"); \ } while (0) -void write_param_header_plain(FILE *fp, size_t size, int *status) { +void write_chunk_header_plain(FILE *fp, size_t size, int *status) { static char buff[PARAM_HEADER_SIZE]; int i; *status = NORMAL; @@ -72,8 +72,8 @@ void write_param_header_plain(FILE *fp, size_t size, int *status) { } } -ParamChunkData *get_param_chunk_data(FILE *fp, ParamChunkInfo *info) { - ParamChunkData *pcd = (ParamChunkData *)malloc(sizeof(ParamChunkData)); +ChunkData *get_chunk_data(FILE *fp, ChunkInfo *info) { + ChunkData *pcd = (ChunkData *)malloc(sizeof(ChunkData)); pcd->data = (char *)malloc(info->length); pcd->fp = fmemopen(pcd->data, info->length, "r"); assert(fseeko(fp, info->offset, SEEK_SET) == 0); @@ -82,7 +82,7 @@ ParamChunkData *get_param_chunk_data(FILE *fp, ParamChunkInfo *info) { return pcd; } -const char *read_param_metadata(lua_State *L, FILE *fp, const char *fn) { +const char *read_chunk_metadata(lua_State *L, FILE *fp, const char *fn) { #define LINEBUFF_SIZE 1024 static char buff[7 + LINEBUFF_SIZE] = "return "; CHECK_FORMAT(fgets(buff + 7, LINEBUFF_SIZE, fp), buff + 7, fn); @@ -90,7 +90,7 @@ const char *read_param_metadata(lua_State *L, FILE *fp, const char *fn) { return buff; } -void write_param_metadata(FILE *fp, const char *metadata_str, int *status) { +void write_chunk_metadata(FILE *fp, const char *metadata_str, int *status) { size_t size = strlen(metadata_str); *status = NORMAL; if (fwrite(metadata_str, 1, size, fp) != size || @@ -103,53 +103,53 @@ void write_param_metadata(FILE *fp, const char *metadata_str, int *status) { } -int nerv_param_file_open_write(lua_State *L, const char *fn) { +int nerv_chunk_file_open_write(lua_State *L, const char *fn) { FILE *fp = fopen(fn, "w"); - ParamFileHandle *lfp; - if (!fp) nerv_error(L, "Error while opening param file: %s", fn); - lfp = (ParamFileHandle *)malloc(sizeof(ParamFileHandle)); + ChunkFileHandle *lfp; + if (!fp) nerv_error(L, "Error while opening chunk file: %s", fn); + lfp = (ChunkFileHandle *)malloc(sizeof(ChunkFileHandle)); lfp->fp = fp; - luaT_pushudata(L, lfp, nerv_param_file_handle_tname); + luaT_pushudata(L, lfp, nerv_chunk_file_handle_tname); lua_setfield(L, -2, "handle"); - luaT_pushmetatable(L, nerv_param_file_tname); + luaT_pushmetatable(L, nerv_chunk_file_tname); lua_setmetatable(L, -2); return 1; } -int nerv_param_file_open_read(lua_State *L, const char *fn) { +int nerv_chunk_file_open_read(lua_State *L, const char *fn) { FILE *fp = fopen(fn, "r"); int i, status; - size_t param_len; + size_t chunk_len; off_t offset; - ParamFileHandle *lfp; + ChunkFileHandle *lfp; - if (!fp) nerv_error(L, "Error while opening param file: %s", fn); + if (!fp) nerv_error(L, "Error while opening chunk file: %s", fn); offset = ftello(fp); lua_newtable(L); fprintf(stderr, "%d\n", (int)offset); - for (i = 0;; offset += param_len, i++) + for (i = 0;; offset += chunk_len, i++) { - ParamChunkInfo *pci; - fprintf(stderr, "reading param chunk %d from %d\n", i, (int)offset); - /* skip to the begining of param chunk i */ + ChunkInfo *pci; + fprintf(stderr, "reading chunk %d from %d\n", i, (int)offset); + /* skip to the begining of chunk i */ CHECK_FORMAT(fseeko(fp, offset, SEEK_SET), 0, fn); /* read header */ - param_len = read_param_header_plain(fp, &status); + chunk_len = read_chunk_header_plain(fp, &status); if (status == END_OF_FILE) break; else if (status == INVALID_FORMAT) INVALID_FORMAT_ERROR(fn); /* read metadata */ - luaL_loadstring(L, read_param_metadata(L, fp, fn)); + luaL_loadstring(L, read_chunk_metadata(L, fp, fn)); CHECK_FORMAT(lua_pcall(L, 0, 1, 0), 0, fn); CHECK_FORMAT(lua_istable(L, -1), 1, fn); /* stack: obj_table, metadata */ /* chunk info */ - pci = (ParamChunkInfo *)malloc(sizeof(ParamChunkInfo)); + pci = (ChunkInfo *)malloc(sizeof(ChunkInfo)); pci->offset = ftello(fp); - pci->length = param_len - (pci->offset - offset); + pci->length = chunk_len - (pci->offset - offset); fprintf(stderr, "%d + %d (skip %lu)\n", (int)pci->offset, - (int)pci->length, param_len); - luaT_pushudata(L, pci, nerv_param_chunk_info_tname); + (int)pci->length, chunk_len); + luaT_pushudata(L, pci, nerv_chunk_info_tname); lua_setfield(L, -2, "chunk"); /* stack: obj_table, metadata */ /* get id */ @@ -172,16 +172,16 @@ int nerv_param_file_open_read(lua_State *L, const char *fn) { lua_pop(L, 1); } lua_setfield(L, -2, "metadata"); - lfp = (ParamFileHandle *)malloc(sizeof(ParamFileHandle)); + lfp = (ChunkFileHandle *)malloc(sizeof(ChunkFileHandle)); lfp->fp = fp; - luaT_pushudata(L, lfp, nerv_param_file_handle_tname); + luaT_pushudata(L, lfp, nerv_chunk_file_handle_tname); lua_setfield(L, -2, "handle"); - luaT_pushmetatable(L, nerv_param_file_tname); + luaT_pushmetatable(L, nerv_chunk_file_tname); lua_setmetatable(L, -2); return 1; } -int nerv_param_file_new_(lua_State *L, const char *fn, const char *mode) { +int nerv_chunk_file_new_(lua_State *L, const char *fn, const char *mode) { int rd = 1, bin = 0; size_t i, len = strlen(mode); for (i = 0; i < len; i++) @@ -191,34 +191,34 @@ int nerv_param_file_new_(lua_State *L, const char *fn, const char *mode) { case 'w': rd = 0; break; case 'b': bin = 1; break; } - return rd ? nerv_param_file_open_read(L, fn) : \ - nerv_param_file_open_write(L, fn); + return rd ? nerv_chunk_file_open_read(L, fn) : \ + nerv_chunk_file_open_write(L, fn); } -int nerv_param_file___init(lua_State *L) { +int nerv_chunk_file___init(lua_State *L) { lua_pushvalue(L, 1); - return nerv_param_file_new_(L, luaL_checkstring(L, 2), + return nerv_chunk_file_new_(L, luaL_checkstring(L, 2), luaL_checkstring(L, 3)); } -int nerv_param_file_new(lua_State *L) { +int nerv_chunk_file_new(lua_State *L) { lua_newtable(L); - return nerv_param_file_new_(L, luaL_checkstring(L, 1), + return nerv_chunk_file_new_(L, luaL_checkstring(L, 1), luaL_checkstring(L, 2)); } -int nerv_param_file_write_chunkdata(lua_State *L) { - ParamFileHandle *pfh; +int nerv_chunk_file_write_chunkdata(lua_State *L) { + ChunkFileHandle *pfh; int status; off_t start; size_t size; const char *metadata_str = lua_tolstring(L, 2, NULL); lua_getfield(L, 1, "handle"); - pfh = luaT_checkudata(L, -1, nerv_param_file_handle_tname); + pfh = luaT_checkudata(L, -1, nerv_chunk_file_handle_tname); start = ftello(pfh->fp); - write_param_header_plain(pfh->fp, 0, &status); /* fill zeros */ + write_chunk_header_plain(pfh->fp, 0, &status); /* fill zeros */ CHECK_WRITE(status); - write_param_metadata(pfh->fp, metadata_str, &status); + write_chunk_metadata(pfh->fp, metadata_str, &status); CHECK_WRITE(status); lua_pushvalue(L, 3); lua_getfield(L, -1, "write"); @@ -231,20 +231,20 @@ int nerv_param_file_write_chunkdata(lua_State *L) { size = ftello(pfh->fp) - start; fseeko(pfh->fp, start, SEEK_SET); /* write the calced size */ - write_param_header_plain(pfh->fp, size, &status); + write_chunk_header_plain(pfh->fp, size, &status); CHECK_WRITE(status); fseeko(pfh->fp, 0, SEEK_END); return 0; } -int nerv_param_file_get_chunkdata(lua_State *L) { - ParamFileHandle *pfh; - ParamChunkInfo *pci; - ParamChunkData *pcd; +int nerv_chunk_file_get_chunkdata(lua_State *L) { + ChunkFileHandle *pfh; + ChunkInfo *pci; + ChunkData *pcd; const char *id = luaL_checkstring(L, 2); lua_getfield(L, 1, "handle"); - pfh = luaT_checkudata(L, -1, nerv_param_file_handle_tname); + pfh = luaT_checkudata(L, -1, nerv_chunk_file_handle_tname); lua_pop(L, 1); /* pop handle */ lua_getfield(L, 1, "metadata"); /* now stack: self, k, metadata */ @@ -253,53 +253,53 @@ int nerv_param_file_get_chunkdata(lua_State *L) { if (lua_isnil(L, -1)) /* no chunck with the id */ return 0; lua_getfield(L, -1, "chunk"); - pci = luaT_checkudata(L, -1, nerv_param_chunk_info_tname); - if (!(pcd = get_param_chunk_data(pfh->fp, pci))) + pci = luaT_checkudata(L, -1, nerv_chunk_info_tname); + if (!(pcd = get_chunk_data(pfh->fp, pci))) nerv_error(L, "unexpected end of file"); - luaT_pushudata(L, pcd, nerv_param_chunk_data_tname); + luaT_pushudata(L, pcd, nerv_chunk_data_tname); return 1; } -int nerv_param_file_handle_destroy(lua_State *L) { - ParamFileHandle *pfh = luaT_checkudata(L, 1, - nerv_param_file_handle_tname); +int nerv_chunk_file_handle_destroy(lua_State *L) { + ChunkFileHandle *pfh = luaT_checkudata(L, 1, + nerv_chunk_file_handle_tname); fclose(pfh->fp); free(pfh); return 0; } -static int nerv_param_chunk_destroy(lua_State *L) { - ParamChunkInfo *pci = luaT_checkudata(L, 1, nerv_param_chunk_info_tname); +static int nerv_chunk_destroy(lua_State *L) { + ChunkInfo *pci = luaT_checkudata(L, 1, nerv_chunk_info_tname); free(pci); return 0; } -static int nerv_param_chunk_data_destroy(lua_State *L) { - ParamChunkData *pcd = luaT_checkudata(L, 1, nerv_param_chunk_data_tname); +static int nerv_chunk_data_destroy(lua_State *L) { + ChunkData *pcd = luaT_checkudata(L, 1, nerv_chunk_data_tname); fclose(pcd->fp); free(pcd->data); free(pcd); return 0; } -static const luaL_Reg nerv_param_file_methods[] = { - {"get_chunkdata", nerv_param_file_get_chunkdata}, - {"_write_chunkdata", nerv_param_file_write_chunkdata}, - {"__init", nerv_param_file___init}, +static const luaL_Reg nerv_chunk_file_methods[] = { + {"get_chunkdata", nerv_chunk_file_get_chunkdata}, + {"_write_chunkdata", nerv_chunk_file_write_chunkdata}, + {"__init", nerv_chunk_file___init}, {NULL, NULL} }; -void nerv_param_file_init(lua_State *L) { - luaT_newmetatable(L, nerv_param_file_tname, NULL, - nerv_param_file_new, +void nerv_chunk_file_init(lua_State *L) { + luaT_newmetatable(L, nerv_chunk_file_tname, NULL, + nerv_chunk_file_new, NULL, NULL); - luaL_register(L, NULL, nerv_param_file_methods); + luaL_register(L, NULL, nerv_chunk_file_methods); lua_pop(L, 1); - luaT_newmetatable(L, nerv_param_file_handle_tname, NULL, - NULL, nerv_param_file_handle_destroy, NULL); - luaT_newmetatable(L, nerv_param_chunk_info_tname, NULL, - NULL, nerv_param_chunk_destroy, NULL); - luaT_newmetatable(L, nerv_param_chunk_data_tname, NULL, - NULL, nerv_param_chunk_data_destroy, NULL); + luaT_newmetatable(L, nerv_chunk_file_handle_tname, NULL, + NULL, nerv_chunk_file_handle_destroy, NULL); + luaT_newmetatable(L, nerv_chunk_info_tname, NULL, + NULL, nerv_chunk_destroy, NULL); + luaT_newmetatable(L, nerv_chunk_data_tname, NULL, + NULL, nerv_chunk_data_destroy, NULL); } diff --git a/io/chunk_file.h b/io/chunk_file.h new file mode 100644 index 0000000..9ece117 --- /dev/null +++ b/io/chunk_file.h @@ -0,0 +1,22 @@ +#ifndef NERV_LAYER_FILE_H +#define NERV_LAYER_FILE_H + +extern const char *nerv_chunk_file_tname; +extern const char *nerv_chunk_file_handle_tname; +extern const char *nerv_chunk_info_tname; +extern const char *nerv_chunk_data_tname; + +typedef struct ChunkFileHandle { + FILE *fp; +} ChunkFileHandle; + +typedef struct ChunkInfo { + off_t offset, length; +} ChunkInfo; + +typedef struct ChunkData { + FILE *fp; + char *data; +} ChunkData; + +#endif @@ -1,6 +1,6 @@ #include "../common.h" -extern void nerv_param_file_init(lua_State *L); -void nerv_param_init(lua_State *L) { - nerv_param_file_init(L); +extern void nerv_chunk_file_init(lua_State *L); +void nerv_io_init(lua_State *L) { + nerv_chunk_file_init(L); } diff --git a/io/init.lua b/io/init.lua index dc1c6c3..8c3701e 100644 --- a/io/init.lua +++ b/io/init.lua @@ -1,4 +1,4 @@ -function nerv.ParamFile:write_chunkdata(metadata, writer) +function nerv.ChunkFile:write_chunkdata(metadata, writer) if type(metadata) ~= "table" then nerv.error("metadata should be a Lua table") return @@ -6,25 +6,25 @@ function nerv.ParamFile:write_chunkdata(metadata, writer) return self:_write_chunkdata(table.tostring(metadata), writer) end -function nerv.ParamFile:write_param(param) - local id = param.id - local type = param.__typename +function nerv.ChunkFile:write_chunk(chunk) + local id = chunk.id + local type = chunk.__typename if id == nil then - nerv_error("id of param %s must be specified", type) + nerv_error("id of chunk %s must be specified", type) end self:write_chunkdata({id = id, type = type, - info = param:get_info()}, param) + info = chunk:get_info()}, chunk) end -function nerv.ParamFile:read_param(id) +function nerv.ChunkFile:read_chunk(id, global_conf) local metadata = self.metadata[id] if metadata == nil then - nerv_error("param with id %s does not exist", id) + nerv_error("chunk with id %s does not exist", id) end - local param = assert(loadstring("return " .. - metadata.type .. "(\"" .. id .. "\")"))() - param:set_info(metadata.info) - param:read(self:get_chunkdata(id)) - return param + local chunk_type = assert(loadstring("return " .. metadata.type))() + local chunk = chunk_type(id, global_conf) + chunk:set_info(metadata.info) + chunk:read(self:get_chunkdata(id)) + return chunk end diff --git a/io/param.h b/io/param.h deleted file mode 100644 index e5841b8..0000000 --- a/io/param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef NERV_LAYER_FILE_H -#define NERV_LAYER_FILE_H - -extern const char *nerv_param_file_tname; -extern const char *nerv_param_file_handle_tname; -extern const char *nerv_param_chunk_info_tname; -extern const char *nerv_param_chunk_data_tname; - -typedef struct ParamFileHandle { - FILE *fp; -} ParamFileHandle; - -typedef struct ParamChunkInfo { - off_t offset, length; -} ParamChunkInfo; - -typedef struct ParamChunkData { - FILE *fp; - char *data; -} ParamChunkData; - -#endif |