const char **apass);
libc_hidden_proto (ruserpass)
+# if __TIMESIZE == 64
+# define __gai_suspend_time64 __gai_suspend
+# else
+extern int __gai_suspend_time64 (const struct gaicb *const list[], int ent,
+ const struct __timespec64 *timeout);
+libanl_hidden_proto (__gai_suspend_time64)
+# endif
/* The following definition has been removed from the public header
since we don't want people to use them. */
#include <gai_misc.h>
-
int
-gai_suspend (const struct gaicb *const list[], int ent,
- const struct timespec *timeout)
+__gai_suspend_time64 (const struct gaicb *const list[], int ent,
+ const struct __timespec64 *timeout)
{
struct waitlist waitlist[ent];
struct requestlist *requestlist[ent];
}
}
+ struct __timespec64 ts;
+ if (timeout != NULL)
+ {
+ __clock_gettime64 (CLOCK_MONOTONIC, &ts);
+ ts.tv_sec += timeout->tv_sec;
+ ts.tv_nsec += timeout->tv_nsec;
+ if (ts.tv_nsec >= 1000000000)
+ {
+ ts.tv_nsec -= 1000000000;
+ ts.tv_sec++;
+ }
+ }
+
if (none)
{
if (cnt < ent)
#ifdef DONT_NEED_GAI_MISC_COND
result = 0;
- GAI_MISC_WAIT (result, cntr, timeout, 1);
+ GAI_MISC_WAIT (result, cntr, timeout == NULL ? NULL : &ts, 1);
#else
- if (timeout == NULL)
- result = pthread_cond_wait (&cond, &__gai_requests_mutex);
- else
- {
- /* We have to convert the relative timeout value into an
- absolute time value with pthread_cond_timedwait expects. */
- struct timespec now;
- struct timespec abstime;
-
- __clock_gettime (CLOCK_REALTIME, &now);
- abstime.tv_nsec = timeout->tv_nsec + now.tv_nsec;
- abstime.tv_sec = timeout->tv_sec + now.tv_sec;
- if (abstime.tv_nsec >= 1000000000)
- {
- abstime.tv_nsec -= 1000000000;
- abstime.tv_sec += 1;
- }
-
- result = pthread_cond_timedwait (&cond, &__gai_requests_mutex,
- &abstime);
- }
+ struct timespec ts32 = valid_timespec64_to_timespec (ts);
+ result = pthread_cond_timedwait (&cond, &__gai_requests_mutex,
+ timeout == NULL ? NULL : &ts32);
#endif
/* Now remove the entry in the waiting list for all requests
return result;
}
+
+#if __TIMESIZE != 64
+libanl_hidden_def (__gai_suspend_time64)
+
+int
+__gai_suspend (const struct gaicb *const list[], int ent,
+ const struct timespec *timeout)
+{
+ struct __timespec64 ts64;
+
+ if (timeout != NULL)
+ ts64 = valid_timespec_to_timespec64 (*timeout);
+
+ return __gai_suspend_time64 (list, ent, timeout != NULL ? &ts64 : NULL);
+}
+#endif
+weak_alias (__gai_suspend, gai_suspend)
do \
{ \
if (cancel) \
- status = futex_reltimed_wait_cancelable ( \
- (unsigned int *) futexaddr, oldval, timeout, FUTEX_PRIVATE); \
+ status = __futex_abstimed_wait_cancelable64 ( \
+ (unsigned int *) futexaddr, oldval, CLOCK_MONOTONIC, timeout, \
+ FUTEX_PRIVATE); \
else \
- status = futex_reltimed_wait ((unsigned int *) futexaddr, \
- oldval, timeout, FUTEX_PRIVATE); \
+ status = __futex_abstimed_wait64 ((unsigned int *) futexaddr, \
+ oldval, CLOCK_REALTIME, timeout, FUTEX_PRIVATE); \
if (status != EAGAIN) \
break; \
\
result = EINTR; \
else if (status == ETIMEDOUT) \
result = EAGAIN; \
+ else if (status == EOVERFLOW) \
+ result = EOVERFLOW; \
else \
assert (status == 0 || status == EAGAIN); \
\