[uclibc-ng-devel] Re: [PATCH 1/2] Add support for using time64 on big-endian machines.

On Sat, Feb 24, 2024 at 10:22 AM Dmitry Chestnykh <dm.chestnykh(a)gmail.com> wrote: (__ts)->tv_sec, .tv_nsec = (__ts)->tv_nsec}) This doesn't look like a reserved name, so I'm not sure you can use this name in the time.h. Also I think that checking whether __ts is NULL is better done inside this macro. (__its)->it_interval.tv_sec, \ = (__its)->it_interval.tv_nsec, \ (__its)->it_value.tv_sec, \ (__its)->it_value.tv_nsec}) Same here. > +#endif > /* We can use a simple forward declaration. */ > struct sigevent; > > diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c > index eb0983698..ea623878a 100644 > --- a/libc/inet/socketcalls.c > +++ b/libc/inet/socketcalls.c > @@ -273,7 +273,7 @@ static ssize_t __NC(recvmmsg)(int sockfd, struct mmsghdr *msg, size_t vlen, vlen, flags, tmo); vlen, flags, tmo ? TO_TS64_P(tmo) : 0); flags, tmo); nsops) size_t, nsops, const struct timespec *, timeout) struct timespec *timeout) timeout ? TO_TS64_P(timeout) : 0); > +} > #elif defined(__NR_semtimedop) > _syscall4(int, semtimedop, int, semid, struct sembuf *, sops, size_t, nsops, const struct timespec *, timeout) && defined(__NR_rt_sigtimedwait_time64))) && \ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c (defined(__NR_rt_sigtimedwait_time64) && defined(__UCLIBC_USE_TIME64__)) *info, defined(__NR_rt_sigtimedwait_time64) __SYSCALL_SIGSET_T_SIZE); *info, defined(__NR_rt_sigtimedwait_time64) __SYSCALL_SIGSET_T_SIZE); b/libc/sysdeps/linux/common/__rt_sigwaitinfo.c defined(__NR_rt_sigtimedwait_time64)) b/libc/sysdeps/linux/common/alarm.c b/libc/sysdeps/linux/common/clock_getres.c timespec*, res) &__ts64); > + if (__ret == 0 && res) { > + res->tv_sec = __ts64.tv_sec; > + res->tv_nsec = __ts64.tv_nsec; > + }; > + return __ret; > +} > #elif defined(__NR_clock_getres) > _syscall2(int, clock_getres, clockid_t, clock_id, struct timespec*, res) > #else > diff --git a/libc/sysdeps/linux/common/clock_gettime.c b/libc/sysdeps/linux/common/clock_gettime.c tp) &__ts64); > + if (tp) { > + tp->tv_sec = __ts64.tv_sec; > + tp->tv_nsec = __ts64.tv_nsec; > + } > + return __ret; > +} > #elif defined(__NR_clock_gettime) > _syscall2(int, clock_gettime, clockid_t, clock_id, struct timespec*, tp) > #else > diff --git a/libc/sysdeps/linux/common/clock_settime.c b/libc/sysdeps/linux/common/clock_settime.c timespec*, tp) TO_TS64_P(tp) : 0); timespec*, tp) b/libc/sysdeps/linux/common/ppoll.c struct timespec *timeout, sigmask, __SYSCALL_SIGSET_T_SIZE); TO_TS64_P(timeout) : 0, sigmask, __SYSCALL_SIGSET_T_SIZE); __SYSCALL_SIGSET_T_SIZE); b/libc/sysdeps/linux/common/pselect.c fd_set *writefds, writefds, exceptfds, timeout, sigmask); writefds, exceptfds, timeout ? TO_TS64_P(timeout) : 0, sigmask); exceptfds, timeout, sigmask); b/libc/sysdeps/linux/common/select.c *exceptfds, exceptfds, timeout); *writefds, fd_set *exceptfds, exceptfds, ts ? TO_TS64_P(ts) : 0, 0); exceptfds, ts, 0); exceptfds, ts); b/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/timerfd.c flags) itimerspec *, utmr, struct itimerspec *, otmr) struct itimerspec *otmr) TO_ITS64_P(utmr) : 0, otmr); itimerspec *, utmr, struct itimerspec *, otmr) b/libc/sysdeps/linux/common/utimensat.c struct timespec *, times, int, flags) int flags) > +{ > + struct __ts64_struct __times64[2] = { > + { > + .tv_sec = times ? times[0].tv_sec : 0, > + .tv_nsec = times ? times[0].tv_nsec : 0 > + }, > + { > + .tv_sec = times ? times[1].tv_sec : 0, > + .tv_nsec = times ? times[1].tv_nsec : 0 > + } > + }; > + return INLINE_SYSCALL(utimensat_time64, 4, fd, path, times ? &__times64 : 0, flags); timespec *, times, int, flags) b/libpthread/nptl/pthread_mutex_timedlock.c &mutex->__data.__lock, &mutex->__data.__lock, b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c *abstime) timespec *abstime) -ETIMEDOUT) -ETIMEDOUT) Not needed, right? b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.h > index e72fe5234..909b0aad3 100644 > --- a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.h > +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.h > @@ -71,8 +71,31 @@ > # endif > #endif > > +#if defined(__UCLIBC_USE_TIME64__) && defined(__NR_futex_time64) > #define lll_futex_wait(futexp, val, private) \ > - lll_futex_timed_wait(futexp, val, NULL, private) > + ({ \ \ \ \ \ \ > + }) > +#else > +#define lll_futex_wait(futexp, val, private) \ > + ({ \ \ \ \ \ \ > + }) > +#endif > > #if defined(__UCLIBC_USE_TIME64__) && defined(__NR_futex_time64) > > @@ -82,7 +105,7 @@ > long int __ret; \ \ \ \ \ This is missing the 'timespec is non-NULL' check. Which should be inside the macro anyway. \ a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c timespec *abstime, oldval)) Please don't do random formatting changes. b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c Please don't do random formatting changes. struct timespec *req, defined(__NR_clock_nanosleep_time64) flags, req, rem); flags, req ? TO_TS64_P(req) : 0, rem); req, rem); struct timespec *req, defined(__NR_clock_nanosleep_time64) flags, req, rem); flags, req ? TO_TS64_P(req): 0, rem); req, defined(__NR_mq_timedreceive_time64) msg_len, unsigned int *restrict msq_prio, const struct timespec *restrict abs_timeout) msg_len, msq_prio, abs_timeout ? TO_TS64_P(abs_timeout) : 0); *__restrict, msg_ptr, size_t, msg_len, unsigned int *__restrict, msq_prio, const struct timespec *__restrict, abs_timeout) *__restrict msg_ptr, size_t msq_len, unsigned int *__restrict msq_prio, const struct timespec *__restrict abs_timeout), unsigned int msq_prio, const struct timespec *abs_timeout) msg_len, msq_prio, abs_timeout ? TO_TS64_P(abs_timeout) : 0); size_t, msg_len, unsigned int, msq_prio, const struct timespec *, abs_timeout) size_t, msg_len, unsigned int, msq_prio, const struct timespec *, abs_timeout) *msg_ptr, size_t msq_len, unsigned int msq_prio, const struct timespec *abs_timeout), *value, struct itimerspec *ovalue) > +{ > + struct timer *kt = (struct timer *)timerid; > + return INLINE_SYSCALL(timer_settime64, 4, kt->ktimerid, flags, value ? TO_ITS64_P(value) : 0, ovalue); kernel_timer_t, ktimerid, struct itimerspec *value, -- Thanks. -- Max