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

am 4bc54686: am 9b84824d: Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a

Browse Source 
* commit '4bc546860ec36f7ed86ee1a6a7e2bf6db028f02a':
  Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
This commit is contained in:
Kito Cheng
2013-04-03 12:40:32 -07:00
committed by Android Git Automerger
parent f3810dbb0a 4bc546860e
commit 98ac1d64bd
6 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Android.mk
View File

@@ -238,7 +238,8 @@ libc_bionic_src_files := \
bionic/brk.cpp \
bionic/dirent.cpp \
bionic/__errno.c \
bionic/eventfd.cpp \
bionic/eventfd_read.cpp \
bionic/eventfd_write.cpp \
bionic/__fgets_chk.cpp \
bionic/getauxval.cpp \
bionic/getcwd.cpp \

23
libc/bionic/eventfd.cpp → libc/bionic/eventfd_read.cpp
View File

@@ -29,25 +29,6 @@
#include <sys/eventfd.h>
#include <unistd.h>
/* We duplicate the GLibc error semantics, which are poorly defined
* if the read() or write() does not return the proper number of bytes.
*/
int eventfd_read(int fd, eventfd_t *counter)
{
int ret = read(fd, counter, sizeof(*counter));
if (ret == sizeof(*counter))
return 0;
return -1;
}
int eventfd_write(int fd, eventfd_t counter)
{
int ret = write(fd, &counter, sizeof(counter));
if (ret == sizeof(counter))
return 0;
return -1;
int eventfd_read(int fd, eventfd_t* value) {
return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;
}

34
libc/bionic/eventfd_write.cpp Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright (C) 2010 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.
*/
#include <sys/eventfd.h>
#include <unistd.h>
int eventfd_write(int fd, eventfd_t value) {
return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1;
}

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

@@ -33,17 +33,16 @@
__BEGIN_DECLS
#define EFD_CLOEXEC O_CLOEXEC
#define EFD_NONBLOCK O_NONBLOCK
#define EFD_CLOEXEC O_CLOEXEC
#define EFD_NONBLOCK O_NONBLOCK
/* type of event counter */
typedef uint64_t eventfd_t;
typedef uint64_t eventfd_t;
extern int eventfd(unsigned int initval, int flags);
extern int eventfd(unsigned int initial_value, int flags);
/* Compatibility with GLibc */
extern int eventfd_read(int fd, eventfd_t *counter);
extern int eventfd_write(int fd, const eventfd_t counter);
extern int eventfd_read(int fd, eventfd_t* value);
extern int eventfd_write(int fd, eventfd_t value);
__END_DECLS