commit 21956b3d06e49f763a4b430985def1b777c96718
parent 7950ed52913d0e099c9fe87b6f96632bed2aed3c
Author: William Casarin <jb55@jb55.com>
Date: Tue, 1 Dec 2020 11:41:49 -0800
inline cursor
Diffstat:
| M | Makefile | | | 3 | +-- |
| D | src/cursor.c | | | 244 | ------------------------------------------------------------------------------- |
| M | src/cursor.h | | | 270 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- |
3 files changed, 245 insertions(+), 272 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,9 +1,8 @@
-CFLAGS = -Wno-error=unused-function -O1 -g -std=c89 -Wall -Wextra -Werror -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement
+CFLAGS = -Wno-error=unused-function -Ofast -std=gnu90 -Wall -Wextra -Werror -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement
OBJS = src/io.o \
src/parse.o \
- src/cursor.o \
src/describe.o \
src/serve.o \
src/client.o \
diff --git a/src/cursor.c b/src/cursor.c
@@ -1,244 +0,0 @@
-
-#include "cursor.h"
-#include "typedefs.h"
-#include "varint.h"
-
-#include <stdio.h>
-#include <string.h>
-
-int cursor_eof(struct cursor *c)
-{
- return c->p == c->end;
-}
-
-void *cursor_alloc(struct cursor *mem, unsigned long size)
-{
- void *ret;
-
- if (mem->p + size > mem->end) {
- return NULL;
- }
-
- ret = mem->p;
- memset(ret, 0, size);
- mem->p += size;
-
- return ret;
-}
-
-void copy_cursor(struct cursor *src, struct cursor *dest)
-{
- dest->start = src->start;
- dest->p = src->p;
- dest->end = src->end;
-}
-
-void make_cursor(u8 *start, u8 *end, struct cursor *cursor)
-{
- cursor->start = start;
- cursor->p = start;
- cursor->end = end;
-}
-
-int cursor_index(struct cursor *cursor, int elem_size)
-{
- return (cursor->p - cursor->start) / elem_size;
-}
-
-
-int pull_byte(struct cursor *cursor, u8 *c)
-{
- if (cursor->p + 1 > cursor->end)
- return 0;
-
- *c = *cursor->p;
- cursor->p++;
-
- return 1;
-}
-
-
-int push_byte(struct cursor *cursor, u8 c)
-{
- if (cursor->p + 1 > cursor->end) {
- return 0;
- }
-
- *cursor->p = c;
- cursor->p++;
-
- return 1;
-}
-
-int pull_data_into_cursor(struct cursor *cursor,
- struct cursor *dest,
- unsigned char **data,
- int len)
-{
- int ok;
-
- if (dest->p + len > dest->end) {
- printf("not enough room in dest buffer\n");
- return 0;
- }
-
- ok = pull_data(cursor, dest->p, len);
- if (!ok) return 0;
-
- *data = dest->p;
- dest->p += len;
-
- return 1;
-}
-
-int pull_data(struct cursor *cursor, u8 *data, int len)
-{
- if (cursor->p + len > cursor->end) {
- return 0;
- }
-
- memcpy(data, cursor->p, len);
- cursor->p += len;
-
- return 1;
-}
-
-int push_data(struct cursor *cursor, u8 *data, int len)
-{
- if (cursor->p + len > cursor->end) {
- printf("push_data oob\n");
- return 0;
- }
-
- memcpy(cursor->p, data, len);
- cursor->p += len;
-
- return 1;
-}
-
-int push_int(struct cursor *cursor, int i)
-{
- return push_data(cursor, (u8*)&i, sizeof(i));
-}
-
-/* TODO: push_varint */
-int push_varint(struct cursor *cursor, int n)
-{
- int ok, len;
- unsigned char b;
- len = 0;
-
- while (1) {
- b = (n & 0xFF) | 0x80;
- n >>= 7;
- if (n == 0) {
- b &= 0x7F;
- ok = push_byte(cursor, b);
- len++;
- if (!ok) return 0;
- break;
- }
-
- ok = push_byte(cursor, b);
- len++;
- if (!ok) return 0;
- }
-
- return len;
-}
-
-/* TODO: pull_varint */
-int pull_varint(struct cursor *cursor, int *n)
-{
- int ok, i;
- unsigned char b;
- *n = 0;
-
- for (i = 0;; i++) {
- ok = pull_byte(cursor, &b);
- if (!ok) return 0;
-
- *n |= ((int)b & 0x7F) << (i * 7);
-
- /* is_last */
- if ((b & 0x80) == 0) {
- return i+1;
- }
-
- if (i == 4) return 0;
- }
-
- return 0;
-}
-
-int pull_int(struct cursor *cursor, int *i)
-{
- return pull_data(cursor, (u8*)i, sizeof(*i));
-}
-
-int push_u16(struct cursor *cursor, u16 i)
-{
- return push_data(cursor, (u8*)&i, sizeof(i));
-}
-
-void *index_cursor(struct cursor *cursor, u16 index, int elem_size)
-{
- u8 *p;
- p = &cursor->start[elem_size * index];
-
- if (p > cursor->end)
- return NULL;
-
- return (void*)p;
-}
-
-
-int push_sized_str(struct cursor *cursor, const char *str, int len)
-{
- return push_data(cursor, (u8*)str, len);
-}
-
-int push_str(struct cursor *cursor, const char *str)
-{
- return push_data(cursor, (u8*)str, strlen(str));
-}
-
-int push_c_str(struct cursor *cursor, const char *str)
-{
- return push_str(cursor, str) && push_byte(cursor, 0);
-}
-
-
-/* TODO: push varint size */
-int push_prefixed_str(struct cursor *cursor, const char *str)
-{
- int ok, len;
- len = strlen(str);
- ok = push_varint(cursor, len);
- if (!ok) return 0;
- return push_sized_str(cursor, str, len);
-}
-
-int pull_prefixed_str(struct cursor *cursor, struct cursor *dest_buf, const char **str)
-{
- int len, ok;
-
- ok = pull_varint(cursor, &len);
- if (!ok) return 0;
-
- if (dest_buf->p + len > dest_buf->end) {
- return 0;
- }
-
- ok = pull_data_into_cursor(cursor, dest_buf, (unsigned char**)str, len);
- if (!ok) return 0;
-
- ok = push_byte(dest_buf, 0);
-
- return 1;
-}
-
-int cursor_remaining_capacity(struct cursor *cursor)
-{
- return cursor->end - cursor->p;
-}
diff --git a/src/cursor.h b/src/cursor.h
@@ -2,38 +2,256 @@
#ifndef PROTOVERSE_CURSOR_H
#define PROTOVERSE_CURSOR_H
+#include "typedefs.h"
+#include "varint.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define unlikely(x) __builtin_expect((x),0)
+
struct cursor {
unsigned char *start;
unsigned char *p;
unsigned char *end;
};
+static inline int cursor_eof(struct cursor *c)
+{
+ return c->p == c->end;
+}
+
+static inline void *cursor_alloc(struct cursor *mem, unsigned long size)
+{
+ void *ret;
+
+ if (mem->p + size > mem->end) {
+ return NULL;
+ }
+
+ ret = mem->p;
+ memset(ret, 0, size);
+ mem->p += size;
+
+ return ret;
+}
+
+static inline void copy_cursor(struct cursor *src, struct cursor *dest)
+{
+ dest->start = src->start;
+ dest->p = src->p;
+ dest->end = src->end;
+}
+
+static inline void make_cursor(u8 *start, u8 *end, struct cursor *cursor)
+{
+ cursor->start = start;
+ cursor->p = start;
+ cursor->end = end;
+}
+
+static inline int cursor_index(struct cursor *cursor, int elem_size)
+{
+ return (cursor->p - cursor->start) / elem_size;
+}
+
+
+static inline int pull_byte(struct cursor *cursor, u8 *c)
+{
+ if (unlikely(cursor->p + 1 > cursor->end))
+ return 0;
+
+ *c = *cursor->p;
+ cursor->p++;
+
+ return 1;
+}
+
+
+static inline int push_byte(struct cursor *cursor, u8 c)
+{
+ if (unlikely(cursor->p + 1 > cursor->end)) {
+ return 0;
+ }
+
+ *cursor->p = c;
+ cursor->p++;
+
+ return 1;
+}
+
+static inline int pull_data(struct cursor *cursor, u8 *data, int len)
+{
+ if (unlikely(cursor->p + len > cursor->end)) {
+ return 0;
+ }
+
+ memcpy(data, cursor->p, len);
+ cursor->p += len;
+
+ return 1;
+}
+
+static inline int pull_data_into_cursor(struct cursor *cursor,
+ struct cursor *dest,
+ unsigned char **data,
+ int len)
+{
+ int ok;
+
+ if (unlikely(dest->p + len > dest->end)) {
+ printf("not enough room in dest buffer\n");
+ return 0;
+ }
+
+ ok = pull_data(cursor, dest->p, len);
+ if (!ok) return 0;
+
+ *data = dest->p;
+ dest->p += len;
+
+ return 1;
+}
+
+
+static inline int push_data(struct cursor *cursor, u8 *data, int len)
+{
+ if (unlikely(cursor->p + len > cursor->end)) {
+ printf("push_data oob\n");
+ return 0;
+ }
+
+ memcpy(cursor->p, data, len);
+ cursor->p += len;
+
+ return 1;
+}
+
+static inline int push_int(struct cursor *cursor, int i)
+{
+ return push_data(cursor, (u8*)&i, sizeof(i));
+}
+
+/* TODO: push_varint */
+static inline int push_varint(struct cursor *cursor, int n)
+{
+ int ok, len;
+ unsigned char b;
+ len = 0;
+
+ while (1) {
+ b = (n & 0xFF) | 0x80;
+ n >>= 7;
+ if (n == 0) {
+ b &= 0x7F;
+ ok = push_byte(cursor, b);
+ len++;
+ if (!ok) return 0;
+ break;
+ }
+
+ ok = push_byte(cursor, b);
+ len++;
+ if (!ok) return 0;
+ }
+
+ return len;
+}
+
+/* TODO: pull_varint */
+static inline int pull_varint(struct cursor *cursor, int *n)
+{
+ int ok, i;
+ unsigned char b;
+ *n = 0;
+
+ for (i = 0;; i++) {
+ ok = pull_byte(cursor, &b);
+ if (!ok) return 0;
+
+ *n |= ((int)b & 0x7F) << (i * 7);
+
+ /* is_last */
+ if ((b & 0x80) == 0) {
+ return i+1;
+ }
+
+ if (i == 4) return 0;
+ }
+
+ return 0;
+}
+
+static inline int pull_int(struct cursor *cursor, int *i)
+{
+ return pull_data(cursor, (u8*)i, sizeof(*i));
+}
+
+static inline int push_u16(struct cursor *cursor, u16 i)
+{
+ return push_data(cursor, (u8*)&i, sizeof(i));
+}
+
+static inline void *index_cursor(struct cursor *cursor, u16 index, int elem_size)
+{
+ u8 *p;
+ p = &cursor->start[elem_size * index];
+
+ if (unlikely(p > cursor->end))
+ return NULL;
+
+ return (void*)p;
+}
+
+
+static inline int push_sized_str(struct cursor *cursor, const char *str, int len)
+{
+ return push_data(cursor, (u8*)str, len);
+}
+
+static inline int push_str(struct cursor *cursor, const char *str)
+{
+ return push_data(cursor, (u8*)str, strlen(str));
+}
+
+static inline int push_c_str(struct cursor *cursor, const char *str)
+{
+ return push_str(cursor, str) && push_byte(cursor, 0);
+}
+
+
+/* TODO: push varint size */
+static inline int push_prefixed_str(struct cursor *cursor, const char *str)
+{
+ int ok, len;
+ len = strlen(str);
+ ok = push_varint(cursor, len);
+ if (!ok) return 0;
+ return push_sized_str(cursor, str, len);
+}
+
+static inline int pull_prefixed_str(struct cursor *cursor, struct cursor *dest_buf, const char **str)
+{
+ int len, ok;
+
+ ok = pull_varint(cursor, &len);
+ if (!ok) return 0;
+
+ if (unlikely(dest_buf->p + len > dest_buf->end)) {
+ return 0;
+ }
+
+ ok = pull_data_into_cursor(cursor, dest_buf, (unsigned char**)str, len);
+ if (!ok) return 0;
+
+ ok = push_byte(dest_buf, 0);
+
+ return 1;
+}
-void *cursor_alloc(struct cursor *mem, unsigned long size);
-void copy_cursor(struct cursor *src, struct cursor *dest);
-int cursor_eof(struct cursor *src);
-int cursor_index(struct cursor *cursor, int elem_size);
-void make_cursor(unsigned char *start, unsigned char *end, struct cursor *cursor);
-int cursor_remaining_capacity(struct cursor *cursor);
-void *index_cursor(struct cursor *cursor, unsigned short index, int elem_size);
-
-int push_u16(struct cursor *cursor, unsigned short i);
-int push_int(struct cursor *cursor, int i);
-int push_varint(struct cursor *cursor, int i);
-int push_data(struct cursor *cursor, unsigned char *data, int len);
-int push_byte(struct cursor *cursor, unsigned char c);
-
-int pull_data_into_cursor(struct cursor *cursor, struct cursor *dest, unsigned char **data, int len);
-int pull_data(struct cursor *cursor, unsigned char *data, int len);
-int pull_byte(struct cursor *cursor, unsigned char *c);
-int pull_int(struct cursor *cursor, int *i);
-int pull_varint(struct cursor *cursor, int *i);
-
-int push_prefixed_str(struct cursor *cursor, const char *str);
-int push_str(struct cursor *cursor, const char *str);
-int push_c_str(struct cursor *cursor, const char *str);
-int push_sized_str(struct cursor *cursor, const char *str, int len);
-
-int pull_prefixed_str(struct cursor *cursor, struct cursor *dest_buf, const char **str);
+static inline int cursor_remaining_capacity(struct cursor *cursor)
+{
+ return cursor->end - cursor->p;
+}
#endif
