Move the get_format_sorting call

This makes the set_sorting function slightly more general.

Change-Id: Ic77b0fa60bb4007baa90779905e6381e54262078

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index ca8ede1..baf33bb 100644 (file)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -463,7 +463,7 @@ int validate_buffers(int *enabled_buffers)
        return 0;
 }
 
-void set_sorting(struct sort_vector *logs, struct log_format format, bool is_pipe, enum sorting_order source_sorting)
+void set_sorting(struct sort_vector *logs, enum sorting_order sort_by, bool is_pipe, enum sorting_order source_sorting)
 {
        assert(logs);
 
@@ -476,7 +476,7 @@ void set_sorting(struct sort_vector *logs, struct log_format format, bool is_pip
                return;
        }
 
-       logs->sort_by = get_format_sorting(format.format);
+       logs->sort_by = sort_by;
        if (logs->sort_by == SORT_DEFAULT)
                logs->sort_by = source_sorting; // pick the compatible sorting to make things easier.
        if (logs->sort_by == source_sorting)
@@ -545,7 +545,7 @@ int main(int argc, char **argv)
        }
        const bool is_pipe = !strcmp(backend, "pipe");
 
-       set_sorting(&logs, l_file.format, is_pipe, get_order_from_config(&conf));
+       set_sorting(&logs, get_format_sorting(l_file.format.format), is_pipe, get_order_from_config(&conf));
        clock_gettime(get_proper_clock(logs.sort_by), &logs.start);
 
        if (!sort_vector_finalize(&logs))

diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 8aa130d..a07de80 100644 (file)
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -12,7 +12,7 @@ struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum
 int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, struct log_file *l_file, 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, struct log_format format, bool is_pipe, enum sorting_order source_sorting);
+void set_sorting(struct sort_vector *logs, enum sorting_order sort_by, bool is_pipe, enum sorting_order source_sorting);
 
 int written_logs = 0;
 bool free_entries = false;
@@ -195,25 +195,20 @@ int main()
 
        sort_vector_free(&sv);
 
-       struct log_format format = {
-               .format = FORMAT_TAG,
-       };
-
        sv.sort_by = sv.size = -1;
-       set_sorting(&sv, format, false, SORT_RECV_MONO);
+       set_sorting(&sv, SORT_DEFAULT, false, SORT_RECV_MONO);
        assert(sv.sort_by == SORT_SENT_REAL && sv.size == 0);
 
        sv.sort_by = sv.size = -1;
-       set_sorting(&sv, format, true, SORT_RECV_MONO);
+       set_sorting(&sv, SORT_DEFAULT, true, SORT_RECV_MONO);
        assert(sv.sort_by == SORT_RECV_MONO && sv.size == 0);
 
        sv.sort_by = sv.size = -1;
-       format.format = FORMAT_KERNELTIME;
-       set_sorting(&sv, format, true, SORT_SENT_MONO);
+       set_sorting(&sv, SORT_SENT_MONO, true, SORT_SENT_MONO);
        assert(sv.sort_by == SORT_SENT_MONO && sv.size == 0);
 
        sv.sort_by = sv.size = -1;
-       set_sorting(&sv, format, true, SORT_RECV_MONO);
+       set_sorting(&sv, SORT_SENT_MONO, true, SORT_RECV_MONO);
        assert(sv.sort_by == SORT_SENT_MONO && sv.size == -1);
 
 }