Simplify aos::Init
Most of the variants were to deal with core, which has been gone for a
year. Simplify those all into InitGoogle.
InitGoogle should be renamed to Init at some point. It does everything
now.
Change-Id: I738ee03e9c5b2e6348ef33302835f915df68011f
diff --git a/aos/ipc_lib/eventfd_latency.cc b/aos/ipc_lib/eventfd_latency.cc
index d146c13..47f6528 100644
--- a/aos/ipc_lib/eventfd_latency.cc
+++ b/aos/ipc_lib/eventfd_latency.cc
@@ -43,7 +43,13 @@
// Sleep between 1 and 15 ms.
::std::uniform_int_distribution<> distribution(1000, 15000);
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_sender_priority);
while (true) {
const monotonic_clock::time_point wakeup_time =
@@ -117,7 +123,13 @@
}
});
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_receiver_priority);
epoll.Run();
UnsetCurrentThreadRealtimePriority();
diff --git a/aos/ipc_lib/futex_latency.cc b/aos/ipc_lib/futex_latency.cc
index ef27e29..3d609f8 100644
--- a/aos/ipc_lib/futex_latency.cc
+++ b/aos/ipc_lib/futex_latency.cc
@@ -54,7 +54,13 @@
// Sleep between 1 and 15 ms.
::std::uniform_int_distribution<> distribution(1000, 15000);
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_sender_priority);
while (true) {
const monotonic_clock::time_point wakeup_time =
@@ -91,7 +97,13 @@
chrono::nanoseconds sum_latency = chrono::nanoseconds(0);
int latency_count = 0;
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_receiver_priority);
while (true) {
chrono::nanoseconds wakeup_latency;
diff --git a/aos/ipc_lib/ipc_comparison.cc b/aos/ipc_lib/ipc_comparison.cc
index 6435ee7..f5614a6 100644
--- a/aos/ipc_lib/ipc_comparison.cc
+++ b/aos/ipc_lib/ipc_comparison.cc
@@ -811,7 +811,13 @@
if (FLAGS_server_priority > 0) {
SetCurrentThreadRealtimePriority(FLAGS_server_priority);
}
- PinCurrentThreadToCPU(FLAGS_server_cpu);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_server_cpu, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
while (!done) {
const PingPongerInterface::Data *data = ping_ponger->Wait();
@@ -826,7 +832,13 @@
if (FLAGS_client_priority > 0) {
SetCurrentThreadRealtimePriority(FLAGS_client_priority);
}
- PinCurrentThreadToCPU(FLAGS_client_cpu);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_client_cpu, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
// Warm everything up.
for (int i = 0; i < 1000; ++i) {
@@ -899,9 +911,7 @@
"\ttcp\n"
"\ttcp_nodelay\n"
"\tudp\n");
- ::gflags::ParseCommandLineFlags(&argc, &argv, true);
-
- ::aos::InitNRT();
+ ::aos::InitGoogle(&argc, &argv);
return ::aos::Main(argc, argv);
}
diff --git a/aos/ipc_lib/named_pipe_latency.cc b/aos/ipc_lib/named_pipe_latency.cc
index 2bd24f3..030852c 100644
--- a/aos/ipc_lib/named_pipe_latency.cc
+++ b/aos/ipc_lib/named_pipe_latency.cc
@@ -47,7 +47,13 @@
// Sleep between 1 and 15 ms.
::std::uniform_int_distribution<> distribution(1000, 15000);
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_sender_priority);
while (true) {
const monotonic_clock::time_point wakeup_time =
@@ -125,7 +131,13 @@
}
});
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_receiver_priority);
epoll.Run();
UnsetCurrentThreadRealtimePriority();
diff --git a/aos/ipc_lib/signal_stress.cc b/aos/ipc_lib/signal_stress.cc
index 60243fd..a9fdb94 100644
--- a/aos/ipc_lib/signal_stress.cc
+++ b/aos/ipc_lib/signal_stress.cc
@@ -56,7 +56,13 @@
}
AOS_LOG(INFO, "Current PID: %d\n", pid);
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_sender_priority);
while (true) {
const monotonic_clock::time_point wakeup_time =
@@ -145,7 +151,13 @@
}
});
- PinCurrentThreadToCPU(FLAGS_core);
+ {
+ cpu_set_t cpuset;
+ CPU_ZERO(&cpuset);
+ CPU_SET(FLAGS_core, &cpuset);
+
+ SetCurrentThreadAffinity(cpuset);
+ }
SetCurrentThreadRealtimePriority(FLAGS_receiver_priority);
epoll.Run();
UnsetCurrentThreadRealtimePriority();