summaryrefslogtreecommitdiff
path: root/conf/confbase.Y
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2017-06-06 16:47:30 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-12-07 13:49:27 +0100
commitf047271cb963c62663687d63b2f7cf8dd5edfbb7 (patch)
treecec19ec5f00167aabc3a5233cef5bc6c5e384526 /conf/confbase.Y
parent025525266f6861437ca54aca2a86eb505a486baf (diff)
Timers: Parse and format functions for microsecond times
Date/time output (e.g. in logs, show commands) can use %f to specify subsecond time. By default, millisecond precision is used in output.
Diffstat (limited to 'conf/confbase.Y')
-rw-r--r--conf/confbase.Y12
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 901ca2b2..390041c4 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -14,7 +14,7 @@ CF_HDR
#include "conf/conf.h"
#include "lib/resource.h"
#include "lib/socket.h"
-#include "sysdep/unix/timer.h"
+#include "lib/timer.h"
#include "lib/string.h"
#include "nest/protocol.h"
#include "nest/iface.h"
@@ -60,7 +60,7 @@ CF_DECLS
struct lsadb_show_data *ld;
struct iface *iface;
void *g;
- bird_clock_t time;
+ btime time;
struct f_prefix px;
struct proto_spec ps;
struct channel_limit cl;
@@ -81,7 +81,7 @@ CF_DECLS
%type <i> expr bool pxlen4
%type <i32> expr_us
-%type <time> datetime
+%type <time> time
%type <a> ipa
%type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
%type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_
@@ -308,11 +308,11 @@ label_stack:
}
;
-datetime:
+time:
TEXT {
- $$ = tm_parse_datetime($1);
+ $$ = tm_parse_time($1);
if (!$$)
- cf_error("Invalid date and time");
+ cf_error("Invalid date/time");
}
;