Alow multiplexing from writer-made readers

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

diff --git a/src/logger/log_buffer.c b/src/logger/log_buffer.c
index c168ae7..95946e1 100644 (file)
--- a/src/logger/log_buffer.c
+++ b/src/logger/log_buffer.c
@@ -260,7 +260,7 @@ static int service_writer_handle_req_util(struct logger *server, struct writer *
                goto cleanup;
        }
 
-       retval = reader_pipe_init_with_writer(&reader, wr, server, params.monitor, params.is_dumping);
+       retval = reader_pipe_init(&reader, params.enabled_buffers, server, params.monitor, params.is_dumping);
        if (retval != 0)
                goto cleanup;
 

diff --git a/src/logger/reader_pipe.c b/src/logger/reader_pipe.c
index cca9ecf..4d5b590 100644 (file)
--- a/src/logger/reader_pipe.c
+++ b/src/logger/reader_pipe.c
@@ -78,32 +78,6 @@ int reader_pipe_init(struct reader_pipe **reader, int enabled_buffers, struct lo
        return 0;
 }
 
-int reader_pipe_init_with_writer(struct reader_pipe **reader, struct writer *writer, struct logger *server,
-       bool monitor, bool is_dumping)
-{
-       assert(reader);
-       assert(writer);
-       assert(writer->buf_ptr);
-       assert(server);
-
-       __attribute__((cleanup(reader_free_ptr))) struct reader_pipe *ret = reader_pipe_alloc(server, monitor, is_dumping);
-       if (!ret)
-               return -ENOMEM;
-
-       log_storage_reader *const lsr = log_storage_new_reader(writer->buf_ptr->log_storage_ptr,
-               is_dumping, monitor, reader_pipe_notify_losing_log, ret);
-       if (!lsr)
-               return -ENOMEM;
-       ret->log_storage_reader_ptrs[0] = lsr;
-
-       init_fd_entity(&ret->common.fd_entity_sink,   dispatch_event_reader, ret);
-       init_fd_entity(&ret->common.fd_entity_source, dispatch_event_reader, ret);
-
-       *reader = ret;
-       ret = NULL;
-       return 0;
-}
-
 int reader_pipe_print_out_single_log(struct reader_pipe *reader, const dlogutil_entry_s *dlogutil_entry)
 {
        assert(reader);

diff --git a/src/logger/reader_pipe.h b/src/logger/reader_pipe.h
index 7f9dccf..ec11987 100644 (file)
--- a/src/logger/reader_pipe.h
+++ b/src/logger/reader_pipe.h
@@ -16,6 +16,4 @@ struct reader_pipe {
 
 int reader_pipe_init(struct reader_pipe **reader, int enabled_buffers, struct logger *server,
        bool monitor, bool is_dumping);
-int reader_pipe_init_with_writer(struct reader_pipe **reader, struct writer *writer, struct logger *server,
-       bool monitor, bool is_dumping);
 int reader_pipe_print_out_single_log(struct reader_pipe *reader, const dlogutil_entry_s *dlogutil_entry);