This is the mail archive of the libc-ports@sources.redhat.com mailing list for the libc-ports project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Convert HPPA to use <bits/fcntl-linux.h>


On Wed, Oct 24, 2012 at 3:07 PM, Andreas Jaeger <aj@suse.com> wrote:
>
> Here's an updated patch for hppa to use <bits/fcntl-linux.h>.
> The patch is also part of my git branch aj/shared-linux-fcntl.

Thanks for doing the work!

I've noticed that the uapi work upstream in linux it's pretty
easy to review which constants are the same and which are
different...

> Ok to commit?

No, a couple of bugs.

OK with those changes.

I've compared it to the upstream kernel.

> Andreas
>
> 2012-10-24  Andreas Jaeger  <aj@suse.de>
>
>         * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Remove all
>         definitions and declarations that are provided by
>         <bits/fcntl-linux.h> and include <bits/fcntl-linux.h>.
>
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
> b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
> index c0e949e..4b9958c 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
> @@ -1,6 +1,5 @@
>  /* O_*, F_*, FD_* bit values for Linux.
> -   Copyright (C) 1995-1999, 2000, 2002, 2004, 2010, 2011
> -   Free Software Foundation, Inc.
> +   Copyright (C) 1995-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
> @@ -21,134 +20,38 @@
>  # error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
>  #endif
>
> -#include <sys/types.h>
> -#ifdef __USE_GNU
> -# include <bits/uio.h>
> -#endif
> -
> -
> -/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
> -   located on a few file systems.  */
> -#define O_ACCMODE         0003
> -#define O_RDONLY            00
> -#define O_WRONLY            01
> -#define O_RDWR              02
>  #define O_CREAT                00000400 /* not fcntl */

OK.

>  #define O_EXCL         00002000 /* not fcntl */

OK.

>  #define O_NOCTTY       00400000 /* not fcntl */
> -#define O_TRUNC                00001000 /* not fcntl */
> -#define O_APPEND       00000010

Don't remove O_APPEND, it's a unique constant different from generic linux.

>  #define O_NONBLOCK     00200004 /* HPUX has separate NDELAY & NONBLOCK */
> -#define O_NDELAY       O_NONBLOCK
> -#define O_SYNC         00100000
> -#define O_FSYNC                 O_SYNC
> -#define O_ASYNC                 020000
> +#define __O_DSYNC      01000000
> +#define __O_RSYNC      02000000 /* HPUX only */

OK.

> +#define O_SYNC         01100000

I suggest:
#define __O_SYNC 01000000
#define O_SYNC (__O_SYNC|__O_DSYNC)

That's what the kernel does and I like it for the sake of comparing
uapi/asm/fcntl.h to glibc's version.

>  #define O_BLKSEEK      00000100 /* HPUX only */

OK.

>
> -#ifdef __USE_XOPEN2K8
> -# define O_DIRECTORY   000010000 /* Must be a directory.  */
> -# define O_NOFOLLOW    000000200 /* Do not follow links.  */
> -# define O_CLOEXEC     010000000 /* Set close_on_exec.  */
> -#endif
> -#ifdef __USE_GNU
> -# define O_DIRECT       040000 /* Direct disk access.  */
> -# define O_NOATIME     004000000 /* Do not set atime.  */
> -#endif
> +#define __O_DIRECTORY  000010000 /* Must be a directory.  */
> +#define __O_NOFOLLOW   000000200 /* Do not follow links.  */
> +#define __O_CLOEXEC    010000000 /* Set close_on_exec.  */
> +#define __O_NOATIME    004000000 /* Do not set atime.  */

OK.

> -/* For now Linux has synchronisity options for data and read operations.
> -   We define the symbols here but let them do the same as O_SYNC since
> -   this is a superset. */
> -#if defined __USE_POSIX199309 || defined __USE_UNIX98
> -# define O_DSYNC               01000000 /* HPUX only */
> -# define O_RSYNC               02000000 /* HPUX only */
> -#endif

OK.

> -#ifdef __USE_LARGEFILE64
> -# define O_LARGEFILE   00004000
> -#endif
> +#define __O_LARGEFILE  00004000

OK.

> -/* Values for the second argument to `fcntl'.  */
> -#define F_DUPFD                0       /* Duplicate file descriptor.  */
> -#define F_GETFD                1       /* Get file descriptor flags.  */
> -#define F_SETFD                2       /* Set file descriptor flags.  */
> -#define F_GETFL                3       /* Get file status flags.  */
> -#define F_SETFL                4       /* Set file status flags.  */
> -#ifndef __USE_FILE_OFFSET64
> -# define F_GETLK       5       /* Get record locking info.  */
> -# define F_SETLK       6       /* Set record locking info (non-blocking).
> */
> -# define F_SETLKW      7       /* Set record locking info (blocking).  */
> -#else
> -# define F_GETLK       F_GETLK64  /* Get record locking info.  */
> -# define F_SETLK       F_SETLK64  /* Set record locking info
> (non-blocking).*/
> -# define F_SETLKW      F_SETLKW64 /* Set record locking info (blocking).
> */
> -#endif
>  #define F_GETLK64      8       /* Get record locking info.  */
>  #define F_SETLK64      9       /* Set record locking info (non-blocking).
> */
>  #define F_SETLKW64     10      /* Set record locking info (blocking).  */

OK.

> -#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
> -# define F_GETOWN      11      /* Get owner of socket (receiver of SIGIO).
> */
> -# define F_SETOWN      12      /* Set owner of socket (receiver of SIGIO).
> */
> -#endif
> -
> -#ifdef __USE_GNU
> -# define F_SETSIG      13      /* Set number of signal to be sent.  */
> -# define F_GETSIG      14      /* Get number of signal to be sent.  */
> -# define F_SETOWN_EX   15      /* Get owner (thread receiving SIGIO).  */
> -# define F_GETOWN_EX   16      /* Set owner (thread receiving SIGIO).  */
> -#endif
> +#define __F_GETOWN     11      /* Get owner of socket (receiver of SIGIO).
> */
> +#define __F_SETOWN     12      /* Set owner of socket (receiver of SIGIO).
> */

OK.

> -#ifdef __USE_GNU
> -# define F_SETLEASE    1024    /* Set a lease.  */
> -# define F_GETLEASE    1025    /* Enquire what lease is active.  */
> -# define F_NOTIFY      1026    /* Request notfications on a directory.  */
> -# define F_SETPIPE_SZ  1031    /* Set pipe page size array.  */
> -# define F_GETPIPE_SZ  1032    /* Set pipe page size array.  */
> -#endif
> -#ifdef __USE_XOPEN2K8
> -# define F_DUPFD_CLOEXEC 1030  /* Duplicate file descriptor with
> -                                  close-on-exit set.  */
> -#endif
> -
> -/* For F_[GET|SET]FD.  */
> -#define FD_CLOEXEC     1       /* actually anything with low bit set goes
> */
> +#define __F_SETSIG     13      /* Set number of signal to be sent.  */
> +#define __F_GETSIG     14      /* Get number of signal to be sent.  */

OK.

>  /* For posix fcntl() and `l_type' field of a `struct flock' for lockf().
> */
>  #define F_RDLCK                1       /* Read lock.  */
>  #define F_WRLCK                2       /* Write lock.  */
>  #define F_UNLCK                3       /* Remove lock.  */

OK.

> -/* For old implementation of bsd flock().  */
> -#define F_EXLCK                4       /* or 3 */
> -#define F_SHLCK                8       /* or 4 */
> -
> -#ifdef __USE_BSD
> -/* Operations for bsd flock(), also used by the kernel implementation. */
> -# define LOCK_SH       1       /* shared lock */
> -# define LOCK_EX       2       /* exclusive lock */
> -# define LOCK_NB       4       /* or'd with one of the above to prevent
> -                                  blocking */
> -# define LOCK_UN       8       /* remove lock */
> -#endif
> -
> -#ifdef __USE_GNU
> -# define LOCK_MAND     32      /* This is a mandatory flock:   */
> -# define LOCK_READ     64      /* ... which allows concurrent read
> operations.  */
> -# define LOCK_WRITE    128     /* ... which allows concurrent write
> operations.  */
> -# define LOCK_RW       192     /* ... Which allows concurrent read & write
> operations.  */
> -#endif
> -
> -#ifdef __USE_GNU
> -/* Types of directory notifications that may be requested with F_NOTIFY.
> */
> -# define DN_ACCESS     0x00000001      /* File accessed.  */
> -# define DN_MODIFY     0x00000002      /* File modified.  */
> -# define DN_CREATE     0x00000004      /* File created.  */
> -# define DN_DELETE     0x00000008      /* File removed.  */
> -# define DN_RENAME     0x00000010      /* File renamed.  */
> -# define DN_ATTRIB     0x00000020      /* File changed attibutes.  */
> -# define DN_MULTISHOT  0x80000000      /* Don't remove notifier.  */
> -#endif
> -
>  struct flock
>    {
>      short int l_type;  /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
> @@ -174,148 +77,5 @@ struct flock64
>    };
>  #endif
>
> -#ifdef __USE_GNU
> -/* Owner types.  */
> -enum __pid_type
> -  {
> -    F_OWNER_TID = 0,           /* Kernel thread.  */
> -    F_OWNER_PID,               /* Process.  */
> -    F_OWNER_PGRP,              /* Process group.  */
> -    F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name.  */
> -  };
> -
> -/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
> -struct f_owner_ex
> -  {
> -    enum __pid_type type;      /* Owner type of ID.  */
> -    __pid_t pid;               /* ID of owner.  */
> -  };
> -#endif
> -
> -/* Define some more compatibility macros to be backward compatible with
> -   BSD systems which did not managed to hide these kernel macros.  */
> -#ifdef __USE_BSD
> -# define FAPPEND       O_APPEND
> -# define FFSYNC                O_FSYNC
> -# define FASYNC                O_ASYNC
> -# define FNONBLOCK     O_NONBLOCK
> -# define FNDELAY       O_NDELAY
> -#endif /* Use BSD.  */
> -
> -/* Advise to `posix_fadvise'.  */
> -#ifdef __USE_XOPEN2K
> -# define POSIX_FADV_NORMAL     0 /* No further special treatment.  */
> -# define POSIX_FADV_RANDOM     1 /* Expect random page references.  */
> -# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references.  */
> -# define POSIX_FADV_WILLNEED   3 /* Will need these pages.  */
> -# define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
> -# define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
> -#endif
> -
> -
> -#ifdef __USE_GNU
> -/* Flags for SYNC_FILE_RANGE.  */
> -# define SYNC_FILE_RANGE_WAIT_BEFORE   1 /* Wait upon writeout of all pages
> -                                            in the range before performing
> the
> -                                            write.  */
> -# define SYNC_FILE_RANGE_WRITE         2 /* Initiate writeout of all those
> -                                            dirty pages in the range which
> are
> -                                            not presently under writeback.
> */
> -# define SYNC_FILE_RANGE_WAIT_AFTER    4 /* Wait upon writeout of all pages
> in
> -                                            the range after performing the
> -                                            write.  */
> -
> -/* Flags for SPLICE and VMSPLICE.  */
> -# define SPLICE_F_MOVE         1       /* Move pages instead of copying.
> */
> -# define SPLICE_F_NONBLOCK     2       /* Don't block on the pipe splicing
> -                                          (but we may still block on the fd
> -                                          we splice from/to).  */
> -# define SPLICE_F_MORE         4       /* Expect more data.  */
> -# define SPLICE_F_GIFT         8       /* Pages passed in are a gift.  */
> -
> -
> -/* File handle structure.  */
> -struct file_handle
> -{
> -  unsigned int handle_bytes;
> -  int handle_type;
> -  /* File identifier.  */
> -  unsigned char f_handle[0];
> -};
> -
> -/* Maximum handle size (for now).  */
> -# define MAX_HANDLE_SZ 128
> -#endif
> -
> -__BEGIN_DECLS
> -
> -#ifdef __USE_GNU
> -
> -/* Provide kernel hint to read ahead.  */
> -extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
> -    __THROW;
> -
> -
> -/* Selective file content synch'ing.  */
> -extern int sync_file_range (int __fd, __off64_t __offset, __off64_t
> __count,
> -                           unsigned int __flags);
> -
> -
> -/* Splice address range into a pipe.
> -
> -   This function is a possible cancellation point and therefore not
> -   marked with __THROW.  */
> -extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,
> -                        size_t __count, unsigned int __flags);
> -
> -/* Splice two files together.
> -
> -   This function is a possible cancellation point and therefore not
> -   marked with __THROW.  */
> -extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
> -                      __off64_t *__offout, size_t __len,
> -                      unsigned int __flags);
> -
> -/* In-kernel implementation of tee for pipe buffers.
> -
> -   This function is a possible cancellation point and therefore not
> -   marked with __THROW.  */
> -extern ssize_t tee (int __fdin, int __fdout, size_t __len,
> -                   unsigned int __flags);
> -
> -/* Reserve storage for the data of the file associated with FD.
> -
> -   This function is a possible cancellation point and therefore not
> -   marked with __THROW.  */
> -# ifndef __USE_FILE_OFFSET64
> -extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t
> __len);
> -# else
> -#  ifdef __REDIRECT
> -extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t
> __offset,
> -                                  __off64_t __len),
> -                      fallocate64);
> -#  else
> -#   define fallocate fallocate64
> -#  endif
> -# endif
> -# ifdef __USE_LARGEFILE64
> -extern int fallocate64 (int __fd, int __mode, __off64_t __offset,
> -                       __off64_t __len);
> -# endif
> -
> -
> -/* Map file name to file handle.  */
> -extern int name_to_handle_at (int __dfd, const char *__name,
> -                             struct file_handle *__handle, int *__mnt_id,
> -                             int __flags) __THROW;
> -
> -/* Open file using the file handle.
> -
> -   This function is a possible cancellation point and therefore not
> -   marked with __THROW.  */
> -extern int open_by_handle_at (int __mountdirfd, struct file_handle
> *__handle,
> -                             int __flags);
> -
> -#endif
> -
> -__END_DECLS
> +/* Include generic Linux declarations.  */
> +#include <bits/fcntl-linux.h>
>
> --
>  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
>   SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
>    GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
>     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]