mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(LibretroDB) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-01-27 04:02:10 +01:00
parent 8971f4538a
commit e212f61114
7 changed files with 916 additions and 879 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
libretrodb/bintree.c
View File

@ -1,114 +1,116 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <retro_inline.h>
#include "bintree.h" #include "bintree.h"
#if 0
static int NIL_VALUE = 1;
#endif
static void *NIL_NODE = &NIL_NODE; static void *NIL_NODE = &NIL_NODE;
static struct bintree_node *new_nil_node(struct bintree_node *parent); static struct bintree_node *new_nil_node(struct bintree_node *parent);
void bintree_new( void bintree_new(struct bintree *t, bintree_cmp_func cmp,
struct bintree * t, void *ctx)
bintree_cmp_func cmp, {
void * ctx
){
t->root = new_nil_node(NULL); t->root = new_nil_node(NULL);
t->cmp = cmp; t->cmp = cmp;
t->ctx = ctx; t->ctx = ctx;
} }
static struct bintree_node * new_nil_node(struct bintree_node * parent){ static struct bintree_node *new_nil_node(struct bintree_node *parent)
{
struct bintree_node *node = (struct bintree_node *)calloc(1, sizeof(struct bintree_node)); struct bintree_node *node = (struct bintree_node *)calloc(1, sizeof(struct bintree_node));
if (!node) if (!node)
return NULL; return NULL;
node->value = NIL_NODE; node->value = NIL_NODE;
node->parent = parent; node->parent = parent;
node->left = NULL; node->left = NULL;
node->right = NULL; node->right = NULL;
return node; return node;
} }
static inline int is_nil(const struct bintree_node * node){ static INLINE int is_nil(const struct bintree_node *node)
{
return node == NULL || node->value == NIL_NODE; return node == NULL || node->value == NIL_NODE;
} }
static int insert( static int insert(struct bintree *t, struct bintree_node *root,
struct bintree * t, void *value)
struct bintree_node * root, {
void * value
){
int cmp_res = 0; int cmp_res = 0;
if (is_nil(root)) {
if (is_nil(root))
{
root->left = new_nil_node(root); root->left = new_nil_node(root);
root->right = new_nil_node(root); root->right = new_nil_node(root);
if (!root->left || !root->right) {
if (root->left) { if (!root->left || !root->right)
{
if (root->left)
{
free(root->left); free(root->left);
root->left = NULL; root->left = NULL;
} }
if (root->right) { if (root->right)
{
free(root->right); free(root->right);
root->right = NULL; root->right = NULL;
} }
return -ENOMEM; return -ENOMEM;
} }
root->value = value; root->value = value;
} else {
return 0;
}
cmp_res = t->cmp(root->value, value, t->ctx); cmp_res = t->cmp(root->value, value, t->ctx);
if (cmp_res > 0) if (cmp_res > 0)
return insert(t, root->left, value); return insert(t, root->left, value);
else if (cmp_res < 0) else if (cmp_res < 0)
return insert(t, root->right, value); return insert(t, root->right, value);
else
return -EINVAL; return -EINVAL;
} }
return 0;
}
int bintree_insert( int bintree_insert(struct bintree *t, void *value)
struct bintree * t, {
void * value
){
return insert(t, t->root, value); return insert(t, t->root, value);
} }
static int _bintree_iterate( static int _bintree_iterate(struct bintree_node *n,
struct bintree_node * n, bintree_iter_cb cb, void *ctx)
bintree_iter_cb cb, {
void * ctx
){
int rv; int rv;
if (is_nil(n)) if (is_nil(n))
return 0; return 0;
else {
if ((rv = _bintree_iterate(n->left, cb, ctx)) != 0) if ((rv = _bintree_iterate(n->left, cb, ctx)) != 0)
return rv; return rv;
if ((rv = cb(n->value, ctx)) != 0) if ((rv = cb(n->value, ctx)) != 0)
return rv; return rv;
if ((rv = _bintree_iterate(n->right, cb, ctx)) != 0) if ((rv = _bintree_iterate(n->right, cb, ctx)) != 0)
return rv; return rv;
}
return 0; return 0;
} }
int bintree_iterate( int bintree_iterate(const struct bintree *t, bintree_iter_cb cb,
const struct bintree * t, void *ctx)
bintree_iter_cb cb, {
void * ctx
){
return _bintree_iterate(t->root, cb, ctx); return _bintree_iterate(t->root, cb, ctx);
} }
static void bintree_free_node(struct bintree_node * n){ static void bintree_free_node(struct bintree_node *n)
if (n == NULL) {
if (!n)
return; return;
if (n->value == NIL_NODE) { if (n->value == NIL_NODE)
{
free(n); free(n);
return; return;
} }
@ -118,6 +120,7 @@ static void bintree_free_node(struct bintree_node * n){
free(n); free(n);
} }
void bintree_free(struct bintree * t){ void bintree_free(struct bintree *t)
{
bintree_free_node(t->root); bintree_free_node(t->root);
} }

12
libretrodb/libretrodb.c
View File

@ -328,13 +328,18 @@ retry:
**/ **/
void libretrodb_cursor_close(libretrodb_cursor_t *cursor) void libretrodb_cursor_close(libretrodb_cursor_t *cursor)
{ {
if (!cursor)
return;
close(cursor->fd); close(cursor->fd);
cursor->is_valid = 0; cursor->is_valid = 0;
cursor->fd = -1; cursor->fd = -1;
cursor->eof = 1; cursor->eof = 1;
cursor->db = NULL; cursor->db = NULL;
if (cursor->query) if (cursor->query)
libretrodb_query_free(cursor->query); libretrodb_query_free(cursor->query);
cursor->query = NULL; cursor->query = NULL;
} }
@ -348,11 +353,8 @@ void libretrodb_cursor_close(libretrodb_cursor_t *cursor)
* *
* Returns: 0 if successful, otherwise negative. * Returns: 0 if successful, otherwise negative.
**/ **/
int libretrodb_cursor_open( int libretrodb_cursor_open(libretrodb_t *db, libretrodb_cursor_t *cursor,
libretrodb_t *db, libretrodb_query_t *q)
libretrodb_cursor_t *cursor,
libretrodb_query_t *q
)
{ {
cursor->fd = dup(db->fd); cursor->fd = dup(db->fd);

2
libretrodb/libretrodb_tool.c
View File

@ -103,5 +103,7 @@ int main(int argc, char ** argv)
printf("Unknown command %s\n", argv[2]); printf("Unknown command %s\n", argv[2]);
return 1; return 1;
} }
libretrodb_close(&db); libretrodb_close(&db);
return 1;
} }

66
libretrodb/query.c
View File

@ -161,7 +161,6 @@ static void argument_free(struct argument * arg)
{ {
rmsgpack_dom_value_free(&arg->value); rmsgpack_dom_value_free(&arg->value);
return; return;
} }
for (i = 0; i < arg->invocation.argc; i++) for (i = 0; i < arg->invocation.argc; i++)
@ -403,7 +402,8 @@ struct registered_func registered_functions[100] = {
{NULL, NULL} {NULL, NULL}
}; };
static struct buffer chomp(struct buffer buff) { static struct buffer chomp(struct buffer buff)
{
off_t i = 0; off_t i = 0;
(void)i; (void)i;
for (; buff.offset < buff.len && isspace(buff.data[buff.offset]); buff.offset++); for (; buff.offset < buff.len && isspace(buff.data[buff.offset]); buff.offset++);
@ -463,12 +463,11 @@ static void peek_char(struct buffer buff, char * c, const char ** error)
*c = buff.data[buff.offset]; *c = buff.data[buff.offset];
} }
static struct buffer get_char( static struct buffer get_char(struct buffer buff, char * c,
struct buffer buff, const char ** error)
char * c, {
const char ** error if (is_eot(buff))
) { {
if (is_eot(buff)) {
raise_unexpected_eof(buff.offset, error); raise_unexpected_eof(buff.offset, error);
return buff; return buff;
} }
@ -481,7 +480,8 @@ static struct buffer parse_string(
struct buffer buff, struct buffer buff,
struct rmsgpack_dom_value * value, struct rmsgpack_dom_value * value,
const char ** error const char ** error
) { )
{
char terminator = '\0'; char terminator = '\0';
char c = '\0'; char c = '\0';
const char * str_start; const char * str_start;
@ -539,9 +539,7 @@ static struct buffer parse_integer(struct buffer buff,
"%lld", "%lld",
#endif #endif
(signed long long*)&value->int_) == 0) (signed long long*)&value->int_) == 0)
{
raise_expected_number(buff.offset, error); raise_expected_number(buff.offset, error);
}
else else
{ {
while (isdigit(buff.data[buff.offset])) while (isdigit(buff.data[buff.offset]))
@ -550,30 +548,31 @@ static struct buffer parse_integer(struct buffer buff,
return buff; return buff;
} }
static struct buffer parse_value( static struct buffer parse_value(struct buffer buff,
struct buffer buff, struct rmsgpack_dom_value * value, const char ** error)
struct rmsgpack_dom_value * value, {
const char ** error
) {
buff = chomp(buff); buff = chomp(buff);
if (peek(buff, "nil")) { if (peek(buff, "nil"))
{
buff.offset += strlen("nil"); buff.offset += strlen("nil");
value->type = RDT_NULL; value->type = RDT_NULL;
} else if (peek(buff, "true")) { }
else if (peek(buff, "true"))
{
buff.offset += strlen("true"); buff.offset += strlen("true");
value->type = RDT_BOOL; value->type = RDT_BOOL;
value->bool_ = 1; value->bool_ = 1;
} else if (peek(buff, "false")) { }
else if (peek(buff, "false"))
{
buff.offset += strlen("false"); buff.offset += strlen("false");
value->type = RDT_BOOL; value->type = RDT_BOOL;
value->bool_ = 0; value->bool_ = 0;
//} else if (peek(buff, "[")) {
//} else if (peek(buff, "b\"") || peek(buff, "b'")) {
} else if (peek(buff, "\"") || peek(buff, "'")) {
buff = parse_string(buff, value, error);
} else if (isdigit(buff.data[buff.offset])) {
buff = parse_integer(buff, value, error);
} }
else if (peek(buff, "\"") || peek(buff, "'"))
buff = parse_string(buff, value, error);
else if (isdigit(buff.data[buff.offset]))
buff = parse_integer(buff, value, error);
return buff; return buff;
} }
@ -617,7 +616,8 @@ static struct buffer parse_method_call(
struct buffer buff, struct buffer buff,
struct invocation * invocation, struct invocation * invocation,
const char ** error const char ** error
) { )
{
const char * func_name; const char * func_name;
size_t func_name_len; size_t func_name_len;
struct argument args[MAX_ARGS]; struct argument args[MAX_ARGS];
@ -684,14 +684,16 @@ static struct buffer parse_method_call(
goto clean; goto clean;
invocation->argc = argi; invocation->argc = argi;
invocation->argv = (struct argument*)malloc(sizeof(struct argument) * argi); invocation->argv = (struct argument*)
malloc(sizeof(struct argument) * argi);
if (!invocation->argv) if (!invocation->argv)
{ {
raise_enomem(error); raise_enomem(error);
goto clean; goto clean;
} }
memcpy(invocation->argv, args, sizeof(struct argument) * argi); memcpy(invocation->argv, args,
sizeof(struct argument) * argi);
goto success; goto success;
clean: clean:
@ -749,6 +751,7 @@ static struct buffer parse_table(struct buffer buff,
goto clean; goto clean;
buff = chomp(buff); buff = chomp(buff);
while (!peek(buff, "}")) while (!peek(buff, "}"))
{ {
if (argi >= MAX_ARGS) if (argi >= MAX_ARGS)
@ -825,14 +828,16 @@ static struct buffer parse_table(struct buffer buff,
invocation->func = all_map; invocation->func = all_map;
invocation->argc = argi; invocation->argc = argi;
invocation->argv = (struct argument*)malloc(sizeof(struct argument) * argi); invocation->argv = (struct argument*)
malloc(sizeof(struct argument) * argi);
if (!invocation->argv) if (!invocation->argv)
{ {
raise_enomem(error); raise_enomem(error);
goto clean; goto clean;
} }
memcpy(invocation->argv, args, sizeof(struct argument) * argi); memcpy(invocation->argv, args,
sizeof(struct argument) * argi);
goto success; goto success;
clean: clean:
@ -874,6 +879,7 @@ void *libretrodb_query_compile(libretrodb_t * db,
*error = NULL; *error = NULL;
buff = chomp(buff); buff = chomp(buff);
if (peek(buff, "{")) if (peek(buff, "{"))
{ {
buff = parse_table(buff, &q->root, error); buff = parse_table(buff, &q->root, error);

210
libretrodb/rmsgpack.c
View File

@ -76,8 +76,7 @@ int rmsgpack_write_array_header(int fd, uint32_t size)
return -errno; return -errno;
return sizeof(int8_t) + sizeof(uint16_t); return sizeof(int8_t) + sizeof(uint16_t);
} }
else
{
if (write(fd, &MPF_ARRAY32, sizeof(MPF_ARRAY32)) == -1) if (write(fd, &MPF_ARRAY32, sizeof(MPF_ARRAY32)) == -1)
return -errno; return -errno;
tmp_i32 = httobe32(size); tmp_i32 = httobe32(size);
@ -85,27 +84,29 @@ int rmsgpack_write_array_header(int fd, uint32_t size)
return -errno; return -errno;
return sizeof(int8_t) + sizeof(uint32_t); return sizeof(int8_t) + sizeof(uint32_t);
} }
}
int rmsgpack_write_map_header( int rmsgpack_write_map_header(int fd, uint32_t size)
int fd, {
uint32_t size
){
uint16_t tmp_i16; uint16_t tmp_i16;
uint32_t tmp_i32; uint32_t tmp_i32;
if (size < 16) {
if (size < 16)
{
size = (size | MPF_FIXMAP); size = (size | MPF_FIXMAP);
if (write(fd, &size, sizeof(int8_t)) == -1) if (write(fd, &size, sizeof(int8_t)) == -1)
return -errno; return -errno;
return sizeof(int8_t); return sizeof(int8_t);
} else if (size < (uint16_t)size) { }
else if (size < (uint16_t)size)
{
if (write(fd, &MPF_MAP16, sizeof(MPF_MAP16)) == -1) if (write(fd, &MPF_MAP16, sizeof(MPF_MAP16)) == -1)
return -errno; return -errno;
tmp_i16 = httobe16(size); tmp_i16 = httobe16(size);
if (write(fd, (void *)(&tmp_i16), sizeof(uint16_t)) == -1) if (write(fd, (void *)(&tmp_i16), sizeof(uint16_t)) == -1)
return -errno; return -errno;
return sizeof(uint8_t) + sizeof(uint16_t); return sizeof(uint8_t) + sizeof(uint16_t);
} else { }
tmp_i32 = httobe32(size); tmp_i32 = httobe32(size);
if (write(fd, &MPF_MAP32, sizeof(MPF_MAP32)) == -1) if (write(fd, &MPF_MAP32, sizeof(MPF_MAP32)) == -1)
return -errno; return -errno;
@ -113,35 +114,39 @@ int rmsgpack_write_map_header(
return -errno; return -errno;
return sizeof(int8_t) + sizeof(uint32_t); return sizeof(int8_t) + sizeof(uint32_t);
} }
}
int rmsgpack_write_string( int rmsgpack_write_string(int fd, const char *s, uint32_t len)
int fd, {
const char * s,
uint32_t len
){
int8_t fixlen = 0; int8_t fixlen = 0;
uint16_t tmp_i16; uint16_t tmp_i16;
uint32_t tmp_i32; uint32_t tmp_i32;
int written = sizeof(int8_t); int written = sizeof(int8_t);
if (len < 32) {
if (len < 32)
{
fixlen = len | MPF_FIXSTR; fixlen = len | MPF_FIXSTR;
if (write(fd, &fixlen, sizeof(int8_t)) == -1) if (write(fd, &fixlen, sizeof(int8_t)) == -1)
return -errno; return -errno;
} else if (len < 1<<8) { }
else if (len < 1<<8)
{
if (write(fd, &MPF_STR8, sizeof(MPF_STR8)) == -1) if (write(fd, &MPF_STR8, sizeof(MPF_STR8)) == -1)
return -errno; return -errno;
if (write(fd, &len, sizeof(uint8_t)) == -1) if (write(fd, &len, sizeof(uint8_t)) == -1)
return -errno; return -errno;
written += sizeof(uint8_t); written += sizeof(uint8_t);
} else if (len < 1<<16) { }
else if (len < 1<<16)
{
if (write(fd, &MPF_STR16, sizeof(MPF_STR16)) == -1) if (write(fd, &MPF_STR16, sizeof(MPF_STR16)) == -1)
return -errno; return -errno;
tmp_i16 = httobe16(len); tmp_i16 = httobe16(len);
if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1) if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1)
return -errno; return -errno;
written += sizeof(uint16_t); written += sizeof(uint16_t);
} else { }
else
{
if (write(fd, &MPF_STR32, sizeof(MPF_STR32)) == -1) if (write(fd, &MPF_STR32, sizeof(MPF_STR32)) == -1)
return -errno; return -errno;
tmp_i32 = httobe32(len); tmp_i32 = httobe32(len);
@ -149,34 +154,37 @@ int rmsgpack_write_string(
return -errno; return -errno;
written += sizeof(uint32_t); written += sizeof(uint32_t);
} }
if (write(fd, s, len) == -1) if (write(fd, s, len) == -1)
return -errno; return -errno;
written += len; written += len;
return written; return written;
} }
int rmsgpack_write_bin( int rmsgpack_write_bin(int fd, const void *s, uint32_t len)
int fd, {
const void * s,
uint32_t len
){
uint16_t tmp_i16; uint16_t tmp_i16;
uint32_t tmp_i32; uint32_t tmp_i32;
int written = sizeof(int8_t); int written = sizeof(int8_t);
if (len == (uint8_t)len) { if (len == (uint8_t)len)
{
if (write(fd, &MPF_BIN8, sizeof(MPF_BIN8)) == -1) if (write(fd, &MPF_BIN8, sizeof(MPF_BIN8)) == -1)
return -errno; return -errno;
if (write(fd, &len, sizeof(uint8_t)) == -1) if (write(fd, &len, sizeof(uint8_t)) == -1)
return -errno; return -errno;
written += sizeof(uint8_t); written += sizeof(uint8_t);
} else if (len == (uint16_t)len) { }
else if (len == (uint16_t)len)
{
if (write(fd, &MPF_BIN16, sizeof(MPF_BIN16)) == -1) if (write(fd, &MPF_BIN16, sizeof(MPF_BIN16)) == -1)
return -errno; return -errno;
tmp_i16 = httobe16(len); tmp_i16 = httobe16(len);
if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1) if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1)
return -errno; return -errno;
written += sizeof(uint16_t); written += sizeof(uint16_t);
} else { }
else
{
if (write(fd, &MPF_BIN32, sizeof(MPF_BIN32)) == -1) if (write(fd, &MPF_BIN32, sizeof(MPF_BIN32)) == -1)
return -errno; return -errno;
tmp_i32 = httobe32(len); tmp_i32 = httobe32(len);
@ -190,50 +198,57 @@ int rmsgpack_write_bin(
return 0; return 0;
} }
int rmsgpack_write_nil(int fd){ int rmsgpack_write_nil(int fd)
{
if (write(fd, &MPF_NIL, sizeof(MPF_NIL)) == -1) if (write(fd, &MPF_NIL, sizeof(MPF_NIL)) == -1)
return -errno; return -errno;
return sizeof(uint8_t); return sizeof(uint8_t);
} }
int rmsgpack_write_bool( int rmsgpack_write_bool(int fd, int value)
int fd, {
int value if (value)
){ {
if (value) {
if (write(fd, &MPF_TRUE, sizeof(MPF_TRUE)) == -1) if (write(fd, &MPF_TRUE, sizeof(MPF_TRUE)) == -1)
return -errno; return -errno;
} else { }
else
{
if (write(fd, &MPF_FALSE, sizeof(MPF_FALSE)) == -1) if (write(fd, &MPF_FALSE, sizeof(MPF_FALSE)) == -1)
return -errno; return -errno;
} }
return sizeof(uint8_t); return sizeof(uint8_t);
} }
int rmsgpack_write_int( int rmsgpack_write_int(int fd, int64_t value)
int fd, {
int64_t value
){
uint8_t tmpval = 0;
int16_t tmp_i16; int16_t tmp_i16;
int32_t tmp_i32; int32_t tmp_i32;
uint8_t tmpval = 0;
int written = sizeof(uint8_t); int written = sizeof(uint8_t);
if (value >=0 && value < 128) {
if (value >=0 && value < 128)
{
if (write(fd, &value, sizeof(int8_t)) == -1) if (write(fd, &value, sizeof(int8_t)) == -1)
return -errno; return -errno;
} else if (value < 0 && value > -32) { }
else if (value < 0 && value > -32)
{
tmpval = (value) | 0xe0; tmpval = (value) | 0xe0;
if (write(fd, &tmpval, sizeof(uint8_t)) == -1) if (write(fd, &tmpval, sizeof(uint8_t)) == -1)
return -errno; return -errno;
} else if (value == (int8_t)value) { }
else if (value == (int8_t)value)
{
if (write(fd, &MPF_INT8, sizeof(MPF_INT8)) == -1) if (write(fd, &MPF_INT8, sizeof(MPF_INT8)) == -1)
return -errno; return -errno;
if (write(fd, &value, sizeof(int8_t)) == -1) if (write(fd, &value, sizeof(int8_t)) == -1)
return -errno; return -errno;
written += sizeof(int8_t); written += sizeof(int8_t);
} else if (value == (int16_t)value) { }
else if (value == (int16_t)value)
{
if (write(fd, &MPF_INT16, sizeof(MPF_INT16)) == -1) if (write(fd, &MPF_INT16, sizeof(MPF_INT16)) == -1)
return -errno; return -errno;
@ -241,7 +256,9 @@ int rmsgpack_write_int(
if (write(fd, &tmp_i16, sizeof(int16_t)) == -1) if (write(fd, &tmp_i16, sizeof(int16_t)) == -1)
return -errno; return -errno;
written += sizeof(int16_t); written += sizeof(int16_t);
} else if (value == (int32_t)value) { }
else if (value == (int32_t)value)
{
if (write(fd, &MPF_INT32, sizeof(MPF_INT32)) == -1) if (write(fd, &MPF_INT32, sizeof(MPF_INT32)) == -1)
return -errno; return -errno;
@ -249,7 +266,9 @@ int rmsgpack_write_int(
if (write(fd, &tmp_i32, sizeof(int32_t)) == -1) if (write(fd, &tmp_i32, sizeof(int32_t)) == -1)
return -errno; return -errno;
written += sizeof(int32_t); written += sizeof(int32_t);
} else { }
else
{
if (write(fd, &MPF_INT64, sizeof(MPF_INT64)) == -1) if (write(fd, &MPF_INT64, sizeof(MPF_INT64)) == -1)
return -errno; return -errno;
@ -261,22 +280,23 @@ int rmsgpack_write_int(
return written; return written;
} }
int rmsgpack_write_uint( int rmsgpack_write_uint(int fd, uint64_t value)
int fd, {
uint64_t value
){
uint16_t tmp_i16; uint16_t tmp_i16;
uint32_t tmp_i32; uint32_t tmp_i32;
int written = sizeof(uint8_t); int written = sizeof(uint8_t);
if (value == (uint8_t)value) { if (value == (uint8_t)value)
{
if (write(fd, &MPF_UINT8, sizeof(MPF_UINT8)) == -1) if (write(fd, &MPF_UINT8, sizeof(MPF_UINT8)) == -1)
return -errno; return -errno;
if (write(fd, &value, sizeof(uint8_t)) == -1) if (write(fd, &value, sizeof(uint8_t)) == -1)
return -errno; return -errno;
written += sizeof(uint8_t); written += sizeof(uint8_t);
} else if (value == (uint16_t)value) { }
else if (value == (uint16_t)value)
{
if (write(fd, &MPF_UINT16, sizeof(MPF_UINT16)) == -1) if (write(fd, &MPF_UINT16, sizeof(MPF_UINT16)) == -1)
return -errno; return -errno;
@ -284,7 +304,9 @@ int rmsgpack_write_uint(
if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1) if (write(fd, &tmp_i16, sizeof(uint16_t)) == -1)
return -errno; return -errno;
written += sizeof(uint16_t); written += sizeof(uint16_t);
} else if (value == (uint32_t)value) { }
else if (value == (uint32_t)value)
{
if (write(fd, &MPF_UINT32, sizeof(MPF_UINT32)) == -1) if (write(fd, &MPF_UINT32, sizeof(MPF_UINT32)) == -1)
return -errno; return -errno;
@ -292,7 +314,9 @@ int rmsgpack_write_uint(
if (write(fd, &tmp_i32, sizeof(uint32_t)) == -1) if (write(fd, &tmp_i32, sizeof(uint32_t)) == -1)
return -errno; return -errno;
written += sizeof(uint32_t); written += sizeof(uint32_t);
} else { }
else
{
if (write(fd, &MPF_UINT64, sizeof(MPF_UINT64)) == -1) if (write(fd, &MPF_UINT64, sizeof(MPF_UINT64)) == -1)
return -errno; return -errno;
@ -304,15 +328,15 @@ int rmsgpack_write_uint(
return written; return written;
} }
static int read_uint( static int read_uint(int fd, uint64_t *out, size_t size)
int fd, {
uint64_t * out,
size_t size
){
uint64_t tmp; uint64_t tmp;
if (read(fd, &tmp, size) == -1) if (read(fd, &tmp, size) == -1)
return -errno; return -errno;
switch (size) {
switch (size)
{
case 1: case 1:
*out = *(uint8_t *)(&tmp); *out = *(uint8_t *)(&tmp);
break; break;
@ -329,11 +353,8 @@ static int read_uint(
return 0; return 0;
} }
static int read_int( static int read_int(int fd, int64_t *out, size_t size)
int fd, {
int64_t * out,
size_t size
){
uint8_t tmp8 = 0; uint8_t tmp8 = 0;
uint16_t tmp16; uint16_t tmp16;
uint32_t tmp32; uint32_t tmp32;
@ -343,7 +364,8 @@ static int read_int(
(void)tmp8; (void)tmp8;
switch (size) { switch (size)
{
case 1: case 1:
*out = *((int8_t *)(&tmp64)); *out = *((int8_t *)(&tmp64));
break; break;
@ -374,7 +396,8 @@ static int read_buff(
return -errno; return -errno;
*pbuff = (char *)calloc(tmp_len + 1, sizeof(char)); *pbuff = (char *)calloc(tmp_len + 1, sizeof(char));
if (read(fd, *pbuff, tmp_len) == -1) { if (read(fd, *pbuff, tmp_len) == -1)
{
free(*pbuff); free(*pbuff);
return -errno; return -errno;
} }
@ -391,12 +414,12 @@ static int read_map(
int rv; int rv;
unsigned i; unsigned i;
if ( if (callbacks->read_map_start &&
callbacks->read_map_start &&
(rv = callbacks->read_map_start(len, data)) < 0) (rv = callbacks->read_map_start(len, data)) < 0)
return rv; return rv;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++)
{
if ((rv = rmsgpack_read(fd, callbacks, data)) < 0) if ((rv = rmsgpack_read(fd, callbacks, data)) < 0)
return rv; return rv;
if ((rv = rmsgpack_read(fd, callbacks, data)) < 0) if ((rv = rmsgpack_read(fd, callbacks, data)) < 0)
@ -411,16 +434,17 @@ static int read_array(
uint32_t len, uint32_t len,
struct rmsgpack_read_callbacks * callbacks, struct rmsgpack_read_callbacks * callbacks,
void * data void * data
){ )
{
int rv; int rv;
unsigned i; unsigned i;
if ( if (callbacks->read_array_start &&
callbacks->read_array_start &&
(rv = callbacks->read_array_start(len, data)) < 0) (rv = callbacks->read_array_start(len, data)) < 0)
return rv; return rv;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++)
{
if ((rv = rmsgpack_read(fd, callbacks, data)) < 0) if ((rv = rmsgpack_read(fd, callbacks, data)) < 0)
return rv; return rv;
} }
@ -428,11 +452,9 @@ static int read_array(
return 0; return 0;
} }
int rmsgpack_read( int rmsgpack_read(int fd, struct rmsgpack_read_callbacks * callbacks,
int fd, void * data)
struct rmsgpack_read_callbacks * callbacks, {
void * data
){
int rv; int rv;
uint64_t tmp_len = 0; uint64_t tmp_len = 0;
uint64_t tmp_uint = 0; uint64_t tmp_uint = 0;
@ -442,38 +464,50 @@ int rmsgpack_read(
if (read(fd, &type, sizeof(uint8_t)) == -1) if (read(fd, &type, sizeof(uint8_t)) == -1)
return -errno; return -errno;
if (type < MPF_FIXMAP) { if (type < MPF_FIXMAP)
{
if (!callbacks->read_int) if (!callbacks->read_int)
return 0; return 0;
return callbacks->read_int(type, data); return callbacks->read_int(type, data);
} else if (type < MPF_FIXARRAY) { }
else if (type < MPF_FIXARRAY)
{
tmp_len = type - MPF_FIXMAP; tmp_len = type - MPF_FIXMAP;
return read_map(fd, tmp_len, callbacks, data); return read_map(fd, tmp_len, callbacks, data);
} else if (type < MPF_FIXSTR) { }
else if (type < MPF_FIXSTR)
{
tmp_len = type - MPF_FIXARRAY; tmp_len = type - MPF_FIXARRAY;
return read_array(fd, tmp_len, callbacks, data); return read_array(fd, tmp_len, callbacks, data);
} else if (type < MPF_NIL) { }
else if (type < MPF_NIL)
{
tmp_len = type - MPF_FIXSTR; tmp_len = type - MPF_FIXSTR;
buff = (char *)calloc(tmp_len + 1, sizeof(char)); buff = (char *)calloc(tmp_len + 1, sizeof(char));
if (!buff) if (!buff)
return -ENOMEM; return -ENOMEM;
if (read(fd, buff, tmp_len) == -1) { if (read(fd, buff, tmp_len) == -1)
{
free(buff); free(buff);
return -errno; return -errno;
} }
buff[tmp_len] = '\0'; buff[tmp_len] = '\0';
if (!callbacks->read_string) { if (!callbacks->read_string)
{
free(buff); free(buff);
return 0; return 0;
} }
return callbacks->read_string(buff, tmp_len, data); return callbacks->read_string(buff, tmp_len, data);
} else if (type > MPF_MAP32) { }
else if (type > MPF_MAP32)
{
if (!callbacks->read_int) if (!callbacks->read_int)
return 0; return 0;
return callbacks->read_int(type - 0xff - 1, data); return callbacks->read_int(type - 0xff - 1, data);
} }
switch (type) { switch (type)
{
case 0xc0: case 0xc0:
if (callbacks->read_nil) if (callbacks->read_nil)
return callbacks->read_nil(data); return callbacks->read_nil(data);

84
libretrodb/rmsgpack_dom.c
View File

@ -9,33 +9,35 @@
#include "rmsgpack.h" #include "rmsgpack.h"
#define MAX_DEPTH 128 #define MAX_DEPTH 128
struct dom_reader_state {
struct dom_reader_state
{
int i; int i;
struct rmsgpack_dom_value * stack[MAX_DEPTH]; struct rmsgpack_dom_value * stack[MAX_DEPTH];
}; };
static struct rmsgpack_dom_value * dom_reader_state_pop(struct dom_reader_state * s){ static struct rmsgpack_dom_value * dom_reader_state_pop(
struct dom_reader_state * s)
{
struct rmsgpack_dom_value * v = s->stack[s->i]; struct rmsgpack_dom_value * v = s->stack[s->i];
s->i--; s->i--;
return v; return v;
} }
static int dom_reader_state_push( static int dom_reader_state_push(struct dom_reader_state * s,
struct dom_reader_state * s, struct rmsgpack_dom_value * v)
struct rmsgpack_dom_value * v {
){ if ((s->i + 1) == MAX_DEPTH)
if ((s->i + 1) == MAX_DEPTH) {
return -ENOMEM; return -ENOMEM;
}
s->i++; s->i++;
s->stack[s->i] = v; s->stack[s->i] = v;
return 0; return 0;
} }
static int dom_read_nil(void * data){ static int dom_read_nil(void * data)
{
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value * v = struct rmsgpack_dom_value * v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -43,10 +45,8 @@ static int dom_read_nil(void * data){
return 0; return 0;
} }
static int dom_read_bool( static int dom_read_bool(int value, void * data)
int value, {
void * data
){
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value * v = struct rmsgpack_dom_value * v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -55,10 +55,8 @@ static int dom_read_bool(
return 0; return 0;
} }
static int dom_read_int( static int dom_read_int(int64_t value, void *data)
int64_t value, {
void * data
){
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value * v = struct rmsgpack_dom_value * v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -67,10 +65,8 @@ static int dom_read_int(
return 0; return 0;
} }
static int dom_read_uint( static int dom_read_uint(uint64_t value, void * data)
uint64_t value, {
void * data
){
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value * v = struct rmsgpack_dom_value * v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -79,11 +75,8 @@ static int dom_read_uint(
return 0; return 0;
} }
static int dom_read_string( static int dom_read_string(char *value, uint32_t len, void *data)
char * value, {
uint32_t len,
void * data
){
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value * v = struct rmsgpack_dom_value * v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -93,11 +86,8 @@ static int dom_read_string(
return 0; return 0;
} }
static int dom_read_bin( static int dom_read_bin(void *value, uint32_t len, void *data)
void * value, {
uint32_t len,
void * data
){
struct dom_reader_state *dom_state = (struct dom_reader_state *)data; struct dom_reader_state *dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value *v = struct rmsgpack_dom_value *v =
(struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state); (struct rmsgpack_dom_value *)dom_reader_state_pop(dom_state);
@ -107,10 +97,8 @@ static int dom_read_bin(
return 0; return 0;
} }
static int dom_read_map_start( static int dom_read_map_start(uint32_t len, void *data)
uint32_t len, {
void * data
){
unsigned i; unsigned i;
struct rmsgpack_dom_pair * items = NULL; struct rmsgpack_dom_pair * items = NULL;
struct dom_reader_state * dom_state = (struct dom_reader_state *)data; struct dom_reader_state * dom_state = (struct dom_reader_state *)data;
@ -120,13 +108,15 @@ static int dom_read_map_start(
v->map.len = len; v->map.len = len;
v->map.items = NULL; v->map.items = NULL;
items = (struct rmsgpack_dom_pair *)calloc(len, sizeof(struct rmsgpack_dom_pair)); items = (struct rmsgpack_dom_pair *)calloc(len,
sizeof(struct rmsgpack_dom_pair));
if (!items) if (!items)
return -ENOMEM; return -ENOMEM;
v->map.items = items; v->map.items = items;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++)
{
if (dom_reader_state_push(dom_state, &items[i].value) < 0) if (dom_reader_state_push(dom_state, &items[i].value) < 0)
return -ENOMEM; return -ENOMEM;
if (dom_reader_state_push(dom_state, &items[i].key) < 0) if (dom_reader_state_push(dom_state, &items[i].key) < 0)
@ -392,10 +382,8 @@ int rmsgpack_dom_read(
return rv; return rv;
} }
int rmsgpack_dom_read_into( int rmsgpack_dom_read_into(int fd, ...)
int fd, {
...
){
va_list ap; va_list ap;
struct rmsgpack_dom_value map; struct rmsgpack_dom_value map;
int rv; int rv;
@ -418,14 +406,17 @@ int rmsgpack_dom_read_into(
if (rv < 0) if (rv < 0)
return rv; return rv;
if (map.type != RDT_MAP) { if (map.type != RDT_MAP)
{
rv = -EINVAL; rv = -EINVAL;
goto clean; goto clean;
} }
while (1) { while (1)
{
key_name = va_arg(ap, const char *); key_name = va_arg(ap, const char *);
if (key_name == NULL) { if (key_name == NULL)
{
rv = 0; rv = 0;
goto clean; goto clean;
} }
@ -436,7 +427,8 @@ int rmsgpack_dom_read_into(
value = rmsgpack_dom_value_map_value(&map, &key); value = rmsgpack_dom_value_map_value(&map, &key);
switch (value->type) { switch (value->type)
{
case RDT_INT: case RDT_INT:
int_value = va_arg(ap, int64_t *); int_value = va_arg(ap, int64_t *);
*int_value = value->int_; *int_value = value->int_;

88
libretrodb/rmsgpack_test.c
View File

@ -7,15 +7,14 @@
#include "rmsgpack.h" #include "rmsgpack.h"
struct stub_state { struct stub_state
{
int i; int i;
uint64_t stack[256]; uint64_t stack[256];
}; };
static void stub_state_push_map( static void stub_state_push_map(struct stub_state *s, uint32_t size)
struct stub_state * s, {
uint32_t size
){
s->i++; s->i++;
s->stack[s->i] = 1; s->stack[s->i] = 1;
s->i++; s->i++;
@ -23,10 +22,8 @@ static void stub_state_push_map(
printf("{"); printf("{");
} }
static void stub_state_push_array( static void stub_state_push_array(struct stub_state *s, uint32_t size)
struct stub_state * s, {
uint32_t size
){
s->i++; s->i++;
s->stack[s->i] = 2; s->stack[s->i] = 2;
s->i++; s->i++;
@ -35,58 +32,61 @@ static void stub_state_push_array(
} }
static void stub_state_pre_print(struct stub_state *s) static void stub_state_pre_print(struct stub_state *s)
{} {
}
static void stub_state_post_print(struct stub_state * s){ static void stub_state_post_print(struct stub_state *s)
switch (s->stack[s->i - 1]) { {
switch (s->stack[s->i - 1])
{
case 1: case 1:
if (s->stack[s->i] % 2 == 0) { if (s->stack[s->i] % 2 == 0)
{
printf(": "); printf(": ");
s->stack[s->i]--; s->stack[s->i]--;
} else if (s->stack[s->i] == 1) { }
else if (s->stack[s->i] == 1)
{
printf("}"); printf("}");
s->i -= 2; s->i -= 2;
stub_state_post_print(s); stub_state_post_print(s);
} else { }
else
{
printf(", "); printf(", ");
s->stack[s->i]--; s->stack[s->i]--;
} }
break; break;
case 2: case 2:
if (s->stack[s->i] == 1) { if (s->stack[s->i] == 1)
{
printf("]"); printf("]");
s->i -= 2; s->i -= 2;
stub_state_post_print(s); stub_state_post_print(s);
} else { }
else
{
printf(", "); printf(", ");
s->stack[s->i]--; s->stack[s->i]--;
} }
break; break;
} }
} }
static int stub_read_map_start( static int stub_read_map_start(uint32_t size, void *data)
uint32_t size, {
void * data
){
stub_state_push_map(data, size); stub_state_push_map(data, size);
return 0; return 0;
} }
static int stub_read_array_start( static int stub_read_array_start(uint32_t size, void *data)
uint32_t size, {
void * data
){
stub_state_push_array(data, size); stub_state_push_array(data, size);
return 0; return 0;
} }
static int stub_read_string( static int stub_read_string(char *s, uint32_t len, void *data)
char * s, {
uint32_t len,
void * data
){
stub_state_pre_print(data); stub_state_pre_print(data);
printf("'%s'", s); printf("'%s'", s);
stub_state_post_print(data); stub_state_post_print(data);
@ -106,10 +106,8 @@ static int stub_read_bin(
return 0; return 0;
} }
static int stub_read_uint( static int stub_read_uint(uint64_t value, void *data)
uint64_t value, {
void * data
){
stub_state_pre_print(data); stub_state_pre_print(data);
#ifdef _WIN32 #ifdef _WIN32
printf("%I64u", (unsigned long long)value); printf("%I64u", (unsigned long long)value);
@ -120,16 +118,16 @@ static int stub_read_uint(
return 0; return 0;
} }
static int stub_read_nil(void * data){ static int stub_read_nil(void * data)
{
stub_state_pre_print(data); stub_state_pre_print(data);
printf("nil"); printf("nil");
stub_state_post_print(data); stub_state_post_print(data);
return 0; return 0;
} }
static int stub_read_int(
int64_t value, static int stub_read_int(int64_t value, void * data)
void * data {
){
stub_state_pre_print(data); stub_state_pre_print(data);
#ifdef _WIN32 #ifdef _WIN32
printf("%I64d", (signed long long)value); printf("%I64d", (signed long long)value);
@ -140,10 +138,8 @@ static int stub_read_int(
return 0; return 0;
} }
static int stub_read_bool( static int stub_read_bool(int value, void * data)
int value, {
void * data
){
stub_state_pre_print(data); stub_state_pre_print(data);
if (value) if (value)
printf("true"); printf("true");
@ -164,7 +160,8 @@ static struct rmsgpack_read_callbacks stub_callbacks = {
stub_read_array_start stub_read_array_start
}; };
int main(void){ int main(void)
{
int fd; int fd;
/* /*
int fd = open("test.msgpack", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); int fd = open("test.msgpack", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
@ -194,6 +191,7 @@ int main(void){
*/ */
struct stub_state state; struct stub_state state;
state.i = 0; state.i = 0;
state.stack[0] = 0; state.stack[0] = 0;
fd = open("test.msgpack", O_RDONLY); fd = open("test.msgpack", O_RDONLY);