core/test: refactors standard reader into lbz2_file_reader to mirror lbz2_file_writer and removes line buffering/handling

Author: harningt

Makefile

@@ -14,7 +14,7 @@ else
 PFLAGS = $(shell pkg-config --cflags lua)
 endif
 
-SOURCES = lbz.c lbz2_file_writer.c lbz2_stream.c lbz2_common.c
+SOURCES = lbz.c lbz2_file_reader.c lbz2_file_writer.c lbz2_stream.c lbz2_common.c
 
 bz2.so: $(SOURCES)
 	$(CC) $(SOFLAGS) $(PFLAGS) $(CFLAGS) $(SOURCES) $(LDFLAGS) -o bz2.so

lbz.c

@@ -16,320 +16,26 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <bzlib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <lua.h>
 #include <lauxlib.h>
 
-#include <assert.h>
-
+#include "lbz2_file_reader.h"
 #include "lbz2_file_writer.h"
 #include "lbz2_stream.h"
 
-#define LBZ_STATE_META "LuaBook.bz2"
-
-typedef struct {
-	BZFILE *bz_stream;
-	FILE *f;
-
-	/* getline related stuff */
-	char *buf;
-	size_t buf_size; /* max == LUAL_BUFFERSIZE */
-} lbz_state;
-
-/* Forward declarations */
-static lbz_state *lbz_check_state(lua_State *L, int index);
-
-static int lbz_read_open(lua_State *L);
-static int lbz_read(lua_State *L);
-static void lbz_perform_close(lbz_state *state, int keep_extra_buf);
-static int lbz_read_close(lua_State *L);
-static int lbz_getline(lua_State *L);
-static int lbz_getline_read(lua_State *L, luaL_Buffer *b, lbz_state *state, int keep_eol);
-
-static int lbz_lines(lua_State *L);
-
-static void lbz_buffer_init(lbz_state *state);
-static void lbz_buffer_free(lbz_state *state);
-
-static void lbz_buffer_append(lbz_state *state, const char *data, size_t data_len);
-static void lbz_buffer_drain(lbz_state *state, size_t amount);
-static void lbz_buffer_drain_all(lbz_state *state);
-
-static const struct luaL_reg bzlib_f [] = {
-	{"open", lbz_read_open},
-	{NULL, NULL} /* Sentinel */
+static luaL_Reg lbz2_global[] = {
+	{ NULL, NULL }
 };
 
-static const struct luaL_reg bzlib_m [] = {
-	{"read", lbz_read},
-	{"getline", lbz_getline},
-	{"close", lbz_read_close},
-	{"lines", lbz_lines},
-	{NULL, NULL} /* Sentinel */
-};
-
-lbz_state *lbz_check_state(lua_State *L, int index) {
-	return (lbz_state *)luaL_checkudata(L, index, LBZ_STATE_META);
-}
-
-/* Binding to libbzip2's BZ2_bzReadOpen method */
-int lbz_read_open(lua_State *L) {
-	size_t len;
-	const char *fname = lua_tolstring(L, 1, &len);
-	FILE *f = fopen(fname, "rb");
-
-	if (f == NULL)
-		return luaL_error(L, "Failed to fopen %s", fname);
-
-	int bzerror;
-	lbz_state *state = (lbz_state *) lua_newuserdata(L, sizeof(lbz_state));
-	state->bz_stream = BZ2_bzReadOpen(&bzerror, f, 0, 0, NULL, 0);
-	state->f = f;
-
-	lbz_buffer_init(state);
-
-	luaL_getmetatable(L, LBZ_STATE_META);
-	lua_setmetatable(L, -2);
-
-	if (bzerror != BZ_OK)
-		lua_pushnil(L);
-
-	return 1;
-}
-
-void lbz_buffer_init(lbz_state *state) {
-	state->buf = malloc(LUAL_BUFFERSIZE);
-	state->buf_size = 0;
-}
-
-void lbz_buffer_free(lbz_state *state) {
-	if(!state->buf) return;
-	state->buf_size = 0;
-	free(state->buf);
-	state->buf = NULL;
-}
-
-void lbz_buffer_append(lbz_state *state, const char *data, size_t data_size) {
-	assert(state->buf_size + data_size < LUAL_BUFFERSIZE);
-	memmove(state->buf + state->buf_size, data, data_size);
-	state->buf_size += data_size;
-}
-
-void lbz_buffer_drain(lbz_state *state, size_t amount) {
-	memmove(state->buf, state->buf + amount, state->buf_size - amount);
-	state->buf_size -= amount;
-}
-
-void lbz_buffer_drain_all(lbz_state *state) {
-	state->buf_size = 0;
-}
-
-/* Binding to libbzip2's BZ2_bzReadOpen method */
-static int lbz_read(lua_State *L) {
-	int bzerror = BZ_OK;
-	int len;
-	luaL_Buffer b;
-	lbz_state *state = lbz_check_state(L, 1);
-	len = luaL_checkint(L, 2);
-
-	if (!state->bz_stream && !state->buf) {
-		/* The logical end of file has been reached -- there's no more data to
-		 * return, and the user should call the read_close method. */
-		lua_pushnil(L);
-		lua_pushstring(L, "CLOSED");
-		return 2;
-	}
-	luaL_buffinit(L, &b);
-
-	/* In case this function is being used alongsize the getline method, we
-	 * should use the buffers that getline is using */
-	if (state->buf_size) {
-		int used_len = (state->buf_size < len) ? state->buf_size : len;
-		luaL_addlstring(&b, state->buf, used_len);
-		lbz_buffer_drain(state, used_len);
-		len -= used_len;
-	}
-
-	/* Pull in chunks until all data read */
-	while(len > 0) {
-		char *buf = luaL_prepbuffer(&b);
-		int nextRead = len > LUAL_BUFFERSIZE ? LUAL_BUFFERSIZE : len;
-		int read = BZ2_bzRead(&bzerror, state->bz_stream, buf, nextRead);
-		if (read > 0) {
-			luaL_addsize(&b, read);
-			len -= read;
-		}
-		if (bzerror != BZ_OK)
-			goto handle_error;
-	}
-	luaL_pushresult(&b);
-	return 1;
-handle_error:
-	if(BZ_STREAM_END == bzerror) {
-		/* Push the data read already and mark the stream done */
-		luaL_pushresult(&b);
-		lbz_perform_close(state, 0);
-		return 1;
-	} else {
-		lua_pushnil(L);
-		lua_pushstring(L, BZ2_bzerror(state->bz_stream, &bzerror));
-		return 2;
-	}
-}
-
-void lbz_perform_close(lbz_state *state, int keep_extra_buf) {
-	int bzerror;
-	if(!keep_extra_buf)
-		lbz_buffer_free(state);
-	if(!state->bz_stream)
-		return;
-	BZ2_bzReadClose(&bzerror, state->bz_stream);
-	fclose(state->f);
-	state->bz_stream = NULL;
-	state->f = NULL;
-}
-
-/* Binding to libbzip2's BZ2_bzReadClose method */
-static int lbz_read_close(lua_State *L) {
-	lbz_state *state = lbz_check_state(L, 1);
-	lbz_perform_close(state, 0);
-	return 0;
-}
-
-/*
- * GETLINE STUFF
- * This code is considerably more complicated... if you know of a simpler way
- * to do it that doesn't sacrifice speed, please let me know.
- */
-
-static int lbz_handle_eol(luaL_Buffer *b, char *buf, size_t buf_len, lbz_state *state, int in_buffer, int keep_eol) {
-	char *eol = memchr(buf, '\n', buf_len);
-	size_t chars_to_return;
-
-	/* If a newline hasn't been found, keep iterating while building up
-	 * the buffer */
-	if(eol == NULL) {
-		if(in_buffer)
-			luaL_addsize(b, buf_len);
-		else
-			luaL_addlstring(b, buf, buf_len);
-		return 0;
-	}
-	chars_to_return = eol - buf;
-	eol++;
-	if(keep_eol)
-		chars_to_return++;
-	if(in_buffer)
-		luaL_addsize(b, chars_to_return);
-	else
-		luaL_addlstring(b, buf, chars_to_return);
-	/* Save the remaining data end of data - position of beginning */
-	lbz_buffer_append(state, eol, buf_len - (eol - buf));
-	luaL_pushresult(b);
-	return 1;
-}
-/* This is an auxilliary function that lbz_getline calls when it needs to
- * actually use the BZ2_bzRead method to read more data from the bzipped file.
- **/
-static int lbz_getline_read(lua_State *L, luaL_Buffer *b, lbz_state *state, int keep_eol) {
-	int bzerror;
-
-	/* The entire 'extra_buf' buffer is needed */
-	luaL_addlstring(b, state->buf, state->buf_size);
-	lbz_buffer_drain_all(state);
-
-	if (!state->bz_stream) { /* No more data left at all - return data is 'success' */
-		lbz_perform_close(state, 0); // Completely close it out now
-		luaL_pushresult(b);
-		return 1;
-	}
-	while(1) {
-		char *buf = luaL_prepbuffer(b);
-		int len = BZ2_bzRead(&bzerror, state->bz_stream, buf, LUAL_BUFFERSIZE);
-
-		if ((bzerror != BZ_OK) && (bzerror != BZ_STREAM_END)) {
-			/* Error happened, data thrown */
-			lua_pushnil(L);
-			lua_pushstring(L, BZ2_bzerror(state->bz_stream, &bzerror));
-			return 2;
-		}
-		if (!lbz_handle_eol(b, buf, len, state, 1, keep_eol))
-			continue;
-
-		/* Kill the stream, keep the remaining buffer */
-		if (bzerror == BZ_STREAM_END)
-			lbz_perform_close(state, state->buf_size ? 1 : 0);
-		return 1;
-	}
-	return 0;
-}
-
-static int lbz_getline(lua_State *L) {
-	lbz_state *state = lbz_check_state(L, 1);
-	int skip_eol = lua_toboolean(L, 2);
-	luaL_Buffer b;
-
-	if (!state->bz_stream && !state->buf) {
-		lua_pushnil(L);
-		lua_pushstring(L, "CLOSED");
-		return 2;
-	}
-
-	luaL_buffinit(L, &b);
-	if (state->buf_size) {
-		size_t data_size = state->buf_size;
-		lbz_buffer_drain_all(state);
-		/* Drain entire buffer so that remaining data can be appropriately added */
-		if (!lbz_handle_eol(&b, state->buf, data_size, state, 0, !skip_eol))
-			return lbz_getline_read(L, &b, state, !skip_eol);
-		return 1;
-	}
-
-	/* If there was no extra data from the last pass then we need to call
-	 * lbz_getline_read directly to get more data and find the newline. */
-	return lbz_getline_read(L, &b, state, !skip_eol);
-}
-
-static int lbz_line_iter(lua_State *L) {
-	lua_settop(L, 0);
-	lua_pushvalue(L, lua_upvalueindex(1));
-	lua_pushvalue(L, lua_upvalueindex(2));
-	return lbz_getline(L);
-}
-
-/* (bz):lines(keep_eol) */
-int lbz_lines(lua_State *L) {
-	int skip_eol = !lua_toboolean(L, 2);
-	lua_pushvalue(L, 1);
-	lua_pushboolean(L, skip_eol);
-	lua_pushcclosure(L, lbz_line_iter, 2);
-	return 1;
-}
-
-static int lbz_gc(lua_State *L) {
-	lbz_read_close(L);
-	return 0;
-}
-
 int luaopen_bz2(lua_State *L) {
-	luaL_newmetatable(L, LBZ_STATE_META);
-	lua_newtable(L);
-	luaL_register(L, NULL, bzlib_m);
-	lua_setfield(L, -2, "__index");
-
-	lua_pushcfunction(L, lbz_gc);
-	lua_setfield(L, -2, "__gc");
-	lua_pop(L, 1);
+	luaL_register(L, "bz2", lbz2_global);
 
 	lua_pushliteral(L, "bz2");
 	lua_setfield(L, -2, "_NAME");
 	lua_pushliteral(L, "0.1");
 	lua_setfield(L, -2, "_VERSION");
-	luaL_register(L, "bz2", bzlib_f);
 
+	register_lbz2_file_reader(L);
 	register_lbz2_file_writer(L);
 	register_lbz2_stream(L);