diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-24 11:43:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 11:43:32 -0500 |
| commit | ac9ddce37d16af4e36c1ff945c12aaaf615e69d8 (patch) | |
| tree | 4987937426f56c881cb2a83e607924c0103ab3b4 /zebra/zebra_fpm.c | |
| parent | e5951aa21dda9f8c9e87a8b892ae42a531e4e9f4 (diff) | |
| parent | 39cea8220a9bcc51d97a7832760591e117cdde7a (diff) | |
Merge pull request #104 from opensourcerouting/time-cleanup
Time cleanup
Diffstat (limited to 'zebra/zebra_fpm.c')
| -rw-r--r-- | zebra/zebra_fpm.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index d91cda9fb0..afa557096c 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -297,20 +297,6 @@ zfpm_state_to_str (zfpm_state_t state) } /* - * zfpm_get_time - */ -static time_t -zfpm_get_time (void) -{ - struct timeval tv; - - if (quagga_gettime (QUAGGA_CLK_MONOTONIC, &tv) < 0) - zlog_warn ("FPM: quagga_gettime failed!!"); - - return tv.tv_sec; -} - -/* * zfpm_get_elapsed_time * * Returns the time elapsed (in seconds) since the given time. @@ -320,7 +306,7 @@ zfpm_get_elapsed_time (time_t reference) { time_t now; - now = zfpm_get_time (); + now = monotime(NULL); if (now < reference) { @@ -1179,7 +1165,7 @@ zfpm_connect_cb (struct thread *t) */ zfpm_g->connect_calls++; zfpm_g->stats.connect_calls++; - zfpm_g->last_connect_call_time = zfpm_get_time (); + zfpm_g->last_connect_call_time = monotime(NULL); ret = connect (sock, (struct sockaddr *) &serv, sizeof (serv)); if (ret >= 0) @@ -1533,7 +1519,7 @@ zfpm_clear_stats (struct vty *vty) zfpm_stop_stats_timer (); zfpm_start_stats_timer (); - zfpm_g->last_stats_clear_time = zfpm_get_time(); + zfpm_g->last_stats_clear_time = monotime(NULL); vty_out (vty, "Cleared FPM stats%s", VTY_NEWLINE); } |