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

am b8d60a2a: am e71e6a2e: am 185dd72a: Merge "bionic: make epoll_event structure packed"

Browse Source 
* commit 'b8d60a2a0c7febce87b0511c86c3fc168c8089a4':
  bionic: make epoll_event structure packed
This commit is contained in:
Elliott Hughes 2014-05-06 02:59:58 +00:00 committed by Android Git Automerger
commit 4e6c71fab9
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/include/sys/epoll.h
View File

@ -67,7 +67,11 @@ typedef union epoll_data {
struct epoll_event {
uint32_t events;
epoll_data_t data;
};
}
#ifdef __x86_64__
__packed
#endif
;
int epoll_create(int);
int epoll_create1(int);

29
tests/sys_epoll_test.cpp
View File

@ -17,8 +17,10 @@
#include <gtest/gtest.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/epoll.h>
#include <unistd.h>
TEST(sys_epoll, smoke) {
int epoll_fd = epoll_create(1);
@ -37,3 +39,30 @@ TEST(sys_epoll, smoke) {
sigaddset(&ss, SIGPIPE);
ASSERT_EQ(0, epoll_pwait(epoll_fd, events, 1, 1, &ss));
}
TEST(sys_epoll, epoll_event_data) {
int epoll_fd = epoll_create(1);
ASSERT_NE(-1, epoll_fd) << strerror(errno);
int fds[2];
ASSERT_NE(-1, pipe(fds));
const uint64_t expected = 0x123456789abcdef0;
// Get ready to poll on read end of pipe.
epoll_event ev;
ev.events = EPOLLIN;
ev.data.u64 = expected;
ASSERT_NE(-1, epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fds[0], &ev));
// Ensure there's something in the pipe.
ASSERT_EQ(1, write(fds[1], "\n", 1));
// Poll.
epoll_event events[1];
ASSERT_EQ(1, epoll_wait(epoll_fd, events, 1, 1));
ASSERT_EQ(expected, events[0].data.u64);
close(fds[0]);
close(fds[1]);
}