mirror of
https://github.com/apache/nuttx.git
synced 2026-08-26 20:00:42 +00:00
9ff99c6d0f
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 and
consistent with the previous sclock_t/time_t cleanup.
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 across arch/, drivers/,
fs/, sched/ and libs/. The prior code was a mix of
"%d"/"%u"/"%ld"/"%lu"/"%lld"/PRIu32/PRIu64 with matching
(int)/(unsigned long)/(long long)/PRIu* 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)
Add #include <stdint.h> where required.
* Drops a few stale `(FAR const time_t *)&ts.tv_sec` casts and
related `(FAR struct tm *)` / `(const time_t *)` casts in
gmtime_r() / localtime_r() / gmtime() callers; ts.tv_sec is plain
time_t now and the casts only obscured the type.
* Fixes one overflow in fs/procfs/fs_procfscritmon.c where
all_time.tv_sec * 1000000 could overflow on 32-bit time_t before
being multiplied again; cast to uint64_t at the start.
No behavioural change.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
97 lines
2.8 KiB
C
97 lines
2.8 KiB
C
/****************************************************************************
|
|
* sched/clock/clock_getres.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 <stdint.h>
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <nuttx/debug.h>
|
|
|
|
#include <nuttx/clock.h>
|
|
#include <nuttx/fs/fs.h>
|
|
#include <nuttx/timers/ptp_clock.h>
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: clock_getres
|
|
*
|
|
* Description:
|
|
* Clock Functions based on POSIX APIs
|
|
*
|
|
****************************************************************************/
|
|
|
|
int clock_getres(clockid_t clock_id, struct timespec *res)
|
|
{
|
|
clockid_t clock_type = clock_id & CLOCK_MASK;
|
|
int ret = OK;
|
|
|
|
sinfo("clock_id=%d, clock_type=%d\n", clock_id, clock_type);
|
|
|
|
switch (clock_type)
|
|
{
|
|
default:
|
|
serr("Returning ERROR\n");
|
|
set_errno(EINVAL);
|
|
ret = ERROR;
|
|
break;
|
|
|
|
case CLOCK_MONOTONIC:
|
|
case CLOCK_BOOTTIME:
|
|
case CLOCK_REALTIME:
|
|
case CLOCK_PROCESS_CPUTIME_ID:
|
|
case CLOCK_THREAD_CPUTIME_ID:
|
|
|
|
/* Form the timspec using clock resolution in nanoseconds */
|
|
|
|
res->tv_sec = 0;
|
|
res->tv_nsec = NSEC_PER_TICK;
|
|
|
|
sinfo("Returning res=(%jd,%ld)\n",
|
|
(intmax_t)res->tv_sec, res->tv_nsec);
|
|
break;
|
|
|
|
#ifdef CONFIG_PTP_CLOCK
|
|
case CLOCK_FD:
|
|
{
|
|
FAR struct file *filep;
|
|
|
|
ret = ptp_clockid_to_filep(clock_id, &filep);
|
|
if (ret < 0)
|
|
{
|
|
return ret;
|
|
}
|
|
|
|
ret = file_ioctl(filep, PTP_CLOCK_GETRES, res);
|
|
fs_putfilep(filep);
|
|
}
|
|
break;
|
|
#endif
|
|
}
|
|
|
|
return ret;
|
|
}
|