Rename DUMP_{CONTINUOUS,INFINITE}

Change-Id: Ibc5746ba2bd82b115f8a41cc6378e301cd47c80b

diff --git a/include/sort_vector.h b/include/sort_vector.h
index bb03d29..5cc355f 100644 (file)
--- a/include/sort_vector.h
+++ b/include/sort_vector.h
@@ -24,8 +24,8 @@
 
 #define IS_VECTOR_SIZE_SORTABLE(x) (x > 1)
 
-#define DUMP_CONTINUOUS 0
-#define DUMP_INFINITE SIZE_MAX
+#define DLOGUTIL_MODE_CONTINUOUS 0
+#define DLOGUTIL_MODE_FULL_DUMP SIZE_MAX
 
 #define DEFAULT_SORT_BUFFER_SIZE 131072 // the size (in ENTRIES!) of the sorting buffer
 

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index 31af049..f2401af 100644 (file)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -113,7 +113,7 @@ int parse_options(int argc, char **argv, struct log_file *l_file, int *enabled_b
                        }
                        break;
                case 'd':
-                       opt->logs_dump = DUMP_INFINITE;
+                       opt->logs_dump = DLOGUTIL_MODE_FULL_DUMP;
                        break;
                case 't':
                        if (sscanf(optarg, "%zu", &opt->logs_dump) != 1)
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
           glibc has a feature where setting the TZ environmental var
           will cache the timezone, achieving precisely what we want.
         */
-       if (opt.logs_dump != DUMP_CONTINUOUS && !getenv("TZ"))
+       if (opt.logs_dump != DLOGUTIL_MODE_CONTINUOUS && !getenv("TZ"))
                putenv("TZ=:/etc/localtime");
 
        const char *const backend = log_config_get(&conf, "backend");

diff --git a/src/shared/fdi_logger.c b/src/shared/fdi_logger.c
index 1564937..c3fd6f6 100644 (file)
--- a/src/shared/fdi_logger.c
+++ b/src/shared/fdi_logger.c
@@ -166,7 +166,7 @@ static int logger_prepare_print(struct fd_info *fdi, int dump, log_filter *filte
        assert(lpd);
        assert(filter_object);
 
-       if (dump == DUMP_CONTINUOUS) {
+       if (dump == DLOGUTIL_MODE_CONTINUOUS) {
                lpd->log_len = UNLIMITED_LOG_LEN;
                return 0;
        }

diff --git a/src/shared/logretrieve.c b/src/shared/logretrieve.c
index 26d0fa3..c5880dc 100644 (file)
--- a/src/shared/logretrieve.c
+++ b/src/shared/logretrieve.c
@@ -82,7 +82,7 @@ failure:
 int additional_options_init(struct additional_options *opt)
 {
        opt->filter_object = log_filter_new();
-       opt->logs_dump = DUMP_CONTINUOUS;
+       opt->logs_dump = DLOGUTIL_MODE_CONTINUOUS;
        opt->logs_size = DEFAULT_SORT_BUFFER_SIZE;
        return opt->filter_object ? 0 : -ENOMEM;
 }
@@ -230,7 +230,7 @@ int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_callback ca
                 * the clock reaches its old value again. */
                const long last_log_age = sort_vector_time_span(&logs);
                const bool is_from_future = (last_log_age < 0);
-               if (logs.dump == DUMP_CONTINUOUS && (!nfds || (logs.old_logs_dumped == 1 && (last_log_age > logs.timeout || is_from_future)))) {
+               if (logs.dump == DLOGUTIL_MODE_CONTINUOUS && (!nfds || (logs.old_logs_dumped == 1 && (last_log_age > logs.timeout || is_from_future)))) {
                        r = sort_vector_flush(&logs, callback, userdata, is_from_future);
                        if (r != 0)
                                return r;
@@ -241,7 +241,7 @@ int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_callback ca
        if (r != 0)
                return r;
 
-       if (logs.dump != DUMP_CONTINUOUS && logs.dump != DUMP_INFINITE)
+       if (logs.dump != DLOGUTIL_MODE_CONTINUOUS && logs.dump != DLOGUTIL_MODE_FULL_DUMP)
                while (sort_vector_used_size(&logs) > logs.dump)
                        sort_vector_pop(&logs);
 

diff --git a/src/shared/sort_vector.c b/src/shared/sort_vector.c
index 69be408..8b180ac 100644 (file)
--- a/src/shared/sort_vector.c
+++ b/src/shared/sort_vector.c
@@ -37,7 +37,7 @@ void sort_vector_init(struct sort_vector *logs)
        logs->begin = 0;
        logs->end = 0;
 
-       logs->dump = DUMP_CONTINUOUS;
+       logs->dump = DLOGUTIL_MODE_CONTINUOUS;
        logs->size = DEFAULT_SORT_BUFFER_SIZE;
        logs->timeout = DEFAULT_SORT_TIMEOUT;
        logs->sort_by = SORT_SENT_MONO;
@@ -48,7 +48,7 @@ int sort_vector_finalize(struct sort_vector *logs)
 {
        assert(logs);
 
-       if (logs->dump != DUMP_INFINITE && logs->dump != DUMP_CONTINUOUS)
+       if (logs->dump != DLOGUTIL_MODE_FULL_DUMP && logs->dump != DLOGUTIL_MODE_CONTINUOUS)
                logs->size = logs->dump + 1; // +1 so that `-t 1` works (buffer must have capacity at least 2)
 
        logs->size = clamp_int(logs->size, 0, MAX_SORT_BUFFER_SIZE);
@@ -123,7 +123,7 @@ int sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dloguti
        assert(userdata);
 
        if (sort_vector_full(logs)) {
-               if (logs->dump == DUMP_CONTINUOUS || logs->dump == DUMP_INFINITE) {
+               if (logs->dump == DLOGUTIL_MODE_CONTINUOUS || logs->dump == DLOGUTIL_MODE_FULL_DUMP) {
                        const int r = callback(sort_vector_back(logs), userdata);
                        if (r != 0)
                                return r;

diff --git a/src/tests/fdi_logger.c b/src/tests/fdi_logger.c
index d84d9f6..c8ad86c 100644 (file)
--- a/src/tests/fdi_logger.c
+++ b/src/tests/fdi_logger.c
@@ -180,7 +180,7 @@ int main()
        assert(2019 == sz);
 
        expected_ioctl = -1;
-       assert(!ops_logger.prepare_print(&fdi, DUMP_CONTINUOUS, (log_filter *) 0xCA5CADE));
+       assert(!ops_logger.prepare_print(&fdi, DLOGUTIL_MODE_CONTINUOUS, (log_filter *) 0xCA5CADE));
 
        expected_ioctl = LOGGER_GET_LOG_LEN;
        ioctl_ret = -67;

diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 4e84a23..03d2c8d 100644 (file)
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -121,7 +121,7 @@ int main()
        sort_vector_init(&sv);
        sv.sort_by = SORT_SENT_MONO;
        sv.timeout = 60;
-       sv.dump = DUMP_CONTINUOUS;
+       sv.dump = DLOGUTIL_MODE_CONTINUOUS;
        sv.size = DEFAULT_SORT_BUFFER_SIZE;
        sort_vector_finalize(&sv);
        assert(sort_vector_time_span(&sv) == 0);