Move sort_vector_time_span into sort_vector.c

Change-Id: I4a948c731e41b16909f14576adeba86001526e64

5 files changed, 21 insertions, 22 deletions

diff --git a/Makefile.am b/Makefile.am
index fb3e03bb..9cb88480 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,7 +236,7 @@ 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/shared/sort_vector.c
+src_tests_sort_vector_SOURCES = src/tests/sort_vector.c src/shared/sort_vector.c src/shared/queued_entry_timestamp.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
 
diff --git a/include/sort_vector.h b/include/sort_vector.h
index 3ae755c6..6bec0ea0 100644
--- a/include/sort_vector.h
+++ b/include/sort_vector.h
@@ -48,4 +48,5 @@ int sort_vector_used_size(struct sort_vector *logs);
 void sort_vector_pop(struct sort_vector *logs);
 void sort_vector_apply_config(struct sort_vector *logs, struct log_config *config);
 int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, write_callback callback, void *userdata);
+long sort_vector_time_span(struct sort_vector *logs);
 
diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index 861c11b7..e451538a 100644
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -142,26 +142,6 @@ int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, stru
 	return 0;
 }
 
-long sort_vector_time_span(struct sort_vector *logs)
-{
-	struct timespec now, oldest;
-	long diff_s, diff_ns;
-	if (sort_vector_empty(logs))
-		return 0;
-
-	clock_gettime(get_proper_clock(logs->sort_by), &now);
-	extract_timestamp(sort_vector_back(logs), logs->sort_by, &oldest);
-
-	diff_s = now.tv_sec - oldest.tv_sec;
-	diff_ns = now.tv_nsec - oldest.tv_nsec;
-	if (diff_ns < 0) {
-		diff_ns += 1000000000;
-		--diff_s;
-	}
-
-	return (diff_s * 1000) + (diff_ns / 1000000);
-}
-
 /**
  * @brief Handle input
  * @details The main loop reading log data
diff --git a/src/shared/sort_vector.c b/src/shared/sort_vector.c
index 7cbd9010..4dd863af 100644
--- a/src/shared/sort_vector.c
+++ b/src/shared/sort_vector.c
@@ -190,3 +190,22 @@ int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, write_cal
 	return 0;
 }
 
+long sort_vector_time_span(struct sort_vector *logs)
+{
+	struct timespec now, oldest;
+	long diff_s, diff_ns;
+	if (sort_vector_empty(logs))
+		return 0;
+
+	clock_gettime(get_proper_clock(logs->sort_by), &now);
+	extract_timestamp(sort_vector_back(logs), logs->sort_by, &oldest);
+
+	diff_s = now.tv_sec - oldest.tv_sec;
+	diff_ns = now.tv_nsec - oldest.tv_nsec;
+	if (diff_ns < 0) {
+		diff_ns += 1000000000;
+		--diff_s;
+	}
+
+	return (diff_s * 1000) + (diff_ns/1000000);
+}
diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index e6fcd21c..cebca814 100644
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -10,7 +10,6 @@ int process_log(const struct logger_entry *e, struct timespec reference_ts, enum
 void flush_logs(struct sort_vector *logs, write_callback callback, void *userdata, bool force);
 struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum sorting_order sort_by);
 int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter);
-long sort_vector_time_span(struct sort_vector *logs);
 int validate_buffers(int *enabled_buffers);
 void set_sorting(struct sort_vector *logs, enum sorting_order sort_by, bool is_pipe, enum sorting_order source_sorting);