commit ab999f1f8ac5a4b256da1bef7119452e301ea2ff
author Erik Kline <ek@google.com> Wed Jul 04 11:29:31 2018 +0900
committer Erik Kline <ek@google.com> Wed Jul 04 14:53:33 2018 +0900
tree 9dc0286186bf8a98944cb11956a2ec97052ce50f
parent e9d3c7888ce94d1d3080ae3afd18d817fb2047da

Switch netd_defaults to C++17

Additionally:
    - use netd_defaults everywhere (except libbpf)
    - a few clang-format and clang-tidy inspired fixes
    - runtests.sh now tries to run "adb root"
    - runtests.sh now can be used to run the benchmarks

Test: as follows
    - built, flashed, booted
    - system/netd/tests/runtests.sh passes

Change-Id: Ifbfada63cf4e541c55f51396f618fff389d664a5

tests/benchmarks/connect_benchmark.cpp

diff --git a/tests/benchmarks/connect_benchmark.cpp b/tests/benchmarks/connect_benchmark.cpp
index 384feb1..2e157b8 100644
--- a/tests/benchmarks/connect_benchmark.cpp
+++ b/tests/benchmarks/connect_benchmark.cpp
@@ -119,7 +119,7 @@
 }
 
 static void ipv4_loopback(benchmark::State& state, const bool waitBetweenRuns) {
-    const int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
+    const int listensocket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
     const int port = bindAndListen(listensocket);
     if (port == -1) {
         state.SkipWithError("Unable to bind server socket");
@@ -131,7 +131,7 @@
     uint64_t iterations = 0;
 
     while (state.KeepRunning()) {
-        int sock = socket(AF_INET, SOCK_STREAM, 0);
+        int sock = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
         if (sock < 0) {
             state.SkipWithError(StringPrintf("socket() failed with errno=%d", errno).c_str());
             break;
@@ -155,7 +155,7 @@
 
         sockaddr_in6 client;
         socklen_t clientlen = sizeof(client);
-        int accepted = accept(listensocket, (sockaddr *) &client, &clientlen);
+        int accepted = accept4(listensocket, (sockaddr*) &client, &clientlen, SOCK_CLOEXEC);
         if (accepted < 0) {
             state.SkipWithError(StringPrintf("accept() failed with errno=%d", errno).c_str());
             close(sock);
@@ -176,7 +176,7 @@
 }
 
 static void ipv6_loopback(benchmark::State& state, const bool waitBetweenRuns) {
-    const int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
+    const int listensocket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
     const int port = bindAndListen(listensocket);
     if (port == -1) {
         state.SkipWithError("Unable to bind server socket");
@@ -188,7 +188,7 @@
     uint64_t iterations = 0;
 
     while (state.KeepRunning()) {
-        int sock = socket(AF_INET6, SOCK_STREAM, 0);
+        int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
         if (sock < 0) {
             state.SkipWithError(StringPrintf("socket() failed with errno=%d", errno).c_str());
             break;
@@ -212,7 +212,7 @@
 
         sockaddr_in6 client;
         socklen_t clientlen = sizeof(client);
-        int accepted = accept(listensocket, (sockaddr *) &client, &clientlen);
+        int accepted = accept4(listensocket, (sockaddr*) &client, &clientlen, SOCK_CLOEXEC);
         if (accepted < 0) {
             state.SkipWithError(StringPrintf("accept() failed with errno=%d", errno).c_str());
             close(sock);
@@ -247,7 +247,7 @@
 
     // SETUP
     if (isMaster) {
-        for (const auto setting : savedSettings) {
+        for (const auto& setting : savedSettings) {
             const char* prevEnvStr = getenv(setting.c_str());
             if (prevEnvStr != nullptr) {
                 prevSettings[setting.c_str()] = prevEnvStr;
@@ -273,7 +273,7 @@
 
     // TEARDOWN
     if (isMaster) {
-        for (const auto setting : savedSettings) {
+        for (const auto& setting : savedSettings) {
             if (prevSettings.count(setting)) {
                 setenv(setting.c_str(), prevSettings[setting].c_str(), 1);
             } else {