mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 20:23:35 +08:00
HPPA: Update socket.h, pthreadtypes.h and pthread.h
Synchronize from core libc headers.
This commit is contained in:
Carlos O'Donell
parent
ee78ea885a
commit
a64b8a466b
@ -1,3 +1,10 @@
|
||||
2012-03-03 Carlos O'Donell <carlos@systemhalted.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h: Name
|
||||
pthread_attr_t union.
|
||||
* sysdeps/unix/sysv/linux/hppa/nptl/pthread.h: Sync from libc copy.
|
||||
* sysdeps/unix/sysv/linux/hppa/bits/socket.h: Likewise.
|
||||
|
||||
2012-01-08 Carlos O'Donell <carlos@systemhalted.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLLONESHOT)
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
/* System-specific socket constants and types. Linux version.
|
||||
Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009,
|
||||
2010 Free Software Foundation, Inc.
|
||||
Copyright (C) 1991-2012 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
|
||||
@ -14,9 +13,8 @@
|
||||
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, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef __BITS_SOCKET_H
|
||||
#define __BITS_SOCKET_H
|
||||
@ -65,7 +63,6 @@ enum __socket_type
|
||||
SOCK_CLOEXEC = 010000000, /* Atomically set close-on-exec flag for the
|
||||
new descriptor(s). */
|
||||
#define SOCK_CLOEXEC SOCK_CLOEXEC
|
||||
#undef SOCK_NONBLOCK
|
||||
SOCK_NONBLOCK = 0x40000000 /* Atomically mark descriptor(s) as
|
||||
non-blocking. */
|
||||
#define SOCK_NONBLOCK SOCK_NONBLOCK
|
||||
@ -110,7 +107,10 @@ enum __socket_type
|
||||
#define PF_ISDN 34 /* mISDN sockets. */
|
||||
#define PF_PHONET 35 /* Phonet sockets. */
|
||||
#define PF_IEEE802154 36 /* IEEE 802.15.4 sockets. */
|
||||
#define PF_MAX 37 /* For now.. */
|
||||
#define PF_CAIF 37 /* CAIF sockets. */
|
||||
#define PF_ALG 38 /* Algorithm sockets. */
|
||||
#define PF_NFC 39 /* NFC sockets. */
|
||||
#define PF_MAX 40 /* For now.. */
|
||||
|
||||
/* Address families. */
|
||||
#define AF_UNSPEC PF_UNSPEC
|
||||
@ -151,6 +151,9 @@ enum __socket_type
|
||||
#define AF_ISDN PF_ISDN
|
||||
#define AF_PHONET PF_PHONET
|
||||
#define AF_IEEE802154 PF_IEEE802154
|
||||
#define AF_CAIF PF_CAIF
|
||||
#define AF_ALG PF_ALG
|
||||
#define AF_NFC PF_NFC
|
||||
#define AF_MAX PF_MAX
|
||||
|
||||
/* Socket level values. Others are defined in the appropriate headers.
|
||||
@ -233,12 +236,12 @@ enum
|
||||
#define MSG_NOSIGNAL MSG_NOSIGNAL
|
||||
MSG_MORE = 0x8000, /* Sender will send more. */
|
||||
#define MSG_MORE MSG_MORE
|
||||
MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
|
||||
#define MSG_WAITFORONE MSG_WAITFORONE
|
||||
MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
|
||||
#define MSG_WAITFORONE MSG_WAITFORONE
|
||||
|
||||
MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
|
||||
descriptor received through
|
||||
SCM_RIGHTS. */
|
||||
descriptor received through
|
||||
SCM_RIGHTS. */
|
||||
#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
|
||||
};
|
||||
|
||||
@ -262,6 +265,15 @@ struct msghdr
|
||||
int msg_flags; /* Flags on received message. */
|
||||
};
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* For `recvmmsg'. */
|
||||
struct mmsghdr
|
||||
{
|
||||
struct msghdr msg_hdr; /* Actual message header. */
|
||||
unsigned int msg_len; /* Number of received bytes for the entry. */
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Structure used for storage of ancillary data object information. */
|
||||
struct cmsghdr
|
||||
{
|
||||
@ -304,7 +316,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
|
||||
{
|
||||
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
|
||||
/* The kernel header does this so there may be a reason. */
|
||||
return 0;
|
||||
return (struct cmsghdr *) 0;
|
||||
|
||||
__cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
|
||||
+ CMSG_ALIGN (__cmsg->cmsg_len));
|
||||
@ -313,7 +325,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
|
||||
|| ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
|
||||
> ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
|
||||
/* No more entries. */
|
||||
return 0;
|
||||
return (struct cmsghdr *) 0;
|
||||
return __cmsg;
|
||||
}
|
||||
#endif /* Use `extern inline'. */
|
||||
@ -406,4 +418,27 @@ struct linger
|
||||
int l_linger; /* Time to linger. */
|
||||
};
|
||||
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* Receive up to VLEN messages as described by VMESSAGES from socket FD.
|
||||
Returns the number of bytes read or -1 for errors.
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
extern int recvmmsg (int __fd, struct mmsghdr *__vmessages,
|
||||
unsigned int __vlen, int __flags,
|
||||
const struct timespec *__tmo);
|
||||
|
||||
/* Send a VLEN messages as described by VMESSAGES to socket FD.
|
||||
Return the number of datagrams successfully written or -1 for errors.
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
|
||||
unsigned int __vlen, int __flags);
|
||||
#endif
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* bits/socket.h */
|
||||
|
||||
@ -45,11 +45,15 @@
|
||||
exposed on purpose. */
|
||||
typedef unsigned long int pthread_t;
|
||||
|
||||
typedef union
|
||||
union pthread_attr_t
|
||||
{
|
||||
char __size[__SIZEOF_PTHREAD_ATTR_T];
|
||||
long int __align;
|
||||
} pthread_attr_t;
|
||||
};
|
||||
#ifndef __have_pthread_attr_t
|
||||
typedef union pthread_attr_t pthread_attr_t;
|
||||
# define __have_pthread_attr_t 1
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct __pthread_internal_slist
|
||||
|
||||
@ -12,9 +12,8 @@
|
||||
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, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _PTHREAD_H
|
||||
#define _PTHREAD_H 1
|
||||
@ -22,6 +21,7 @@
|
||||
#include <features.h>
|
||||
#include <endian.h>
|
||||
#include <sched.h>
|
||||
#define __need_timespec
|
||||
#include <time.h>
|
||||
|
||||
#include <bits/pthreadtypes.h>
|
||||
@ -72,7 +72,7 @@ enum
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __USE_UNIX98
|
||||
#if defined __USE_POSIX199506 || defined __USE_UNIX98
|
||||
/* Mutex protocols. */
|
||||
enum
|
||||
{
|
||||
@ -266,7 +266,8 @@ extern int pthread_detach (pthread_t __th) __THROW;
|
||||
extern pthread_t pthread_self (void) __THROW __attribute__ ((__const__));
|
||||
|
||||
/* Compare two thread identifiers. */
|
||||
extern int pthread_equal (pthread_t __thread1, pthread_t __thread2) __THROW;
|
||||
extern int pthread_equal (pthread_t __thread1, pthread_t __thread2)
|
||||
__THROW __attribute__ ((__const__));
|
||||
|
||||
|
||||
/* Thread attribute handling. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user