generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 686af0b3: resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

Browse Source 
Merge commit '686af0b3a5978356be3b1a97187c765d63f11623'

* commit '686af0b3a5978356be3b1a97187c765d63f11623':
  libc: add <sys/eventfd.h> and corresponding implementations.
This commit is contained in:
repo sync
2010-09-28 12:48:34 -07:00
committed by Android Git Automerger
parent 2336503264 686af0b3a5
commit 319de1758c
12 changed files with 136 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libc/include/sys/eventfd.h
View File

@@ -1,14 +1,50 @@
#ifndef _SYS_EVENTFD_H_
#define _SYS_EVENTFD_H_
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _SYS_EVENTFD_H
#define _SYS_EVENTFD_H
#include <sys/cdefs.h>
#include <asm/unistd.h>
#include <asm/termbits.h>
#include <fcntl.h>
__BEGIN_DECLS
extern int eventfd(int count, int flags);
#define EFD_CLOEXEC O_CLOEXEC
#define EFD_NONBLOCK O_NONBLOCK
/* type of event counter */
typedef uint64_t eventfd_t;
extern int eventfd(unsigned int initval, int flags);
/* Compatibility with GLibc */
extern int eventfd_read(int fd, eventfd_t *counter);
extern int eventfd_write(int fd, const eventfd_t counter);
__END_DECLS
#endif /* _SYS_EVENTFD_H_ */
#endif /* _SYS_EVENTFD_H */

6
libc/include/sys/linux-syscalls.h
View File

@@ -182,9 +182,9 @@
#define __NR_inotify_init (__NR_SYSCALL_BASE + 316)
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317)
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318)
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 356)
#define __NR_ARM_set_tls (__NR_SYSCALL_BASE + 983045)
#define __NR_ARM_cacheflush (__NR_SYSCALL_BASE + 983042)
#define __NR_eventfd (__NR_SYSCALL_BASE + 351)
#endif
#ifdef __i386__
@@ -226,7 +226,7 @@
#define __NR_inotify_init (__NR_SYSCALL_BASE + 291)
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 292)
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 293)
#define __NR_eventfd (__NR_SYSCALL_BASE + 323)
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 328)
#endif
#if defined(__SH3__) || defined(__SH4__)
@@ -284,7 +284,7 @@
#define __NR_inotify_init (__NR_SYSCALL_BASE + 290)
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 291)
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 292)
#define __NR_eventfd (__NR_SYSCALL_BASE + 323)
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 328)
#endif
#endif

1
libc/include/sys/linux-unistd.h
View File

@@ -202,6 +202,7 @@ int inotify_init (void);
int inotify_add_watch (int, const char *, unsigned int);
int inotify_rm_watch (int, unsigned int);
int poll (struct pollfd *, unsigned int, long);
int eventfd (unsigned int, int);
int __set_tls (void*);
int cacheflush (long start, long end, long flags);
int eventfd (int count, int flags);