deleted file mode 100644
@@ -1,124 +0,0 @@
-/* Compatibility definitions for `struct timeval' with 32-bit time_t.
- Copyright (C) 2019-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#ifndef _TV32_COMPAT_H
-#define _TV32_COMPAT_H 1
-
-#include <features.h>
-
-#include <bits/types.h>
-#include <bits/types/time_t.h>
-#include <bits/types/struct_timeval.h>
-#include <bits/types/struct_timespec.h>
-#include <bits/types/struct_rusage.h>
-
-#include <stdint.h> // for INT32_MAX
-#include <string.h> // for memset
-
-#define TV_USEC_MAX 999999 // 10**6 - 1
-
-/* A version of 'struct timeval' with 32-bit time_t. */
-struct timeval32
-{
- int32_t tv_sec;
- int32_t tv_usec;
-};
-
-/* Structures containing 'struct timeval' with 32-bit time_t. */
-struct itimerval32
-{
- struct timeval32 it_interval;
- struct timeval32 it_value;
-};
-
-struct rusage32
-{
- struct timeval32 ru_utime; /* user time used */
- struct timeval32 ru_stime; /* system time used */
- long ru_maxrss; /* maximum resident set size */
- long ru_ixrss; /* integral shared memory size */
- long ru_idrss; /* integral unshared data size */
- long ru_isrss; /* integral unshared stack size */
- long ru_minflt; /* page reclaims */
- long ru_majflt; /* page faults */
- long ru_nswap; /* swaps */
- long ru_inblock; /* block input operations */
- long ru_oublock; /* block output operations */
- long ru_msgsnd; /* messages sent */
- long ru_msgrcv; /* messages received */
- long ru_nsignals; /* signals received */
- long ru_nvcsw; /* voluntary context switches */
- long ru_nivcsw; /* involuntary " */
-};
-
-/* Conversion functions. If the seconds field of a timeval32 would
- overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
-
-static inline struct timeval
-alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
-{
- return (struct timeval) { tv.tv_sec, tv.tv_usec };
-}
-
-static inline struct timeval32
-alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
-{
- if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
- return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
- return (struct timeval32) { tv64.tv_sec, tv64.tv_usec };
-}
-
-static inline struct timespec
-alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
-{
- return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
-}
-
-static inline struct timeval32
-alpha_valid_timespec_to_timeval32 (const struct timespec ts)
-{
- return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
-}
-
-static inline void
-alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
- const struct rusage *restrict r64)
-{
- /* Make sure the entire output structure is cleared, including
- padding and reserved fields. */
- memset (r32, 0, sizeof *r32);
-
- r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
- r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
- r32->ru_maxrss = r64->ru_maxrss;
- r32->ru_ixrss = r64->ru_ixrss;
- r32->ru_idrss = r64->ru_idrss;
- r32->ru_isrss = r64->ru_isrss;
- r32->ru_minflt = r64->ru_minflt;
- r32->ru_majflt = r64->ru_majflt;
- r32->ru_nswap = r64->ru_nswap;
- r32->ru_inblock = r64->ru_inblock;
- r32->ru_oublock = r64->ru_oublock;
- r32->ru_msgsnd = r64->ru_msgsnd;
- r32->ru_msgrcv = r64->ru_msgrcv;
- r32->ru_nsignals = r64->ru_nsignals;
- r32->ru_nvcsw = r64->ru_nvcsw;
- r32->ru_nivcsw = r64->ru_nivcsw;
-}
-
-#endif /* alpha-tv32-compat.h */
@@ -20,9 +20,10 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
#include <sys/timex.h>
-#include <alpha-tv32-compat.h>
+#include <string.h>
struct timex32 {
unsigned int modes; /* mode selector */
@@ -36,7 +37,7 @@ struct timex32 {
long tolerance; /* clock frequency tolerance (ppm)
* (read only)
*/
- struct timeval32 time; /* (read only) */
+ struct __timeval32 time; /* (read only) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
@@ -55,15 +56,15 @@ struct timex32 {
int
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 = alpha_valid_timeval32_to_timeval (*itv);
+ struct timeval itv64 = valid_timeval32_to_timeval (*itv);
struct timeval otv64;
if (__adjtime (&itv64, &otv64) == -1)
return -1;
- *otv = alpha_valid_timeval_to_timeval32 (otv64);
+ *otv = valid_timeval_to_timeval32 (otv64);
return 0;
}
@@ -91,7 +92,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx64.calcnt = tx->calcnt;
tx64.errcnt = tx->errcnt;
tx64.stbcnt = tx->stbcnt;
- tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
+ tx64.time = valid_timeval32_to_timeval (tx->time);
int status = __adjtimex (&tx64);
if (status < 0)
@@ -116,7 +117,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt;
- tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
+ tx->time = valid_timeval_to_timeval32 (tx64.time);
return status;
}
@@ -20,12 +20,13 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
attribute_compat_text_section
-__getitimer_tv32 (int which, struct itimerval32 *curr_value)
+__getitimer_tv32 (int which, struct __itimerval32 *curr_value)
{
struct itimerval curr_value_64;
if (__getitimer (which, &curr_value_64) == -1)
@@ -33,9 +34,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval
- = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
+ = valid_timeval_to_timeval32 (curr_value_64.it_interval);
curr_value->it_value
- = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
+ = valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0;
}
@@ -22,16 +22,16 @@
#include <sys/time.h>
#include <sys/resource.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
-__getrusage_tv32 (int who, struct rusage32 *usage32)
+__getrusage_tv32 (int who, struct __rusage32 *usage32)
{
- struct rusage usage64;
- if (__getrusage (who, &usage64) == -1)
+ struct rusage usage;
+ if (__getrusage (who, &usage) == -1)
return -1;
- alpha_rusage64_to_rusage32 (usage32, &usage64);
+ rusage64_to_rusage32 (&usage, usage32);
return 0;
}
@@ -20,17 +20,17 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <string.h>
#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
/* Get the current time of day and timezone information putting it
into *TV and *TZ. */
int
attribute_compat_text_section
-__gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
+__gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz)
{
if (__glibc_unlikely (tz != 0))
memset (tz, 0, sizeof (struct timezone));
@@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
struct timespec ts;
__clock_gettime (CLOCK_REALTIME, &ts);
- *tv32 = alpha_valid_timespec_to_timeval32 (ts);
+ *tv32 = valid_timespec_to_timeval32 (ts);
return 0;
}
@@ -20,19 +20,20 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
attribute_compat_text_section
-__setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
- struct itimerval32 *restrict old_value)
+__setitimer_tv32 (int which, const struct __itimerval32 *restrict new_value,
+ struct __itimerval32 *restrict old_value)
{
struct itimerval new_value_64;
new_value_64.it_interval
- = alpha_valid_timeval32_to_timeval (new_value->it_interval);
+ = valid_timeval32_to_timeval (new_value->it_interval);
new_value_64.it_value
- = alpha_valid_timeval32_to_timeval (new_value->it_value);
+ = valid_timeval32_to_timeval (new_value->it_value);
if (old_value == NULL)
return __setitimer (which, &new_value_64, NULL);
@@ -43,9 +44,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval
- = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
+ = valid_timeval_to_timeval32 (old_value_64.it_interval);
old_value->it_value
- = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
+ = valid_timeval_to_timeval32 (old_value_64.it_value);
return 0;
}
@@ -20,16 +20,16 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
#include <time.h>
#include <errno.h>
-#include <alpha-tv32-compat.h>
/* Set the current time of day and timezone information.
This call is restricted to the super-user. */
int
attribute_compat_text_section
-__settimeofday_tv32 (const struct timeval32 *tv32,
+__settimeofday_tv32 (const struct __timeval32 *tv32,
const struct timezone *tz)
{
if (__glibc_unlikely (tz != 0))
@@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
return __settimezone (tz);
}
- struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
+ struct timespec ts = valid_timeval32_to_timespec (*tv32);
return __clock_settime (CLOCK_REALTIME, &ts);
}
@@ -20,16 +20,16 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
int
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];
- times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
- times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
+ times[0] = valid_timeval32_to_timeval (times32[0]);
+ times[1] = valid_timeval32_to_timeval (times32[1]);
return __utimes (filename, times);
}
@@ -23,17 +23,17 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
pid_t
attribute_compat_text_section
-__wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
+__wait4_tv32 (pid_t pid, int *status, int options, struct __rusage32 *usage32)
{
- struct rusage usage64;
- pid_t child = __wait4 (pid, status, options, &usage64);
+ struct rusage usage;
+ pid_t child = __wait4 (pid, status, options, &usage);
if (child >= 0 && usage32 != NULL)
- alpha_rusage64_to_rusage32 (usage32, &usage64);
+ rusage64_to_rusage32 (&usage, usage32);
return child;
}
@@ -75,4 +75,30 @@ rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
r64->ru_nivcsw = r32->ru_nivcsw;
}
+static inline void
+rusage64_to_rusage32 (const struct __rusage64 *restrict r64,
+ struct __rusage32 *restrict r32)
+{
+ /* Make sure the entire output structure is cleared, including
+ padding and reserved fields. */
+ memset (r32, 0, sizeof *r32);
+
+ r32->ru_utime = valid_timeval64_to_timeval32 (r64->ru_utime);
+ r32->ru_stime = valid_timeval64_to_timeval32 (r64->ru_stime);
+ r32->ru_maxrss = r64->ru_maxrss;
+ r32->ru_ixrss = r64->ru_ixrss;
+ r32->ru_idrss = r64->ru_idrss;
+ r32->ru_isrss = r64->ru_isrss;
+ r32->ru_minflt = r64->ru_minflt;
+ r32->ru_majflt = r64->ru_majflt;
+ r32->ru_nswap = r64->ru_nswap;
+ r32->ru_inblock = r64->ru_inblock;
+ r32->ru_oublock = r64->ru_oublock;
+ r32->ru_msgsnd = r64->ru_msgsnd;
+ r32->ru_msgrcv = r64->ru_msgrcv;
+ r32->ru_nsignals = r64->ru_nsignals;
+ r32->ru_nvcsw = r64->ru_nvcsw;
+ r32->ru_nivcsw = r64->ru_nivcsw;
+}
+
#endif /* tv32-compat.h */