From 801bf477be22afe4df5a5fb3840193d382faa012 Mon Sep 17 00:00:00 2001 From: Thomas Harning Jr Date: Tue, 19 Feb 2008 00:53:47 -0500 Subject: [PATCH] core/out_queue: More work on refactoring/dissecting the socket output queue --- core/include/output_queue.h | 6 ------ core/include/output_queue_socket.h | 13 +++++++++++++ ...tput_queue_internal.h => output_queue_socket_internal.h} | 0 core/src/out_strategy/memory_socket.c | 2 +- core/src/{output_queue.c => output_queue_socket.c} | 3 ++- 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 core/include/output_queue_socket.h rename core/include/{output_queue_internal.h => output_queue_socket_internal.h} (100%) rename core/src/{output_queue.c => output_queue_socket.c} (97%) diff --git a/core/include/output_queue.h b/core/include/output_queue.h index a3e546d..7f02b62 100644 --- a/core/include/output_queue.h +++ b/core/include/output_queue.h @@ -37,10 +37,4 @@ INLINE void OutputQueue_add_DataItem(OutputQueue *queue, DataItem *item, Target queue->ops->add(queue, item, target); } - -Target *new_Target_Socket(OutputQueue *queue, int fd); -void free_Target_Socket(OutputQueue *queue, Target *target); -OutputQueue *new_OutputQueue_Socket(core_t *core); - - #endif diff --git a/core/include/output_queue_socket.h b/core/include/output_queue_socket.h new file mode 100644 index 0000000..5f2cf26 --- /dev/null +++ b/core/include/output_queue_socket.h @@ -0,0 +1,13 @@ +#ifndef OUTPUT_QUEUE_SOCKET_H +#define OUTPUT_QUEUE_SOCKET_H + +#include "config.h" +#include "data_item.h" +#include "core.h" + + +Target *new_Target_Socket(OutputQueue *queue, int fd); +void free_Target_Socket(OutputQueue *queue, Target *target); +OutputQueue *new_OutputQueue_Socket(core_t *core); + +#endif diff --git a/core/include/output_queue_internal.h b/core/include/output_queue_socket_internal.h similarity index 100% rename from core/include/output_queue_internal.h rename to core/include/output_queue_socket_internal.h diff --git a/core/src/out_strategy/memory_socket.c b/core/src/out_strategy/memory_socket.c index edc3b78..50681f9 100644 --- a/core/src/out_strategy/memory_socket.c +++ b/core/src/out_strategy/memory_socket.c @@ -1,6 +1,6 @@ #include "out_strategy.h" #include "out_strategy/memory_socket.h" -#include "output_queue_internal.h" +#include "output_queue_socket_internal.h" #include /* errno, EAGAIN */ #include diff --git a/core/src/output_queue.c b/core/src/output_queue_socket.c similarity index 97% rename from core/src/output_queue.c rename to core/src/output_queue_socket.c index c33f895..6412ece 100644 --- a/core/src/output_queue.c +++ b/core/src/output_queue_socket.c @@ -1,5 +1,6 @@ #include "output_queue.h" -#include "output_queue_internal.h" +#include "output_queue_socket.h" +#include "output_queue_socket_internal.h" #include "out_strategy/memory_socket.h" -- 2.11.4.GIT