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

Merge changes I759c65e8,I97699037

Browse source 
* changes:
  logd: test: deal with spam filter turned off
  logd: test: modernize
This commit is contained in:
Mark Salyzyn 2014-06-18 19:11:17 +00:00 • committed by Gerrit Code Review
commit 9e7bef0ef9
2 changed files with 50 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
logd/tests/Android.mk
View file

@ -34,7 +34,7 @@ test_c_flags := \
-Werror \ -Werror \
-fno-builtin \ -fno-builtin \
ifeq ($(TARGET_USES_LOGD),true) ifneq ($(TARGET_USES_LOGD),false)
test_c_flags += -DTARGET_USES_LOGD=1 test_c_flags += -DTARGET_USES_LOGD=1
endif endif

72
logd/tests/logd_test.cpp
View file

@ -568,10 +568,11 @@ TEST(logd, benchmark) {
while (fgets(buffer, sizeof(buffer), fp)) { while (fgets(buffer, sizeof(buffer), fp)) {
for (unsigned i = 0; i < sizeof(ns) / sizeof(ns[0]); ++i) { for (unsigned i = 0; i < sizeof(ns) / sizeof(ns[0]); ++i) {
if (strncmp(benchmarks[i], buffer, strlen(benchmarks[i]))) { char *cp = strstr(buffer, benchmarks[i]);
if (!cp) {
continue; continue;
} }
sscanf(buffer, "%*s %lu %lu", &ns[i], &ns[i]); sscanf(cp, "%*s %lu %lu", &ns[i], &ns[i]);
fprintf(stderr, "%-22s%8lu\n", benchmarks[i], ns[i]); fprintf(stderr, "%-22s%8lu\n", benchmarks[i], ns[i]);
} }
} }
@ -592,15 +593,15 @@ TEST(logd, benchmark) {
#endif #endif
#ifdef TARGET_USES_LOGD #ifdef TARGET_USES_LOGD
EXPECT_GE(25000UL, ns[log_maximum]); // 14055 user EXPECT_GE(30000UL, ns[log_maximum]); // 27305 user
#else #else
EXPECT_GE(10000UL, ns[log_maximum]); // 5637 kernel EXPECT_GE(10000UL, ns[log_maximum]); // 5637 kernel
#endif #endif
EXPECT_GE(4000UL, ns[clock_overhead]); // 2008 EXPECT_GE(4096UL, ns[clock_overhead]); // 4095
#ifdef TARGET_USES_LOGD #ifdef TARGET_USES_LOGD
EXPECT_GE(250000UL, ns[log_overhead]); // 113219 user EXPECT_GE(250000UL, ns[log_overhead]); // 121876 user
#else #else
EXPECT_GE(100000UL, ns[log_overhead]); // 50945 kernel EXPECT_GE(100000UL, ns[log_overhead]); // 50945 kernel
#endif #endif
@ -612,7 +613,7 @@ TEST(logd, benchmark) {
#endif #endif
#ifdef TARGET_USES_LOGD #ifdef TARGET_USES_LOGD
EXPECT_GE(20000000UL, ns[log_delay]); // 9542541 user EXPECT_GE(20000000UL, ns[log_delay]); // 10500289 user
#else #else
EXPECT_GE(55000UL, ns[log_delay]); // 27341 kernel EXPECT_GE(55000UL, ns[log_delay]); // 27341 kernel
#endif #endif
@ -642,36 +643,61 @@ TEST(logd, benchmark) {
// 0/4225? 7454388/303656 31488/755 // 0/4225? 7454388/303656 31488/755
// ^-- benchmark_statistics_found // ^-- benchmark_statistics_found
unsigned long nowSize = atol(benchmark_statistics_found); unsigned long nowSpamSize = atol(benchmark_statistics_found);
delete [] buf; delete [] buf;
ASSERT_NE(0UL, nowSize); ASSERT_NE(0UL, nowSpamSize);
// Determine if we have the spam filter enabled
int sock = socket_local_client("logd", int sock = socket_local_client("logd",
ANDROID_SOCKET_NAMESPACE_RESERVED, ANDROID_SOCKET_NAMESPACE_RESERVED,
SOCK_STREAM); SOCK_STREAM);
ASSERT_TRUE(sock >= 0);
static const char getPruneList[] = "getPruneList";
if (write(sock, getPruneList, sizeof(getPruneList)) > 0) {
char buffer[80];
memset(buffer, 0, sizeof(buffer));
read(sock, buffer, sizeof(buffer));
char *cp = strchr(buffer, '\n');
if (!cp || (cp[1] != '~') || (cp[2] != '!')) {
close(sock);
fprintf(stderr,
"WARNING: "
"Logger has SPAM filtration turned off \"%s\"\n", buffer);
return;
}
} else {
int save_errno = errno;
close(sock);
FAIL() << "Can not send " << getPruneList << " to logger -- " << strerror(save_errno);
}
static const unsigned long expected_absolute_minimum_log_size = 65536UL; static const unsigned long expected_absolute_minimum_log_size = 65536UL;
unsigned long totalSize = expected_absolute_minimum_log_size; unsigned long totalSize = expected_absolute_minimum_log_size;
if (sock >= 0) { static const char getSize[] = {
static const char getSize[] = { 'g', 'e', 't', 'L', 'o', 'g', 'S', 'i', 'z', 'e', ' ',
'g', 'e', 't', 'L', 'o', 'g', 'S', 'i', 'z', 'e', ' ', LOG_ID_MAIN + '0', '\0'
LOG_ID_MAIN + '0', '\0' };
}; if (write(sock, getSize, sizeof(getSize)) > 0) {
if (write(sock, getSize, sizeof(getSize)) > 0) { char buffer[80];
char buffer[80]; memset(buffer, 0, sizeof(buffer));
memset(buffer, 0, sizeof(buffer)); read(sock, buffer, sizeof(buffer));
read(sock, buffer, sizeof(buffer)); totalSize = atol(buffer);
totalSize = atol(buffer); if (totalSize < expected_absolute_minimum_log_size) {
if (totalSize < expected_absolute_minimum_log_size) { fprintf(stderr,
totalSize = expected_absolute_minimum_log_size; "WARNING: "
} "Logger had unexpected referenced size \"%s\"\n", buffer);
totalSize = expected_absolute_minimum_log_size;
} }
close(sock);
} }
close(sock);
// logd allows excursions to 110% of total size // logd allows excursions to 110% of total size
totalSize = (totalSize * 11 ) / 10; totalSize = (totalSize * 11 ) / 10;
// 50% threshold for SPAM filter (<20% typical, lots of engineering margin) // 50% threshold for SPAM filter (<20% typical, lots of engineering margin)
ASSERT_GT(totalSize, nowSize * 2); ASSERT_GT(totalSize, nowSpamSize * 2);
} }