Browse Source

Add update_current_time() calls to periodic and event-driven callbacks

This is part of 26009, where we're going to keep track of the
current time and its jumps without having to do so in
second_elapsed_callback.
Nick Mathewson 6 years ago
parent
commit
83137275a7
3 changed files with 5 additions and 1 deletions
  1. 2 1
      src/or/connection.c
  2. 1 0
      src/or/main.c
  3. 2 0
      src/or/periodic.c

+ 2 - 1
src/or/connection.c

@@ -3439,7 +3439,7 @@ int
 connection_handle_read(connection_t *conn)
 {
   int res;
-
+  update_current_time(time(NULL));
   res = connection_handle_read_impl(conn);
   return res;
 }
@@ -3982,6 +3982,7 @@ int
 connection_handle_write(connection_t *conn, int force)
 {
     int res;
+    update_current_time(time(NULL));
     conn->in_connection_handle_write = 1;
     res = connection_handle_write_impl(conn, force);
     conn->in_connection_handle_write = 0;

+ 1 - 0
src/or/main.c

@@ -3047,6 +3047,7 @@ signal_callback(evutil_socket_t fd, short events, void *arg)
   (void)fd;
   (void)events;
 
+  update_current_time(time(NULL));
   process_signal(sig);
 }
 

+ 2 - 0
src/or/periodic.c

@@ -14,6 +14,7 @@
 #include "or.h"
 #include "compat_libevent.h"
 #include "config.h"
+#include "main.h"
 #include "periodic.h"
 
 /** We disable any interval greater than this number of seconds, on the
@@ -48,6 +49,7 @@ periodic_event_dispatch(mainloop_event_t *ev, void *data)
   }
 
   time_t now = time(NULL);
+  update_current_time(now);
   const or_options_t *options = get_options();
 //  log_debug(LD_GENERAL, "Dispatching %s", event->name);
   int r = event->fn(now, options);