Changeset 661e0e63 in rtems

Timestamp:

06/15/16 09:18:10 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

57c676c6

Parents:

917884c

git-author:

Sebastian Huber <sebastian.huber@…> (06/15/16 09:18:10)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/15/16 09:21:04)

Message:

psxtests/psx12: Use and print proper rounded ms

Update #2738.

Location:

testsuites/psxtests/psx12

Files:

• init.c (modified) (7 diffs)
• psx12.scn (modified) (1 diff)

testsuites/psxtests/psx12/init.c

@@ -23 +23 @@
 const char rtems_test_name[] = "PSX 12";
 
-#define SS_REPL_PERIOD_US 200000
-
-#define SS_INIT_BUDGET_US 100000
+#define SS_REPL_PERIOD_NS 200000000
+
+#define SS_INIT_BUDGET_NS 100000000
+
+#define SS_REPL_PERIOD_MS ( SS_REPL_PERIOD_NS / 1000000 )
 
 #define SS_PRIO_LOW 1
@@ -36 +38 @@
   uint64_t start;
   struct {
-    uint64_t high;
-    uint64_t low;
+    uint32_t high;
+    uint32_t low;
   } samples[ SS_SAMPLE_PERIODS ];
 } test_context;
@@ -75 +77 @@
 }
 
-static uint64_t delta( test_context *ctx )
-{
-  return now() - ctx->start;
+static uint32_t delta_in_ms( test_context *ctx )
+{
+  uint32_t d;
+
+  d = (uint32_t) ( now() - ctx->start );
+  return ( d + 499 ) / 1000;
 }
 
@@ -89 +94 @@
   for ( i = 0 ; i < SS_SAMPLE_PERIODS ; ++i ) {
     wait_for_prio( SS_PRIO_LOW );
-    ctx->samples[ i ].high = delta( ctx );
+    ctx->samples[ i ].high = delta_in_ms( ctx );
     wait_for_prio( SS_PRIO_HIGH );
-    ctx->samples[ i ].low = delta( ctx );
+    ctx->samples[ i ].low = delta_in_ms( ctx );
   }
 
@@ -165 +170 @@
 
   schedparam.sched_ss_repl_period.tv_sec = 0;
-  schedparam.sched_ss_repl_period.tv_nsec = SS_REPL_PERIOD_US * 1000;
+  schedparam.sched_ss_repl_period.tv_nsec = SS_REPL_PERIOD_NS;
   schedparam.sched_ss_init_budget.tv_sec = 0;
-  schedparam.sched_ss_init_budget.tv_nsec = SS_INIT_BUDGET_US * 1000;
+  schedparam.sched_ss_init_budget.tv_nsec = SS_INIT_BUDGET_NS;
 
   schedparam.sched_priority = SS_PRIO_HIGH;
@@ -182 +187 @@
 
   schedparam.sched_ss_repl_period.tv_sec = 0;
-  schedparam.sched_ss_repl_period.tv_nsec = SS_REPL_PERIOD_US * 1000;
+  schedparam.sched_ss_repl_period.tv_nsec = SS_REPL_PERIOD_NS;
   schedparam.sched_ss_init_budget.tv_sec = 0;
-  schedparam.sched_ss_init_budget.tv_nsec = SS_INIT_BUDGET_US * 1000;
+  schedparam.sched_ss_init_budget.tv_nsec = SS_INIT_BUDGET_NS;
 
   schedparam.sched_priority = SS_PRIO_HIGH;
@@ -206 +211 @@
 
   for ( i = 0 ; i < SS_SAMPLE_PERIODS ; ++i ) {
-    printf( "[%zu] H %6" PRIu64 "us\n", i, ctx->samples[ i ].high );
-    printf( "[%zu] L %6" PRIu64 "us\n", i, ctx->samples[ i ].low );
-    rtems_test_assert( ctx->samples[ i ].low / SS_REPL_PERIOD_US == i + 1 );
+    printf( "[%zu] H %3" PRIu32 "ms\n", i, ctx->samples[ i ].high );
+    printf( "[%zu] L %3" PRIu32 "ms\n", i, ctx->samples[ i ].low );
+    rtems_test_assert( ctx->samples[ i ].low / SS_REPL_PERIOD_MS == i + 1 );
   }
 

testsuites/psxtests/psx12/psx12.scn

@@ -9 +9 @@
 Init: pthread_create - SUCCESSFUL
 Sporadic Server: exitting
-[0] H  99902us
-[0] L 200008us
-[1] H 289908us
-[1] L 400009us
-[2] H 489903us
-[2] L 600009us
+[0] H 100ms
+[0] L 200ms
+[1] H 290ms
+[1] L 400ms
+[2] H 490ms
+[2] L 600ms
 *** END OF TEST PSX 12 ***