Move various files from dlogutil into shared locations

This is due to the need to use them in the upcoming libdlogutil.

Change-Id: I7048116972dbef9e345b333a91f92c2067188c5a

diff --git a/Makefile.am b/Makefile.am
index 4835122..fb3e03b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,10 +48,10 @@ dlogutil_LDFLAGS = \
 
 dlogutil_SOURCES = \
        src/logutil/logutil.c \
-       src/logutil/sort_vector.c \
-       src/logutil/fd_info.c \
-       src/logutil/fdi_pipe.c \
-       src/logutil/fdi_logger.c \
+       src/shared/sort_vector.c \
+       src/shared/fd_info.c \
+       src/shared/fdi_pipe.c \
+       src/shared/fdi_logger.c \
        src/shared/backend_androidlogger.c \
        src/shared/logcommon.c \
        src/shared/logprint.c \
@@ -236,19 +236,19 @@ src_tests_dynamic_config_SOURCES = src/tests/dynamic_config.c src/libdlog/dynami
 src_tests_dynamic_config_CFLAGS = $(check_CFLAGS) -pthread
 src_tests_dynamic_config_LDFLAGS = $(AM_LDFLAGS) -lpthread -Wl,--wrap=read,--wrap=syslog_critical_failure,--wrap=inotify_init1,--wrap=inotify_add_watch,--wrap=log_config_read_file,--wrap=asprintf,--wrap=pthread_mutex_trylock
 
-src_tests_sort_vector_SOURCES = src/tests/sort_vector.c src/logutil/sort_vector.c
+src_tests_sort_vector_SOURCES = src/tests/sort_vector.c src/shared/sort_vector.c
 src_tests_sort_vector_CFLAGS = $(check_CFLAGS)
 src_tests_sort_vector_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=log_config_get_int,--wrap=log_entry_is_earlier,--wrap=free
 
-src_tests_fd_info_SOURCES = src/tests/fd_info.c src/logutil/fd_info.c
+src_tests_fd_info_SOURCES = src/tests/fd_info.c src/shared/fd_info.c
 src_tests_fd_info_CFLAGS = $(check_CFLAGS)
 src_tests_fd_info_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=sort_vector_push,--wrap=malloc,--wrap=free,--wrap=close,--wrap=extract_timestamp,--wrap=log_should_print_line
 
-src_tests_fdi_logger_SOURCES = src/tests/fdi_logger.c src/logutil/fdi_logger.c src/shared/ptrs_list.c src/shared/logcommon.c
+src_tests_fdi_logger_SOURCES = src/tests/fdi_logger.c src/shared/fdi_logger.c src/shared/ptrs_list.c src/shared/logcommon.c
 src_tests_fdi_logger_CFLAGS = $(check_CFLAGS)
 src_tests_fdi_logger_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config_get_path,--wrap=log_add_filter_string,--wrap=parse_androidlogger_message,--wrap=copy_recv_timestamp,--wrap=malloc,--wrap=read,--wrap=close,--wrap=ioctl,--wrap=calloc
 
-src_tests_fdi_pipe_SOURCES = src/tests/fdi_pipe.c src/logutil/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c
+src_tests_fdi_pipe_SOURCES = src/tests/fdi_pipe.c src/shared/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c
 src_tests_fdi_pipe_CFLAGS = $(check_CFLAGS)
 src_tests_fdi_pipe_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=connect_sock,--wrap=close,--wrap=malloc,--wrap=free,--wrap=send_dlog_request,--wrap=recv_dlog_reply,--wrap=read,--wrap=recv_pipe
 

diff --git a/src/logutil/fd_info.h b/include/fd_info.h
similarity index 100%
rename from src/logutil/fd_info.h
rename to include/fd_info.h

diff --git a/src/logutil/fdi_logger.h b/include/fdi_logger.h
similarity index 100%
rename from src/logutil/fdi_logger.h
rename to include/fdi_logger.h

diff --git a/src/logutil/fdi_pipe.h b/include/fdi_pipe.h
similarity index 100%
rename from src/logutil/fdi_pipe.h
rename to include/fdi_pipe.h

diff --git a/src/logutil/fdi_pipe_internal.h b/include/fdi_pipe_internal.h
similarity index 100%
rename from src/logutil/fdi_pipe_internal.h
rename to include/fdi_pipe_internal.h

diff --git a/src/logutil/sort_vector.h b/include/sort_vector.h
similarity index 100%
rename from src/logutil/sort_vector.h
rename to include/sort_vector.h

diff --git a/src/logutil/fd_info.c b/src/shared/fd_info.c
similarity index 100%
rename from src/logutil/fd_info.c
rename to src/shared/fd_info.c

diff --git a/src/logutil/fdi_logger.c b/src/shared/fdi_logger.c
similarity index 100%
rename from src/logutil/fdi_logger.c
rename to src/shared/fdi_logger.c

diff --git a/src/logutil/fdi_pipe.c b/src/shared/fdi_pipe.c
similarity index 100%
rename from src/logutil/fdi_pipe.c
rename to src/shared/fdi_pipe.c

diff --git a/src/logutil/sort_vector.c b/src/shared/sort_vector.c
similarity index 100%
rename from src/logutil/sort_vector.c
rename to src/shared/sort_vector.c

diff --git a/src/tests/fd_info.c b/src/tests/fd_info.c
index 0ef79a0..46f2774 100644 (file)
--- a/src/tests/fd_info.c
+++ b/src/tests/fd_info.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 
 // DLog
-#include "../logutil/fd_info.h"
+#include <fd_info.h>
 
 static bool use_real_free;
 static void *expect_free1, *expect_free2;

diff --git a/src/tests/fdi_logger.c b/src/tests/fdi_logger.c
index 1f8b460..56cc3b8 100644 (file)
--- a/src/tests/fdi_logger.c
+++ b/src/tests/fdi_logger.c
@@ -3,7 +3,7 @@
 
 // DLog
 #include <dlog_ioctl.h>
-#include "../logutil/fdi_logger.h"
+#include <fdi_logger.h>
 
 static int open_buf_ret;
 static const char *open_buf_path;

diff --git a/src/tests/fdi_pipe.c b/src/tests/fdi_pipe.c
index 24a58bd..d70d3a6 100644 (file)
--- a/src/tests/fdi_pipe.c
+++ b/src/tests/fdi_pipe.c
@@ -1,6 +1,6 @@
-#include "../logutil/fd_info.h"
-#include "../logutil/fdi_pipe.h"
-#include "../logutil/fdi_pipe_internal.h"
+#include <fd_info.h>
+#include <fdi_pipe.h>
+#include <fdi_pipe_internal.h>
 #include <logpipe.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 27f072f..e6fcd21 100644 (file)
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -3,8 +3,8 @@
 #include <queued_entry.h>
 #include <log_file.h>
 #include <dlog-internal.h>
-#include "../logutil/sort_vector.h"
-#include "../logutil/fd_info.h"
+#include <sort_vector.h>
+#include <fd_info.h>
 
 int process_log(const struct logger_entry *e, struct timespec reference_ts, enum sorting_order stamp_type, write_callback callback, void *userdata, long timeout);
 void flush_logs(struct sort_vector *logs, write_callback callback, void *userdata, bool force);

diff --git a/src/tests/sort_vector.c b/src/tests/sort_vector.c
index c13f15b..0a1dfac 100644 (file)
--- a/src/tests/sort_vector.c
+++ b/src/tests/sort_vector.c
@@ -3,7 +3,7 @@
 
 // DLog
 #include <log_file.h>
-#include "../logutil/sort_vector.h"
+#include <sort_vector.h>
 
 size_t total_flushed;
 int callback(const struct logger_entry *e, void *userdata)