lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

sysv/linux: Rename alpha functions to be alpha specific

Browse Source 
These functions are alpha specifc, rename them to be clear.

Let's also rename the header file from tv32-compat.h to
alpha-tv32-compat.h. This is to avoid conflicts with the one we will
introduce later.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Alistair Francis
2020-01-20 23:54:35 -08:00
parent e8a0f5831e
commit 4da2597af5
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sysdeps/unix/sysv/linux/alpha/tv32-compat.h → sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
View File

@ -70,13 +70,13 @@ struct rusage32
overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */ overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
static inline struct timeval static inline struct timeval
valid_timeval32_to_timeval (const struct timeval32 tv) alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
{ {
return (struct timeval) { tv.tv_sec, tv.tv_usec }; return (struct timeval) { tv.tv_sec, tv.tv_usec };
} }
static inline struct timeval32 static inline struct timeval32
valid_timeval_to_timeval32 (const struct timeval tv64) alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
{ {
if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX)) if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
return (struct timeval32) { INT32_MAX, TV_USEC_MAX}; return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
@ -84,27 +84,27 @@ valid_timeval_to_timeval32 (const struct timeval tv64)
} }
static inline struct timespec static inline struct timespec
valid_timeval32_to_timespec (const struct timeval32 tv) alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
{ {
return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 }; return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
} }
static inline struct timeval32 static inline struct timeval32
valid_timespec_to_timeval32 (const struct timespec ts) alpha_valid_timespec_to_timeval32 (const struct timespec ts)
{ {
return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 }; return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
} }
static inline void static inline void
rusage64_to_rusage32 (struct rusage32 *restrict r32, alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
const struct rusage *restrict r64) const struct rusage *restrict r64)
{ {
/* Make sure the entire output structure is cleared, including /* Make sure the entire output structure is cleared, including
padding and reserved fields. */ padding and reserved fields. */
memset (r32, 0, sizeof *r32); memset (r32, 0, sizeof *r32);
r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime); r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime); r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
r32->ru_maxrss = r64->ru_maxrss; r32->ru_maxrss = r64->ru_maxrss;
r32->ru_ixrss = r64->ru_ixrss; r32->ru_ixrss = r64->ru_ixrss;
r32->ru_idrss = r64->ru_idrss; r32->ru_idrss = r64->ru_idrss;
@ -121,4 +121,4 @@ rusage64_to_rusage32 (struct rusage32 *restrict r32,
r32->ru_nivcsw = r64->ru_nivcsw; r32->ru_nivcsw = r64->ru_nivcsw;
} }
#endif /* tv32-compat.h */ #endif /* alpha-tv32-compat.h */

10
sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
View File

@ -22,7 +22,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/timex.h> #include <sys/timex.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
struct timex32 { struct timex32 {
unsigned int modes; /* mode selector */ unsigned int modes; /* mode selector */
@ -57,13 +57,13 @@ int
attribute_compat_text_section attribute_compat_text_section
__adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv) __adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
{ {
struct timeval itv64 = valid_timeval32_to_timeval (*itv); struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
struct timeval otv64; struct timeval otv64;
if (__adjtime (&itv64, &otv64) == -1) if (__adjtime (&itv64, &otv64) == -1)
return -1; return -1;
*otv = valid_timeval_to_timeval32 (otv64); *otv = alpha_valid_timeval_to_timeval32 (otv64);
return 0; return 0;
} }
@ -91,7 +91,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx64.calcnt = tx->calcnt; tx64.calcnt = tx->calcnt;
tx64.errcnt = tx->errcnt; tx64.errcnt = tx->errcnt;
tx64.stbcnt = tx->stbcnt; tx64.stbcnt = tx->stbcnt;
tx64.time = valid_timeval32_to_timeval (tx->time); tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
int status = __adjtimex (&tx64); int status = __adjtimex (&tx64);
if (status < 0) if (status < 0)
@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt; tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt; tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt; tx->stbcnt = tx64.stbcnt;
tx->time = valid_timeval_to_timeval32 (tx64.time); tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
return status; return status;
} }

6
sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
View File

@ -21,7 +21,7 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h> #include <sys/time.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
int int
attribute_compat_text_section attribute_compat_text_section
@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */ /* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval curr_value->it_interval
= valid_timeval_to_timeval32 (curr_value_64.it_interval); = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
curr_value->it_value curr_value->it_value
= valid_timeval_to_timeval32 (curr_value_64.it_value); = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0; return 0;
} }

4
sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
View File

@ -22,7 +22,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
int int
__getrusage_tv32 (int who, struct rusage32 *usage32) __getrusage_tv32 (int who, struct rusage32 *usage32)
@ -31,7 +31,7 @@ __getrusage_tv32 (int who, struct rusage32 *usage32)
if (__getrusage (who, &usage64) == -1) if (__getrusage (who, &usage64) == -1)
return -1; return -1;
rusage64_to_rusage32 (usage32, &usage64); alpha_rusage64_to_rusage32 (usage32, &usage64);
return 0; return 0;
} }

4
sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
View File

@ -23,7 +23,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
/* Get the current time of day and timezone information putting it /* Get the current time of day and timezone information putting it
into *TV and *TZ. */ into *TV and *TZ. */
@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
struct timespec ts; struct timespec ts;
__clock_gettime (CLOCK_REALTIME, &ts); __clock_gettime (CLOCK_REALTIME, &ts);
*tv32 = valid_timespec_to_timeval32 (ts); *tv32 = alpha_valid_timespec_to_timeval32 (ts);
return 0; return 0;
} }

10
sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
View File

@ -21,7 +21,7 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h> #include <sys/time.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
int int
attribute_compat_text_section attribute_compat_text_section
@ -30,9 +30,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
{ {
struct itimerval new_value_64; struct itimerval new_value_64;
new_value_64.it_interval new_value_64.it_interval
= valid_timeval32_to_timeval (new_value->it_interval); = alpha_valid_timeval32_to_timeval (new_value->it_interval);
new_value_64.it_value new_value_64.it_value
= valid_timeval32_to_timeval (new_value->it_value); = alpha_valid_timeval32_to_timeval (new_value->it_value);
if (old_value == NULL) if (old_value == NULL)
return __setitimer (which, &new_value_64, NULL); return __setitimer (which, &new_value_64, NULL);
@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */ /* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval old_value->it_interval
= valid_timeval_to_timeval32 (old_value_64.it_interval); = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
old_value->it_value old_value->it_value
= valid_timeval_to_timeval32 (old_value_64.it_value); = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
return 0; return 0;
} }

4
sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
View File

@ -23,7 +23,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
/* Set the current time of day and timezone information. /* Set the current time of day and timezone information.
This call is restricted to the super-user. */ This call is restricted to the super-user. */
@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
return __settimezone (tz); return __settimezone (tz);
} }
struct timespec ts = valid_timeval32_to_timespec (*tv32); struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
return __clock_settime (CLOCK_REALTIME, &ts); return __clock_settime (CLOCK_REALTIME, &ts);
} }

6
sysdeps/unix/sysv/linux/alpha/osf_utimes.c
View File

@ -21,15 +21,15 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h> #include <sys/time.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
int int
attribute_compat_text_section attribute_compat_text_section
__utimes_tv32 (const char *filename, const struct timeval32 times32[2]) __utimes_tv32 (const char *filename, const struct timeval32 times32[2])
{ {
struct timeval times[2]; struct timeval times[2];
times[0] = valid_timeval32_to_timeval (times32[0]); times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
times[1] = valid_timeval32_to_timeval (times32[1]); times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
return __utimes (filename, times); return __utimes (filename, times);
} }

4
sysdeps/unix/sysv/linux/alpha/osf_wait4.c
View File

@ -23,7 +23,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <tv32-compat.h> #include <alpha-tv32-compat.h>
pid_t pid_t
attribute_compat_text_section attribute_compat_text_section
@ -33,7 +33,7 @@ __wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
pid_t child = __wait4 (pid, status, options, &usage64); pid_t child = __wait4 (pid, status, options, &usage64);
if (child >= 0 && usage32 != NULL) if (child >= 0 && usage32 != NULL)
rusage64_to_rusage32 (usage32, &usage64); alpha_rusage64_to_rusage32 (usage32, &usage64);
return child; return child;
} }