lib: event - Rename tv_created as tv_created_ioloop

diff --git a/src/lib-master/stats-client.c b/src/lib-master/stats-client.c
index 4155947a7fb261e86e57af21b453d5bde02ba090..6cea2313c247402ec3ed06fc13d9dad0b3263f88 100644 (file)
--- a/src/lib-master/stats-client.c
+++ b/src/lib-master/stats-client.c
@@ -167,7 +167,7 @@ static struct event *stats_event_get_merged(struct event *event)
 
        for (p = event->parent;
             p != NULL && !p->id_sent_to_stats &&
-                    timeval_cmp(&p->tv_created, &res->tv_created) == 0;
+                    timeval_cmp(&p->tv_created_ioloop, &res->tv_created_ioloop) == 0;
             p = p->parent) {
                // Merge all parents with the same timestamp into result.
                if (!event_has_all_categories(res, p) ||

diff --git a/src/lib/lib-event-private.h b/src/lib/lib-event-private.h
index 9a5ab9702a1cc9eab02e6356db025247e9ea9dc5..663391ec01888f4817bd1c0b84cd70be0da97285 100644 (file)
--- a/src/lib/lib-event-private.h
+++ b/src/lib/lib-event-private.h
@@ -23,7 +23,7 @@ struct event {
        bool call_free:1;
 
 /* Fields that are exported & imported: */
-       struct timeval tv_created;
+       struct timeval tv_created_ioloop;
        struct timeval tv_last_sent;
 
        const char *source_filename;

diff --git a/src/lib/lib-event.c b/src/lib/lib-event.c
index fe6fdf246cac075f50dfcf5e66f5c260a79a1e48..1971f2921ced6090fc62a23e084561640761adb5 100644 (file)
--- a/src/lib/lib-event.c
+++ b/src/lib/lib-event.c
@@ -127,7 +127,7 @@ struct event *event_create(struct event *parent, const char *source_filename,
        event->refcount = 1;
        event->id = ++event_id_counter;
        event->pool = pool;
-       event->tv_created = ioloop_timeval;
+       event->tv_created_ioloop = ioloop_timeval;
        event->source_filename = source_filename;
        event->source_linenum = source_linenum;
        if (parent != NULL) {
@@ -154,7 +154,7 @@ event_create_passthrough(struct event *parent, const char *source_filename,
                event->passthrough = TRUE;
                /* This event only intends to extend the parent event.
                   Use the parent's creation timestamp. */
-               event->tv_created = parent->tv_created;
+               event->tv_created_ioloop = parent->tv_created_ioloop;
                event_last_passthrough = &event->event_passthrough;
        } else {
                event_last_passthrough = &parent->event_passthrough;
@@ -541,7 +541,7 @@ struct event *event_get_parent(struct event *event)
 
 void event_get_create_time(struct event *event, struct timeval *tv_r)
 {
-       *tv_r = event->tv_created;
+       *tv_r = event->tv_created_ioloop;
 }
 
 bool event_get_last_send_time(struct event *event, struct timeval *tv_r)
@@ -630,8 +630,8 @@ void event_export(const struct event *event, string_t *dest)
 {
        /* required fields: */
        str_printfa(dest, "%"PRIdTIME_T"\t%u",
-                   event->tv_created.tv_sec,
-                   (unsigned int)event->tv_created.tv_usec);
+                   event->tv_created_ioloop.tv_sec,
+                   (unsigned int)event->tv_created_ioloop.tv_usec);
 
        /* optional fields: */
        if (event->source_filename != NULL) {
@@ -711,8 +711,8 @@ bool event_import_unescaped(struct event *event, const char *const *args,
                *error_r = "Missing required fields";
                return FALSE;
        }
-       if (!event_import_tv(args[0], args[1], &event->tv_created, &error)) {
-               *error_r = t_strdup_printf("Invalid tv_created: %s", error);
+       if (!event_import_tv(args[0], args[1], &event->tv_created_ioloop, &error)) {
+               *error_r = t_strdup_printf("Invalid tv_created_ioloop: %s", error);
                return FALSE;
        }
        args += 2;