mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-02 04:39:01 +00:00
f9f59bd0f8
Now that time_t is unconditionally 64-bit (signed int64_t) and the
struct timespec fields tv_sec / tv_nsec are wide enough on their own,
the explicit (uint64_t)/(int64_t)/(int) casts that used to guard the
multiplications and subtractions in *_us / *_ms / *_ns helpers are no
longer needed. Drop them to keep the timekeeping math readable.
In the same spirit, this commit also normalises the printf-style format
specifiers and casts used to print tv_sec / tv_nsec / tv_usec values.
The prior code was a mix of "%d"/"%u"/"%ld"/"%lu"/"%lld" with matching
(int)/(unsigned long)/(long long) casts; some formats truncated time_t
on 32-bit hosts, others mismatched signedness or width. Replace all
such cases with the portable POSIX-recommended forms:
- tv_sec (time_t, signed, impl-defined width) -> %jd + (intmax_t)
- tv_nsec (long, signed) -> %ld (no cast)
- tv_usec (suseconds_t / long) -> %ld (no cast)
Also drop two stale `(FAR const time_t *)&ts.tv_sec` casts that are
unnecessary now that ts.tv_sec is plain time_t.
Arithmetic-cleanup files (existing scope):
- benchmarks/cyclictest/cyclictest.c: timediff_us()
- benchmarks/sd_bench/sd_bench_main.c: get_time_delta_us()
- examples/oneshot/oneshot_main.c: maxus computation
- examples/watchdog/watchdog_main.c: current_time_ms (x2)
- industry/nxmodbus/nxmb_internal.h: nxmb_util_clock_ms()
- netutils/ntpclient/ntpclient.c: timespec2ntp()
- netutils/ptpd/ptpd.c: ptp_adjtime()
- system/dd/dd_main.c: elapsed accounting
- testing/drivers/drivertest/drivertest_posix_timer.c:
get_timestamp()
- testing/drivers/sd_stress/sd_stress_main.c:get_time_delta()
- testing/sched/getprime/getprime_main.c: elapsed accounting
- testing/sched/pthread_mutex_perf/pthread_mutex_perf.c:
timespec_avg()
Printf-format-fix files (new in this revision):
- examples/adjtime/adjtime_main.c
- examples/charger/charger_main.c
- examples/netpkt/netpkt_ethercat.c
- fsutils/mkfatfs/mkfatfs.c
- graphics/tiff/tiff_initialize.c
- netutils/ptpd/ptpd.c
- nshlib/nsh_timcmds.c
- system/coredump/coredump.c
- system/ptpd/ptpd_main.c
- testing/drivers/drivertest/drivertest_oneshot.c
- testing/mm/kasantest/kasantest.c
- testing/ostest/semtimed.c
- testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
- testing/sched/timerjitter/timerjitter.c
- testing/testsuites/kernel/time/cases/clock_test_clock01.c
- testing/testsuites/kernel/time/cases/clock_test_smoke.c
No behavioural change.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
98 lines
3.1 KiB
C
98 lines
3.1 KiB
C
/****************************************************************************
|
|
* apps/testing/testsuites/kernel/time/cases/clock_test_clock01.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
#include <nuttx/config.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <syslog.h>
|
|
#include <inttypes.h>
|
|
#include <stdint.h>
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
#include <setjmp.h>
|
|
#include <cmocka.h>
|
|
#include "TimeTest.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: test_nuttx_clock_test_clock01
|
|
****************************************************************************/
|
|
|
|
void test_nuttx_clock_test_clock01(FAR void **state)
|
|
{
|
|
clockid_t clk = CLOCK_REALTIME;
|
|
struct timespec res;
|
|
struct timespec tp;
|
|
struct timespec oldtp;
|
|
int ret;
|
|
int passflag = 0;
|
|
|
|
/* get clock resolution */
|
|
|
|
ret = clock_getres(clk, &res);
|
|
assert_int_equal(ret, 0);
|
|
|
|
/* get current real time */
|
|
|
|
ret = clock_gettime(clk, &oldtp);
|
|
syslog(LOG_INFO, "The current real time: sec is %jd, nsec is %ld\n",
|
|
(intmax_t)oldtp.tv_sec, oldtp.tv_nsec);
|
|
assert_int_equal(ret, 0);
|
|
|
|
syslog(LOG_INFO, "sleep 2 seconds\n");
|
|
sleep(2);
|
|
|
|
/* 2, use for testing clock setting */
|
|
|
|
tp.tv_sec = oldtp.tv_sec + 2;
|
|
tp.tv_nsec = oldtp.tv_nsec;
|
|
|
|
/* set real time */
|
|
|
|
ret = clock_settime(clk, &tp);
|
|
syslog(LOG_INFO, "Setting time: sec is %jd, nsec is %ld\n",
|
|
(intmax_t)tp.tv_sec, tp.tv_nsec);
|
|
assert_int_equal(ret, 0);
|
|
|
|
syslog(LOG_INFO, "get real time clock again\n");
|
|
|
|
/* get current real time again */
|
|
|
|
ret = clock_gettime(clk, &tp);
|
|
syslog(LOG_INFO,
|
|
"Obtaining the current time after setting: sec = %jd, nsec = "
|
|
"%ld\n",
|
|
(intmax_t)tp.tv_sec, tp.tv_nsec);
|
|
passflag = (tp.tv_sec >= 2 + oldtp.tv_sec) &&
|
|
(tp.tv_sec <=
|
|
2 + oldtp.tv_sec + 1); /* 2, use for testing clock setting */
|
|
|
|
assert_int_equal(ret, 0);
|
|
assert_int_equal(passflag, 1);
|
|
}
|