ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use alignas for alignment."

Browse source
This commit is contained in:
Elliott Hughes 2016-06-07 15:41:28 +00:00 • committed by Gerrit Code Review
commit bb1e7977fb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
liblog/tests/liblog_benchmark.cpp
View file

@ -205,7 +205,7 @@ static void BM_pmsg_short_aligned(int iters) {
android_log_header_t header; android_log_header_t header;
android_log_event_int_t payload; android_log_event_int_t payload;
}; };
char buf[sizeof(struct packet) + 8] __aligned(8); alignas(8) char buf[sizeof(struct packet) + 8];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
struct packet *buffer = (struct packet*)(((uintptr_t)buf + 7) & ~7); struct packet *buffer = (struct packet*)(((uintptr_t)buf + 7) & ~7);
if (((uintptr_t)&buffer->pmsg_header) & 7) { if (((uintptr_t)&buffer->pmsg_header) & 7) {
@ -281,7 +281,7 @@ static void BM_pmsg_short_unaligned1(int iters) {
android_log_header_t header; android_log_header_t header;
android_log_event_int_t payload; android_log_event_int_t payload;
}; };
char buf[sizeof(struct packet) + 8] __aligned(8); alignas(8) char buf[sizeof(struct packet) + 8];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
struct packet *buffer = (struct packet*)((((uintptr_t)buf + 7) & ~7) + 1); struct packet *buffer = (struct packet*)((((uintptr_t)buf + 7) & ~7) + 1);
if ((((uintptr_t)&buffer->pmsg_header) & 7) != 1) { if ((((uintptr_t)&buffer->pmsg_header) & 7) != 1) {
@ -357,7 +357,7 @@ static void BM_pmsg_long_aligned(int iters) {
android_log_header_t header; android_log_header_t header;
android_log_event_int_t payload; android_log_event_int_t payload;
}; };
char buf[sizeof(struct packet) + 8 + LOGGER_ENTRY_MAX_PAYLOAD] __aligned(8); alignas(8) char buf[sizeof(struct packet) + 8 + LOGGER_ENTRY_MAX_PAYLOAD];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
struct packet *buffer = (struct packet*)(((uintptr_t)buf + 7) & ~7); struct packet *buffer = (struct packet*)(((uintptr_t)buf + 7) & ~7);
if (((uintptr_t)&buffer->pmsg_header) & 7) { if (((uintptr_t)&buffer->pmsg_header) & 7) {
@ -430,7 +430,7 @@ static void BM_pmsg_long_unaligned1(int iters) {
android_log_header_t header; android_log_header_t header;
android_log_event_int_t payload; android_log_event_int_t payload;
}; };
char buf[sizeof(struct packet) + 8 + LOGGER_ENTRY_MAX_PAYLOAD] __aligned(8); alignas(8) char buf[sizeof(struct packet) + 8 + LOGGER_ENTRY_MAX_PAYLOAD];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
struct packet *buffer = (struct packet*)((((uintptr_t)buf + 7) & ~7) + 1); struct packet *buffer = (struct packet*)((((uintptr_t)buf + 7) & ~7) + 1);
if ((((uintptr_t)&buffer->pmsg_header) & 7) != 1) { if ((((uintptr_t)&buffer->pmsg_header) & 7) != 1) {

2
logd/LogListener.cpp
View file

@ -48,7 +48,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
+ LOGGER_ENTRY_MAX_PAYLOAD]; + LOGGER_ENTRY_MAX_PAYLOAD];
struct iovec iov = { buffer, sizeof(buffer) }; struct iovec iov = { buffer, sizeof(buffer) };
char control[CMSG_SPACE(sizeof(struct ucred))] __aligned(4); alignas(4) char control[CMSG_SPACE(sizeof(struct ucred))];
struct msghdr hdr = { struct msghdr hdr = {
NULL, NULL,
0, 0,