Changeset 4562dd8 in rtems

Timestamp:

09/30/11 02:53:32 (12 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.11, 5, master

Children:

d44c86b

Parents:

f57f5ce2

Message:

2011-09-30 Ralf Corsépius <ralf.corsepius@…>

• psx01/init.c, psx07/init.c, psx09/init.c, psx12/init.c, psxclock/init.c, psxtimer01/psxtimer.c: Include "pritime.h". Use PRIdtime_t to print time_t.

Location:

testsuites/psxtests

Files:

• ChangeLog (modified) (1 diff)
• psx01/init.c (modified) (2 diffs)
• psx07/init.c (modified) (2 diffs)
• psx09/init.c (modified) (2 diffs)
• psx12/init.c (modified) (2 diffs)
• psxclock/init.c (modified) (4 diffs)
• psxtimer01/psxtimer.c (modified) (3 diffs)

testsuites/psxtests/ChangeLog

@@ +1 @@
+2011-09-30      Ralf Corsépius <ralf.corsepius@rtems.org>
+
+        * psx01/init.c, psx07/init.c, psx09/init.c, psx12/init.c,
+        psxclock/init.c, psxtimer01/psxtimer.c: Include "pritime.h".
+        Use PRIdtime_t to print time_t.
+
 2011-09-30      Ralf Corsépius <ralf.corsepius@rtems.org>
 

testsuites/psxtests/psx01/init.c

@@ -14 +14 @@
 #endif
 
+#include <sched.h>
+#include <sys/utsname.h>
+
 #define CONFIGURE_INIT
 #include "system.h"
-#include <sched.h>
-#include <sys/utsname.h>
+#include "pritime.h"
 
 void *POSIX_Init(
@@ -88 +90 @@
   status = sched_rr_get_interval( getpid(), &tr );
   printf(
-    "Init: Round Robin quantum is %ld seconds, %ld nanoseconds\n",
+    "Init: Round Robin quantum is %" PRIdtime_t " seconds, %ld nanoseconds\n",
     tr.tv_sec,
     tr.tv_nsec

testsuites/psxtests/psx07/init.c

@@ -33 +33 @@
 #include <errno.h>
 #include "tmacros.h"
+#include "pritime.h"
 
 void print_schedparam(
@@ -48 +49 @@
   printf( "%ssched_ss_low_priority     = %d\n",
      prefix, schedparam->sched_ss_low_priority );
-  printf( "%ssched_ss_replenish_period = (%ld, %ld)\n", prefix,
+  printf( "%ssched_ss_replenish_period = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_repl_period.tv_sec,
      schedparam->sched_ss_repl_period.tv_nsec );
-  printf( "%ssched_sched_ss_initial_budget = (%ld, %ld)\n", prefix,
+  printf( "%ssched_sched_ss_initial_budget = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_init_budget.tv_sec,
      schedparam->sched_ss_init_budget.tv_nsec );

testsuites/psxtests/psx09/init.c

@@ -19 +19 @@
 #include "system.h"
 #include <errno.h>
+#include "pritime.h"
 
 void print_schedparam(
@@ -38 +39 @@
   printf( "%ssched_ss_low_priority     = %d\n",
       prefix, schedparam->sched_ss_low_priority );
-  printf( "%ssched_ss_repl_period = (%ld, %ld)\n", prefix,
+  printf( "%ssched_ss_repl_period = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_repl_period.tv_sec,
      schedparam->sched_ss_repl_period.tv_nsec );
-  printf( "%ssched_ss_init_budget = (%ld, %ld)\n", prefix,
+  printf( "%ssched_ss_init_budget = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_init_budget.tv_sec,
      schedparam->sched_ss_init_budget.tv_nsec );

testsuites/psxtests/psx12/init.c

@@ -19 +19 @@
 #include "system.h"
 #include <errno.h>
+#include "pritime.h"
 
 void print_schedparam(
@@ -34 +35 @@
   printf( "%ssched_ss_low_priority     = %d\n",
      prefix, schedparam->sched_ss_low_priority );
-  printf( "%ssched_ss_repl_period = (%ld, %ld)\n", prefix,
+  printf( "%ssched_ss_repl_period = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_repl_period.tv_sec,
      schedparam->sched_ss_repl_period.tv_nsec );
-  printf( "%ssched_ss_init_budget = (%ld, %ld)\n", prefix,
+  printf( "%ssched_ss_init_budget = (%" PRIdtime_t ", %ld)\n", prefix,
      schedparam->sched_ss_init_budget.tv_sec,
      schedparam->sched_ss_init_budget.tv_nsec );

testsuites/psxtests/psxclock/init.c

@@ -14 +14 @@
 #endif
 
-#include <pmacros.h>
 #include <time.h>
 #include <errno.h>
+
+#include "pmacros.h"
+#include "pritime.h"
 
 void check_enosys(int status);
@@ -85 +87 @@
   puts( "Init: clock_getres - SUCCESSFUL" );
   sc = clock_getres( CLOCK_REALTIME, &tv );
-  printf( "Init: resolution = sec (%ld), nsec (%ld)\n", tv.tv_sec, tv.tv_nsec );
+  printf( "Init: resolution = sec (%" PRIdtime_t "), nsec (%ld)\n", tv.tv_sec, tv.tv_nsec );
   rtems_test_assert( !sc );
 
@@ -115 +117 @@
   sc = clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &tv );
   rtems_test_assert( !sc );
-  printf("Time since boot: (%" PRItime_t ", %ld)\n", tv.tv_sec,tv.tv_nsec );
+  printf("Time since boot: (%" PRIdtime_t ", %ld)\n", tv.tv_sec,tv.tv_nsec );
 
   sc = clock_gettime( CLOCK_REALTIME, &tv );
@@ -208 +210 @@
   /* check the time remaining */
 
-  printf( "Init: sec (%ld), nsec (%ld) remaining\n", tr.tv_sec, tr.tv_nsec );
+  printf( "Init: sec (%" PRIdtime_t "), nsec (%ld) remaining\n", tr.tv_sec, tr.tv_nsec );
   rtems_test_assert( !tr.tv_sec && !tr.tv_nsec );
 

testsuites/psxtests/psxtimer01/psxtimer.c

@@ -36 +36 @@
 #include <stdio.h>    /* console facilities */
 #include <rtems/score/timespec.h>
+#include "pritime.h"
 
 void StopTimer(
@@ -126 +127 @@
    }
    printf(
-    "task A: timer_settime - value=%" PRItime_t ":%ld interval=%" PRItime_t ":%ld\n",
+    "task A: timer_settime - value=%" PRIdtime_t ":%ld interval=%" PRIdtime_t ":%ld\n",
     timergetdata.it_value.tv_sec, timergetdata.it_value.tv_nsec,
     timergetdata.it_interval.tv_sec, timergetdata.it_interval.tv_nsec
@@ -312 +313 @@
        }
        printf(
-         "task C: timer_gettime - %" PRItime_t ":%ld remaining from %" PRItime_t ":%ld\n",
+         "task C: timer_gettime - %" PRIdtime_t ":%ld remaining from %" PRIdtime_t ":%ld\n",
          timergetdata.it_value.tv_sec, timergetdata.it_value.tv_nsec,
          timergetdata.it_interval.tv_sec, timergetdata.it_interval.tv_nsec