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

bionic: make epoll_event structure packed

Browse Source 
Description: In the kernel the epoll_event structure is packed
in 64 bit kernel builds to allow the structure to be more easily
compatible with 32 bit user space.  As a result, when user space
is 64-bit the structure must be packed as well.

Add unit test to show the ptr alignment issue.

Change-Id: I2c4848d5e38a357219091f350f9b6e3da05090da
Signed-off-by: Philip Hatcher <philip.hatcher@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Reviewed-by: Hazarika, Prodyut <prodyut.hazarika@intel.com>
Tested-by: Hazarika, Prodyut <prodyut.hazarika@intel.com>
This commit is contained in:
Philip Hatcher 2014-02-25 14:16:37 +01:00 committed by Elliott Hughes
parent 4356adc3f4
commit 9ded07cff6
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 { struct epoll_event {
uint32_t events; uint32_t events;
epoll_data_t data; epoll_data_t data;
}; }
#ifdef __x86_64__
__packed
#endif
;
int epoll_create(int); int epoll_create(int);
int epoll_create1(int); int epoll_create1(int);

29
tests/sys_epoll_test.cpp
View File

@ -17,8 +17,10 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <unistd.h>
TEST(sys_epoll, smoke) { TEST(sys_epoll, smoke) {
int epoll_fd = epoll_create(1); int epoll_fd = epoll_create(1);
@ -37,3 +39,30 @@ TEST(sys_epoll, smoke) {
sigaddset(&ss, SIGPIPE); sigaddset(&ss, SIGPIPE);
ASSERT_EQ(0, epoll_pwait(epoll_fd, events, 1, 1, &ss)); 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]);
}