summaryrefslogtreecommitdiffstats
path: root/src/plugins/mactime
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-03-11 10:31:36 -0400
committerFlorin Coras <florin.coras@gmail.com>2020-03-12 20:55:17 +0000
commit197180031bad1e51ee032d30d8a095a51207454c (patch)
tree2ae3e81dfa609b6d532c902e13ecb82c73e72143 /src/plugins/mactime
parent7a91b0e264d1dfd911eec18a265ead2ab8a9ad82 (diff)
vppinfra: refactor clib_timebase_t
Add a clib_time_t * argument to clib_timebase_init(...), to encourage client code to share the vlib_main_t's clib_time_t object. Display the current day / date in GMT via the "show time" debug CLI. Fix the test framework so it processes the new "show time" output format. Type: refactor Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I5e52d57eb164b7cdb6355362d520df6928491711
Diffstat (limited to 'src/plugins/mactime')
-rw-r--r--src/plugins/mactime/mactime.c3
-rw-r--r--src/plugins/mactime/mactime_top.c3
-rw-r--r--src/plugins/mactime/test/test_mactime.py4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c
index e7dcb0389cc..bcd40b4c9e6 100644
--- a/src/plugins/mactime/mactime.c
+++ b/src/plugins/mactime/mactime.c
@@ -50,7 +50,8 @@ feature_init (mactime_main_t * mm)
mm->lookup_table_num_buckets,
mm->lookup_table_memory_size);
clib_timebase_init (&mm->timebase, mm->timezone_offset,
- CLIB_TIMEBASE_DAYLIGHT_USA);
+ CLIB_TIMEBASE_DAYLIGHT_USA,
+ &(mm->vlib_main->clib_time));
mm->allow_counters.name = "allow";
mm->allow_counters.stat_segment_name = "/mactime/allow";
mm->drop_counters.name = "drop";
diff --git a/src/plugins/mactime/mactime_top.c b/src/plugins/mactime/mactime_top.c
index 48735a2e816..ee60535e0c2 100644
--- a/src/plugins/mactime/mactime_top.c
+++ b/src/plugins/mactime/mactime_top.c
@@ -480,7 +480,8 @@ main (int argc, char **argv)
clib_time_init (&mm->clib_time);
mm->timezone_offset = -5.0;
clib_timebase_init (&mm->timebase, mm->timezone_offset,
- CLIB_TIMEBASE_DAYLIGHT_USA);
+ CLIB_TIMEBASE_DAYLIGHT_USA,
+ 0 /* allocate a clib_time_t */ );
vec_add1 (mm->pattern1, (u8 *) "^/mactime/allow");
vec_add1 (mm->pattern2, (u8 *) "^/mactime/drop");
diff --git a/src/plugins/mactime/test/test_mactime.py b/src/plugins/mactime/test/test_mactime.py
index fa9516cbe87..85ded33d158 100644
--- a/src/plugins/mactime/test/test_mactime.py
+++ b/src/plugins/mactime/test/test_mactime.py
@@ -2,7 +2,7 @@
import unittest
-from framework import VppTestCase, VppTestRunner, running_extended_tests
+from framework import VppTestCase, VppTestRunner, running_gcov_tests
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
@@ -31,7 +31,7 @@ class TestMactime(VppTestCase):
self.logger.critical(error)
self.assertNotIn('FAILED', error)
- @unittest.skipUnless(running_extended_tests, "part of extended tests")
+ @unittest.skipUnless(running_gcov_tests, "part of code coverage tests")
def test_mactime_unittest(self):
""" Mactime Plugin Code Coverage Test """
cmds = ["loopback create",