From 67ad99c415a964015fd414a2f39d05cd4aa53c7e Mon Sep 17 00:00:00 2001 From: Thomas Harning Jr Date: Sat, 16 Feb 2008 00:05:26 -0500 Subject: [PATCH] core: data_item(_t) -> DataItem, memory_item(_t) -> MemoryItem --- core/include/data_item.h | 64 +++++++++++++++++++------------------- core/include/filter.h | 6 ++-- core/include/filters/FilterChain.h | 2 +- core/include/output_queue.h | 4 +-- core/src/data_item.c | 16 +++++----- core/src/filter.c | 2 +- core/src/filters/FilterChain.c | 8 ++--- core/src/output_queue.c | 24 +++++++------- test/src/test.c | 12 +++---- 9 files changed, 69 insertions(+), 69 deletions(-) rewrite core/include/data_item.h (70%) diff --git a/core/include/data_item.h b/core/include/data_item.h dissimilarity index 70% index fd42c5f..9d73c65 100644 --- a/core/include/data_item.h +++ b/core/include/data_item.h @@ -1,32 +1,32 @@ -#ifndef DATA_ITEM_H -#define DATA_ITEM_H - -#include "config.h" -#include - -enum data_item_type { - DATA_ITEM_NULL = 0, - DATA_ITEM_MEMORY -}; - -typedef struct data_item data_item_t; - -SIMPLEQ_HEAD(data_item_queue, data_item); -typedef struct data_item_queue data_item_queue_t; - -struct data_item { - enum data_item_type typeID; - SIMPLEQ_ENTRY(data_item) entries; -}; - -typedef struct memory_item { - data_item_t type; - char* data; - size_t len; -} memory_item_t; - -void free_data_item(data_item_t *item); - -data_item_t *new_memory_item(const char *data, size_t len); - -#endif +#ifndef DATA_ITEM_H +#define DATA_ITEM_H + +#include "config.h" +#include + +enum DataItemType { + DATA_ITEM_NULL = 0, + DATA_ITEM_MEMORY +}; + +typedef struct DataItem DataItem; + +SIMPLEQ_HEAD(DataItem_queue, DataItem); +typedef struct DataItem_queue DataItem_queue; + +struct DataItem { + enum DataItemType typeID; + SIMPLEQ_ENTRY(DataItem) entries; +}; + +typedef struct MemoryItem { + DataItem base; + char* data; + size_t len; +} MemoryItem; + +void free_DataItem(DataItem *item); + +DataItem *new_MemoryItem(const char *data, size_t len); + +#endif diff --git a/core/include/filter.h b/core/include/filter.h index 8240230..a33f5d9 100644 --- a/core/include/filter.h +++ b/core/include/filter.h @@ -14,8 +14,8 @@ typedef enum { FILTER_READ_COMPLETE } FilterMode; -typedef void (*FilterAction_next)(void *, FilterMode mode, data_item_t *); -typedef void (*FilterAction)(void *, FilterMode mode, data_item_t *, FilterAction_next, void *); +typedef void (*FilterAction_next)(void *, FilterMode mode, DataItem *); +typedef void (*FilterAction)(void *, FilterMode mode, DataItem *, FilterAction_next, void *); typedef struct SimpleFilter { FilterAction onWrite; @@ -24,6 +24,6 @@ typedef struct SimpleFilter { FilterAction onReadComplete; } SimpleFilter; -void SimpleFilter_action(void *filter, FilterMode mode, data_item_t *item, FilterAction_next next, void *nextData); +void SimpleFilter_action(void *filter, FilterMode mode, DataItem *item, FilterAction_next next, void *nextData); #endif diff --git a/core/include/filters/FilterChain.h b/core/include/filters/FilterChain.h index bafcf23..a5689ed 100644 --- a/core/include/filters/FilterChain.h +++ b/core/include/filters/FilterChain.h @@ -6,7 +6,7 @@ typedef void (*Filter_stateRelease)(void *); -void FilterChain_action(void *state, FilterMode mode, data_item_t *item, FilterAction_next next, void *nextData); +void FilterChain_action(void *state, FilterMode mode, DataItem *item, FilterAction_next next, void *nextData); void *new_FilterChain(); void free_FilterChain(void *state); diff --git a/core/include/output_queue.h b/core/include/output_queue.h index bdebc9c..c2734a6 100644 --- a/core/include/output_queue.h +++ b/core/include/output_queue.h @@ -14,7 +14,7 @@ struct output_queue { output_queue_ops_t *ops; }; struct output_queue_ops { - void (*queue_item)(output_queue_t *, data_item_t *, void *); + void (*queue_item)(output_queue_t *, DataItem *, void *); void (*free)(output_queue_t *); }; @@ -23,7 +23,7 @@ INLINE void free_output_queue(output_queue_t *queue) { queue->ops->free(queue); } -INLINE void queue_data_item(output_queue_t *queue, data_item_t *item, void *target) { +INLINE void queue_DataItem(output_queue_t *queue, DataItem *item, void *target) { assert(queue && queue->ops && queue->ops->queue_item); queue->ops->queue_item(queue, item, target); } diff --git a/core/src/data_item.c b/core/src/data_item.c index 346dd9a..8e36866 100644 --- a/core/src/data_item.c +++ b/core/src/data_item.c @@ -5,13 +5,13 @@ #include /* fprintf */ #include /* abort */ -void free_memory_item(memory_item_t *item); +void free_MemoryItem(MemoryItem *item); -void free_data_item(data_item_t *item) { +void free_DataItem(DataItem *item) { if(!item) return; switch(item->typeID) { case DATA_ITEM_MEMORY: - free_memory_item((memory_item_t*)item); + free_MemoryItem((MemoryItem*)item); break; default: fprintf(stderr, "UNKNOWN ITEM TYPE"); @@ -21,21 +21,21 @@ void free_data_item(data_item_t *item) { free(item); } -data_item_t *new_memory_item(const char *data, size_t len) { - memory_item_t *item = calloc(1, sizeof(memory_item_t)); +DataItem *new_MemoryItem(const char *data, size_t len) { + MemoryItem *item = calloc(1, sizeof(MemoryItem)); if(!item) goto fail; - item->type.typeID = DATA_ITEM_MEMORY; + item->base.typeID = DATA_ITEM_MEMORY; item->len = len; item->data = malloc(len); if(!item->data) goto fail; memcpy(item->data, data, len); - return (data_item_t*)item; + return (DataItem*)item; fail: if(item && item->data) free(item->data); if(item) free(item); return NULL; } -void free_memory_item(memory_item_t *item) { +void free_MemoryItem(MemoryItem *item) { if(item->data) free(item->data); } diff --git a/core/src/filter.c b/core/src/filter.c index 5a2a0b8..0b65de3 100644 --- a/core/src/filter.c +++ b/core/src/filter.c @@ -12,7 +12,7 @@ } \ break; -void SimpleFilter_action(void *filter, FilterMode mode, data_item_t *item, FilterAction_next next, void *nextData) { +void SimpleFilter_action(void *filter, FilterMode mode, DataItem *item, FilterAction_next next, void *nextData) { assert(filter && next); SimpleFilter *f = (SimpleFilter*)filter; diff --git a/core/src/filters/FilterChain.c b/core/src/filters/FilterChain.c index a564610..d4093c4 100644 --- a/core/src/filters/FilterChain.c +++ b/core/src/filters/FilterChain.c @@ -21,9 +21,9 @@ typedef struct FilterChain_state { void *nextData; } FilterChain_State; -static void FilterChain_next(void *nextData, FilterMode mode, data_item_t *item); +static void FilterChain_next(void *nextData, FilterMode mode, DataItem *item); -static void FilterChain_call_current(FilterChain_State *state, FilterMode mode, data_item_t *item) { +static void FilterChain_call_current(FilterChain_State *state, FilterMode mode, DataItem *item) { int index = state->index; /* Handle completion cases */ if(index < 0 || index >= state->chain->numActions) { @@ -34,7 +34,7 @@ static void FilterChain_call_current(FilterChain_State *state, FilterMode mode, } state->chain->actions[index].action(state->chain->actions[index].actionState, mode, item, FilterChain_next, state); } -static void FilterChain_next(void *nextData, FilterMode mode, data_item_t *item) { +static void FilterChain_next(void *nextData, FilterMode mode, DataItem *item) { FilterChain_State *state = (FilterChain_State*)nextData; switch(mode) { case FILTER_READ: @@ -50,7 +50,7 @@ static void FilterChain_next(void *nextData, FilterMode mode, data_item_t *item) FilterChain_call_current(state, mode, item); } -void FilterChain_action(void *filter, FilterMode mode, data_item_t *item, FilterAction_next next, void *nextData) { +void FilterChain_action(void *filter, FilterMode mode, DataItem *item, FilterAction_next next, void *nextData) { FilterChain *chain = (FilterChain*)filter; FilterChain_State *state; assert(filter && next); diff --git a/core/src/output_queue.c b/core/src/output_queue.c index fd5c5f9..0b7f54a 100644 --- a/core/src/output_queue.c +++ b/core/src/output_queue.c @@ -9,7 +9,7 @@ #include /* printf */ /* TODO: Setup generic 'queue' so that input and output are handled in same queue */ -static void queue_socket_output(output_queue_t *queue, data_item_t *item, void *target); +static void queue_socket_output(output_queue_t *queue, DataItem *item, void *target); static void free_socket_output(output_queue_t *queue); static output_queue_ops_t socket_output_ops = { @@ -24,7 +24,7 @@ typedef struct socket_output_queue { typedef struct socket_target { ev_io writable; - data_item_queue_t queue; + DataItem_queue queue; int current_position; } socket_target_t; @@ -38,12 +38,12 @@ fail: return NULL; } -static int socket_write_item(socket_target_t *target, int fd, data_item_t *item) { - memory_item_t *mem; +static int socket_write_item(socket_target_t *target, int fd, DataItem *item) { + MemoryItem *mem; int ret; if(item->typeID != DATA_ITEM_MEMORY) /* XXX: skip */ return 1; - mem = (memory_item_t*)item; + mem = (MemoryItem*)item; while(1) { ret = send(fd, mem->data + target->current_position, mem->len - target->current_position, 0); if(ret > 0) { @@ -66,15 +66,15 @@ static int socket_write_item(socket_target_t *target, int fd, data_item_t *item) static void socket_output_cb(struct ev_loop *loop, struct ev_io *w, int revents) { /* HANDLE DATA */ socket_target_t *target = (socket_target_t*)w->data; - data_item_queue_t *queue = &target->queue; - data_item_t *item; + DataItem_queue *queue = &target->queue; + DataItem *item; while((item = SIMPLEQ_FIRST(queue))) { /* WRITE - 0 == not complete, needs to wait */ if(0 == socket_write_item(target, w->fd, item)) break; /* Remove the item from the queue and release */ SIMPLEQ_REMOVE_HEAD(queue, entries); - free_data_item(item); + free_DataItem(item); } } @@ -95,8 +95,8 @@ fail: } void free_socket_output_target(output_queue_t *queue, void *target) { socket_target_t *t = (socket_target_t*)target; - data_item_t *item; - data_item_queue_t *q = &t->queue; + DataItem *item; + DataItem_queue *q = &t->queue; /* Make sure IO listener stopped */ if(ev_is_active(&t->writable)) ev_io_stop(((socket_output_queue_t*)queue)->core->loop, &t->writable); @@ -104,12 +104,12 @@ void free_socket_output_target(output_queue_t *queue, void *target) { /* Cannot use foreach because it expects the item to exist for the next iteration */ while((item = SIMPLEQ_FIRST(q))) { SIMPLEQ_REMOVE_HEAD(q, entries); - free_data_item(item); + free_DataItem(item); } free(t); } -static void queue_socket_output(output_queue_t *queue, data_item_t *item, void *target) { +static void queue_socket_output(output_queue_t *queue, DataItem *item, void *target) { socket_target_t *t = (socket_target_t*)target; SIMPLEQ_INSERT_HEAD(&t->queue, item, entries); if(!ev_is_active(&t->writable)) diff --git a/test/src/test.c b/test/src/test.c index 8f70dff..172775a 100644 --- a/test/src/test.c +++ b/test/src/test.c @@ -175,18 +175,18 @@ void connect_handler_test() { free_core(c); printf("BAD COUNT: %i\nGOOD COUNT: %i\nTOTAL:%i\n", bad_count, success_count, bad_count + success_count); } -void data_item_test() { - data_item_t *mem = new_memory_item("HELLO", 6); +void DataItemTest() { + DataItem *mem = new_MemoryItem("HELLO", 6); printf("MEMORY_TYPE: %i\n", mem->typeID); - free_data_item(mem); + free_DataItem(mem); } -void test_FilterAction(void *state, FilterMode mode, data_item_t *item, FilterAction_next next, void *nextData) { +void test_FilterAction(void *state, FilterMode mode, DataItem *item, FilterAction_next next, void *nextData) { printf("GOT ACTION: %i - DATA: 0x%p\n", mode, item); next(nextData, mode, item); } -void end_FilterAction(void *state, FilterMode mode, data_item_t *item) { +void end_FilterAction(void *state, FilterMode mode, DataItem *item) { printf("DONE: %i - DATA: 0x%p\n", mode, item); } void chain_test() { @@ -200,7 +200,7 @@ int main(int argc, const char **argv) { memory_test(); file_test(); #endif - data_item_test(); + DataItemTest(); chain_test(); if(argc > 1 && !strcmp(argv[1], "--sock")) { struct addrinfo ai, *aitop; -- 2.11.4.GIT