dlog_logger: add a ghetto vtable to readers

Change-Id: I3b9ee496a24f6e22f87a544fcf2beac1c1ccf01e
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/src/logger/logger_internal.c b/src/logger/logger_internal.c
index 5dead2c..7d06c03 100644 (file)
--- a/src/logger/logger_internal.c
+++ b/src/logger/logger_internal.c
@@ -99,7 +99,7 @@ static void service_reader_common(void *ptr, void *user_data)
                return;
        }
 
-       r = reader->service_reader(reader, now);
+       r = reader->ops->service(reader, now);
        if (r > 0) {
                reader_free(reader);
                return;

diff --git a/src/logger/reader_common.c b/src/logger/reader_common.c
index aa93119..fcd83fd 100644 (file)
--- a/src/logger/reader_common.c
+++ b/src/logger/reader_common.c
@@ -34,9 +34,10 @@ int reader_apply_log_to_subs(struct reader_common *reader, const struct dlogutil
        return ret;
 }
 
-void reader_common_init(struct reader_common *reader, struct logger *server)
+void reader_common_init(struct reader_common *reader, struct logger *server, const struct reader_ops *ops)
 {
        reader->server = server;
+       reader->ops = ops;
        reader->thread = 0;
        init_fd_entity(&reader->fd_entity_sink  , NULL, NULL);
        init_fd_entity(&reader->fd_entity_source, NULL, NULL);
@@ -97,7 +98,7 @@ void dispatch_event_reader(struct logger *server, struct epoll_event *event, voi
        if (r < 0)
                goto reader_free;
 
-       r = reader->service_reader(reader, now);
+       r = reader->ops->service(reader, now);
        if (r != 0) {
                /* This can happen for example if a pipe gets clogged,
                 * and is not necessarily a reason to remove the reader. */
@@ -112,7 +113,7 @@ reader_free:
 int reader_run(struct reader_common *const reader)
 {
        pthread_t thread;
-       int r = pthread_create(&thread, NULL, reader->thread_func, reader);
+       int r = pthread_create(&thread, NULL, reader->ops->thread_func, reader);
        if (r < 0)
                return r;
 
@@ -135,7 +136,7 @@ void reader_free(struct reader_common *reader)
 
        reader_flush(reader, (struct timespec){0, 0}, 0);
 
-       reader->free_reader(reader);
+       reader->ops->destroy(reader);
        reader_deinit_common(reader);
 
        free(reader);

diff --git a/src/logger/reader_common.h b/src/logger/reader_common.h
index 40aef54..a2c001b 100644 (file)
--- a/src/logger/reader_common.h
+++ b/src/logger/reader_common.h
@@ -36,17 +36,20 @@ struct logger;
  *                  └────────┘  └────────┘
  */
 
+struct reader_common;
+struct reader_ops {
+       int (*service) (struct reader_common *reader, struct now_t time);
+       void (*destroy) (struct reader_common *reader);
+       void *(*thread_func) (void *userdata);
+};
+
 struct reader_common {
        struct fd_entity fd_entity_sink;
        struct fd_entity fd_entity_source;
        struct logger *server;
-
+       const struct reader_ops *ops;
        pthread_t thread; // note, pthread id, not the same as OS tid!
-       void *(*thread_func)(void *userdata);
-
        list_head subs;
-       int (*service_reader) (struct reader_common *_reader, struct now_t time);
-       void (*free_reader) (struct reader_common *reader);
 };
 
 struct subreader_common {
@@ -66,7 +69,7 @@ int reader_flush(struct reader_common *reader, struct timespec now_mono, int flu
 void reader_free(struct reader_common *reader);
 void reader_free_ptr(void *reader);
 void reader_add_sub(struct reader_common *reader, void *sub);
-void reader_common_init(struct reader_common *reader, struct logger *server);
+void reader_common_init(struct reader_common *reader, struct logger *server, const struct reader_ops *ops);
 int reader_apply_log_to_subs(struct reader_common *reader, const struct dlogutil_entry *de);
 void dispatch_event_reader(struct logger *server, struct epoll_event *event, void *userdata);
 int reader_run(struct reader_common *const reader);

diff --git a/src/logger/reader_logger.c b/src/logger/reader_logger.c
index e390edd..22a24d5 100644 (file)
--- a/src/logger/reader_logger.c
+++ b/src/logger/reader_logger.c
@@ -94,6 +94,12 @@ static int service_reader_logger(struct reader_common *_reader, struct now_t tim
        return 0;
 }
 
+static const struct reader_ops logger_ops = (struct reader_ops) {
+       .service = service_reader_logger,
+       .destroy = free_reader_logger,
+       .thread_func = reader_logger_thread,
+};
+
 static struct reader_logger *reader_logger_alloc(struct logger *server)
 {
        struct reader_logger *const ret = calloc(1, sizeof *ret);
@@ -102,13 +108,10 @@ static struct reader_logger *reader_logger_alloc(struct logger *server)
 
        /* The reader nominally belongs to the server,
         * but is mostly handled by its own thread. */
-       reader_common_init(&ret->common, server);
+       reader_common_init(&ret->common, server, &logger_ops);
 
        ret->device_fd = -1;
        ret->buf_id = LOG_ID_INVALID;
-       ret->common.thread_func = reader_logger_thread;
-       ret->common.service_reader = service_reader_logger;
-       ret->common.free_reader = free_reader_logger;
 
        return ret;
 }
@@ -148,7 +151,7 @@ static void service_and_maybe_flush(struct reader_logger *const reader)
        if (r < 0)
                return;
 
-       r = reader->common.service_reader(&reader->common, now);
+       r = reader->common.ops->service(&reader->common, now);
        if (r > 0)
                return;
 

diff --git a/src/logger/reader_memory.c b/src/logger/reader_memory.c
index d556621..fb027f1 100644 (file)
--- a/src/logger/reader_memory.c
+++ b/src/logger/reader_memory.c
@@ -16,15 +16,18 @@ static void reader_memory_free(struct reader_common *_reader)
 
 static int print_out_logs(struct reader_common *_reader, struct now_t _time);
 
+static const struct reader_ops memory_ops = (struct reader_ops) {
+       .service = print_out_logs,
+       .destroy = reader_memory_free,
+};
+
 static struct reader_memory *reader_memory_alloc(struct logger *server, bool monitor, bool is_dumping)
 {
        struct reader_memory *ret = calloc(1, sizeof(*ret));
        if (!ret)
                return NULL;
 
-       reader_common_init(&ret->common, server);
-
-       ret->common.free_reader = reader_memory_free;
+       reader_common_init(&ret->common, server, &memory_ops);
 
        ret->uncompressed_chunk = malloc(COMPRESSION_CHUNK_SIZE);
        if (!ret->uncompressed_chunk) {
@@ -34,7 +37,6 @@ static struct reader_memory *reader_memory_alloc(struct logger *server, bool mon
        ret->uncompressed_chunk_size = 0;
        ret->uncompressed_chunk_index = 0;
 
-       ret->common.service_reader = print_out_logs;
        ret->monitor = monitor;
        ret->is_dumping = is_dumping;
        ret->log_compressed_storage_reader_ptr = NULL;

diff --git a/src/logger/reader_pipe.c b/src/logger/reader_pipe.c
index 55d4926..6efdada 100644 (file)
--- a/src/logger/reader_pipe.c
+++ b/src/logger/reader_pipe.c
@@ -28,16 +28,18 @@ static void reader_pipe_notify_losing_log(const dlogutil_entry_s *le, void *read
        reader_pipe_print_out_single_log(reader, (dlogutil_entry_s *)le);
 }
 
+static const struct reader_ops pipe_ops = (struct reader_ops) {
+       .service = print_out_logs,
+       .destroy = reader_pipe_free,
+};
+
 static struct reader_pipe *reader_pipe_alloc(struct logger *server, bool monitor, bool is_dumping)
 {
        struct reader_pipe *ret = calloc(1, sizeof(*ret));
        if (!ret)
                return NULL;
 
-       reader_common_init(&ret->common, server);
-
-       ret->common.free_reader = reader_pipe_free;
-       ret->common.service_reader = print_out_logs;
+       reader_common_init(&ret->common, server, &pipe_ops);
 
        for (log_id_t i = 0; i < NELEMS(ret->log_storage_reader_ptrs); ++i)
                ret->log_storage_reader_ptrs[i] = NULL;

diff --git a/src/tests/logger.c b/src/tests/logger.c
index 310c740..b6e234b 100644 (file)
--- a/src/tests/logger.c
+++ b/src/tests/logger.c
@@ -769,10 +769,13 @@ int main(void)
        sock.fd_entity.fd = 0;
        socket_close(&sock);
 
+       struct reader_ops test_ops = {
+               .destroy = reader_free_empty,
+       };
+
        struct reader_pipe *reader = calloc(1, sizeof(*reader));
        assert(reader);
-       reader_common_init(&reader->common, &logger);
-       reader->common.free_reader = reader_free_empty;
+       reader_common_init(&reader->common, &logger, &test_ops);
        reader_free(&reader->common);
        assert(last_free == reader);