[v16,08/16] tests: ptimer: Add tests for "continuous trigger" policy

Commit Message

Dmitry Osipenko Sept. 7, 2016, 1:22 p.m. UTC

PTIMER_POLICY_CONTINUOUS_TRIGGER makes periodic ptimer to re-trigger every
period in case of load = delta = 0.

Signed-off-by: Dmitry Osipenko <[e-mail]>
---
 include/hw/ptimer.h |  4 ++--
 tests/ptimer-test.c | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

Patch

diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index 4c9c700..e2f4c55 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -38,8 +38,8 @@ 
  * around.  */
 #define PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD (1 << 0)
 
-/* Periodic timer that has load = 0 would continuously re-trigger every
- * period.  */
+/* Running periodic timer that has counter = limit = 0 would continuously
+ * re-trigger every period.  */
 #define PTIMER_POLICY_CONTINUOUS_TRIGGER    (1 << 1)
 
 /* ptimer.c */
diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c
index 5b0d75b..30a2ae1 100644
--- a/tests/ptimer-test.c
+++ b/tests/ptimer-test.c
@@ -450,6 +450,7 @@  static void check_periodic_with_load_0(gconstpointer arg)
     const uint8_t *policy = arg;
     QEMUBH *bh = qemu_bh_new(ptimer_trigger, NULL);
     ptimer_state *ptimer = ptimer_init(bh, *policy);
+    bool continuous_trigger = (*policy & PTIMER_POLICY_CONTINUOUS_TRIGGER);
 
     triggered = false;
 
@@ -464,7 +465,12 @@  static void check_periodic_with_load_0(gconstpointer arg)
     qemu_clock_step(2000000 + 100000);
 
     g_assert_cmpuint(ptimer_get_count(ptimer), ==, 0);
-    g_assert_false(triggered);
+
+    if (continuous_trigger) {
+        g_assert_true(triggered);
+    } else {
+        g_assert_false(triggered);
+    }
 
     ptimer_stop(ptimer);
 }
@@ -512,6 +518,10 @@  static void add_ptimer_tests(uint8_t policy)
         g_strlcat(policy_name, "wrap_after_one_period,", 256);
     }
 
+    if (policy & PTIMER_POLICY_CONTINUOUS_TRIGGER) {
+        g_strlcat(policy_name, "continuous_trigger,", 256);
+    }
+
     qtest_add_data_func(
         g_strdup_printf("/ptimer/set_count policy=%s", policy_name),
         ppolicy, check_set_count);
@@ -559,7 +569,7 @@  static void add_ptimer_tests(uint8_t policy)
 
 static void add_all_ptimer_policies_comb_tests(void)
 {
-    int last_policy = PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD;
+    int last_policy = PTIMER_POLICY_CONTINUOUS_TRIGGER;
     int policy = PTIMER_POLICY_DEFAULT;
 
     for (; policy < (last_policy << 1); policy++) {