2016-09-22 01:53:15 +02:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2017-02-11 04:02:51 +01:00
|
|
|
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
|
|
|
|
|
2016-09-22 01:53:15 +02:00
|
|
|
#include "android-base/properties.h"
|
|
|
|
|
|
|
|
#include <sys/system_properties.h>
|
2017-02-11 04:02:51 +01:00
|
|
|
#include <sys/_system_properties.h>
|
2016-09-22 01:53:15 +02:00
|
|
|
|
2017-02-17 02:14:10 +01:00
|
|
|
#include <algorithm>
|
|
|
|
#include <chrono>
|
Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds
Since 'struct timespec' members (time_t and long) are both 32bit on
32bit systems, and std::chrono::{seconds,nanoseconds}::rep are both
>32bit, timespec members assigned in DurationToTimeSpec() can have a
negative value, especially when WaitForProperty() is called with the
default timeout value which is std::chrono::milliseconds::max().
Regarding functionality, passing a negative value to
__system_property_wait() is okay because WaitForProperty() still
waits for the property value (so unit tests are passing), but while
WaitForProperty() does that, the function, to be more exact,
SystemProperties::Wait() in bionic/, consumes ~100% of CPU time. This
happens because SystemProperties::Wait() which implements
__system_property_wait() has a tight while-loop with a __futex_wait()
call, and the futex call immediately returns EINVAL when the timespec
passed in has a negative value.
With this CL, WaitForProperty() will never pass a negative timespec
to __system_property_wait(), and therefore the __futex_wait() call
in bionic works as expected without consuming too much CPU time even
on 32bit systems.
Bug: None
Test: libbase_test32 still passes
Test: strace no longer shows repeated EINVALs from __futex_wait
Change-Id: Id1834fac8cd2876b02dbe4479bf3d3eda2fa7da1
2018-02-14 03:28:50 +01:00
|
|
|
#include <limits>
|
2016-09-22 01:53:15 +02:00
|
|
|
#include <string>
|
|
|
|
|
|
|
|
#include <android-base/parseint.h>
|
|
|
|
|
|
|
|
namespace android {
|
|
|
|
namespace base {
|
|
|
|
|
|
|
|
std::string GetProperty(const std::string& key, const std::string& default_value) {
|
|
|
|
const prop_info* pi = __system_property_find(key.c_str());
|
|
|
|
if (pi == nullptr) return default_value;
|
|
|
|
|
2017-10-10 22:30:57 +02:00
|
|
|
std::string property_value;
|
|
|
|
__system_property_read_callback(pi,
|
|
|
|
[](void* cookie, const char*, const char* value, unsigned) {
|
|
|
|
auto property_value = reinterpret_cast<std::string*>(cookie);
|
|
|
|
*property_value = value;
|
|
|
|
},
|
|
|
|
&property_value);
|
2016-09-22 01:53:15 +02:00
|
|
|
|
|
|
|
// If the property exists but is empty, also return the default value.
|
|
|
|
// Since we can't remove system properties, "empty" is traditionally
|
|
|
|
// the same as "missing" (this was true for cutils' property_get).
|
2017-10-10 22:30:57 +02:00
|
|
|
return property_value.empty() ? default_value : property_value;
|
2016-09-22 01:53:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bool GetBoolProperty(const std::string& key, bool default_value) {
|
|
|
|
std::string value = GetProperty(key, "");
|
|
|
|
if (value == "1" || value == "y" || value == "yes" || value == "on" || value == "true") {
|
|
|
|
return true;
|
|
|
|
} else if (value == "0" || value == "n" || value == "no" || value == "off" || value == "false") {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return default_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T GetIntProperty(const std::string& key, T default_value, T min, T max) {
|
|
|
|
T result;
|
|
|
|
std::string value = GetProperty(key, "");
|
2016-10-12 02:09:00 +02:00
|
|
|
if (!value.empty() && android::base::ParseInt(value, &result, min, max)) return result;
|
2016-09-22 01:53:15 +02:00
|
|
|
return default_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T GetUintProperty(const std::string& key, T default_value, T max) {
|
|
|
|
T result;
|
|
|
|
std::string value = GetProperty(key, "");
|
2016-10-12 02:09:00 +02:00
|
|
|
if (!value.empty() && android::base::ParseUint(value, &result, max)) return result;
|
2016-09-22 01:53:15 +02:00
|
|
|
return default_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
template int8_t GetIntProperty(const std::string&, int8_t, int8_t, int8_t);
|
|
|
|
template int16_t GetIntProperty(const std::string&, int16_t, int16_t, int16_t);
|
|
|
|
template int32_t GetIntProperty(const std::string&, int32_t, int32_t, int32_t);
|
|
|
|
template int64_t GetIntProperty(const std::string&, int64_t, int64_t, int64_t);
|
|
|
|
|
|
|
|
template uint8_t GetUintProperty(const std::string&, uint8_t, uint8_t);
|
|
|
|
template uint16_t GetUintProperty(const std::string&, uint16_t, uint16_t);
|
|
|
|
template uint32_t GetUintProperty(const std::string&, uint32_t, uint32_t);
|
|
|
|
template uint64_t GetUintProperty(const std::string&, uint64_t, uint64_t);
|
|
|
|
|
|
|
|
bool SetProperty(const std::string& key, const std::string& value) {
|
|
|
|
return (__system_property_set(key.c_str(), value.c_str()) == 0);
|
|
|
|
}
|
|
|
|
|
2017-02-11 04:02:51 +01:00
|
|
|
struct WaitForPropertyData {
|
|
|
|
bool done;
|
|
|
|
const std::string* expected_value;
|
|
|
|
unsigned last_read_serial;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void WaitForPropertyCallback(void* data_ptr, const char*, const char* value, unsigned serial) {
|
|
|
|
WaitForPropertyData* data = reinterpret_cast<WaitForPropertyData*>(data_ptr);
|
|
|
|
if (*data->expected_value == value) {
|
|
|
|
data->done = true;
|
|
|
|
} else {
|
|
|
|
data->last_read_serial = serial;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-17 02:14:10 +01:00
|
|
|
// TODO: chrono_utils?
|
2017-03-25 00:52:29 +01:00
|
|
|
static void DurationToTimeSpec(timespec& ts, const std::chrono::milliseconds d) {
|
2017-02-17 02:14:10 +01:00
|
|
|
auto s = std::chrono::duration_cast<std::chrono::seconds>(d);
|
|
|
|
auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(d - s);
|
Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds
Since 'struct timespec' members (time_t and long) are both 32bit on
32bit systems, and std::chrono::{seconds,nanoseconds}::rep are both
>32bit, timespec members assigned in DurationToTimeSpec() can have a
negative value, especially when WaitForProperty() is called with the
default timeout value which is std::chrono::milliseconds::max().
Regarding functionality, passing a negative value to
__system_property_wait() is okay because WaitForProperty() still
waits for the property value (so unit tests are passing), but while
WaitForProperty() does that, the function, to be more exact,
SystemProperties::Wait() in bionic/, consumes ~100% of CPU time. This
happens because SystemProperties::Wait() which implements
__system_property_wait() has a tight while-loop with a __futex_wait()
call, and the futex call immediately returns EINVAL when the timespec
passed in has a negative value.
With this CL, WaitForProperty() will never pass a negative timespec
to __system_property_wait(), and therefore the __futex_wait() call
in bionic works as expected without consuming too much CPU time even
on 32bit systems.
Bug: None
Test: libbase_test32 still passes
Test: strace no longer shows repeated EINVALs from __futex_wait
Change-Id: Id1834fac8cd2876b02dbe4479bf3d3eda2fa7da1
2018-02-14 03:28:50 +01:00
|
|
|
ts.tv_sec = std::min<std::chrono::seconds::rep>(s.count(), std::numeric_limits<time_t>::max());
|
2017-02-17 02:14:10 +01:00
|
|
|
ts.tv_nsec = ns.count();
|
|
|
|
}
|
|
|
|
|
2017-03-25 00:52:29 +01:00
|
|
|
// TODO: boot_clock?
|
2017-02-27 22:23:50 +01:00
|
|
|
using AbsTime = std::chrono::time_point<std::chrono::steady_clock>;
|
|
|
|
|
2017-03-25 00:52:29 +01:00
|
|
|
static void UpdateTimeSpec(timespec& ts, std::chrono::milliseconds relative_timeout,
|
|
|
|
const AbsTime& start_time) {
|
2017-02-17 02:14:10 +01:00
|
|
|
auto now = std::chrono::steady_clock::now();
|
2017-03-25 00:52:29 +01:00
|
|
|
auto time_elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);
|
|
|
|
if (time_elapsed >= relative_timeout) {
|
2017-02-17 02:14:10 +01:00
|
|
|
ts = { 0, 0 };
|
|
|
|
} else {
|
2017-03-25 00:52:29 +01:00
|
|
|
auto remaining_timeout = relative_timeout - time_elapsed;
|
2017-02-17 02:14:10 +01:00
|
|
|
DurationToTimeSpec(ts, remaining_timeout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-27 22:23:50 +01:00
|
|
|
// Waits for the system property `key` to be created.
|
|
|
|
// Times out after `relative_timeout`.
|
|
|
|
// Sets absolute_timeout which represents absolute time for the timeout.
|
|
|
|
// Returns nullptr on timeout.
|
|
|
|
static const prop_info* WaitForPropertyCreation(const std::string& key,
|
|
|
|
const std::chrono::milliseconds& relative_timeout,
|
2017-03-25 00:52:29 +01:00
|
|
|
const AbsTime& start_time) {
|
2017-02-11 04:02:51 +01:00
|
|
|
// Find the property's prop_info*.
|
|
|
|
const prop_info* pi;
|
|
|
|
unsigned global_serial = 0;
|
|
|
|
while ((pi = __system_property_find(key.c_str())) == nullptr) {
|
|
|
|
// The property doesn't even exist yet.
|
|
|
|
// Wait for a global change and then look again.
|
2017-02-27 22:23:50 +01:00
|
|
|
timespec ts;
|
2017-03-25 00:52:29 +01:00
|
|
|
UpdateTimeSpec(ts, relative_timeout, start_time);
|
2017-02-27 22:23:50 +01:00
|
|
|
if (!__system_property_wait(nullptr, global_serial, &global_serial, &ts)) return nullptr;
|
2017-02-11 04:02:51 +01:00
|
|
|
}
|
2017-02-27 22:23:50 +01:00
|
|
|
return pi;
|
|
|
|
}
|
|
|
|
|
2017-03-25 00:52:29 +01:00
|
|
|
bool WaitForProperty(const std::string& key, const std::string& expected_value,
|
2017-02-27 22:23:50 +01:00
|
|
|
std::chrono::milliseconds relative_timeout) {
|
2017-03-25 00:52:29 +01:00
|
|
|
auto start_time = std::chrono::steady_clock::now();
|
|
|
|
const prop_info* pi = WaitForPropertyCreation(key, relative_timeout, start_time);
|
2017-02-27 22:23:50 +01:00
|
|
|
if (pi == nullptr) return false;
|
2017-02-11 04:02:51 +01:00
|
|
|
|
|
|
|
WaitForPropertyData data;
|
|
|
|
data.expected_value = &expected_value;
|
|
|
|
data.done = false;
|
|
|
|
while (true) {
|
2017-02-27 22:23:50 +01:00
|
|
|
timespec ts;
|
2017-02-11 04:02:51 +01:00
|
|
|
// Check whether the property has the value we're looking for?
|
|
|
|
__system_property_read_callback(pi, WaitForPropertyCallback, &data);
|
2017-02-17 02:14:10 +01:00
|
|
|
if (data.done) return true;
|
2017-02-11 04:02:51 +01:00
|
|
|
|
2017-02-17 02:14:10 +01:00
|
|
|
// It didn't, so wait for the property to change before checking again.
|
2017-03-25 00:52:29 +01:00
|
|
|
UpdateTimeSpec(ts, relative_timeout, start_time);
|
2017-02-17 02:14:10 +01:00
|
|
|
uint32_t unused;
|
|
|
|
if (!__system_property_wait(pi, data.last_read_serial, &unused, &ts)) return false;
|
2017-02-11 04:02:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-27 22:23:50 +01:00
|
|
|
bool WaitForPropertyCreation(const std::string& key,
|
|
|
|
std::chrono::milliseconds relative_timeout) {
|
2017-03-25 00:52:29 +01:00
|
|
|
auto start_time = std::chrono::steady_clock::now();
|
|
|
|
return (WaitForPropertyCreation(key, relative_timeout, start_time) != nullptr);
|
2017-02-27 22:23:50 +01:00
|
|
|
}
|
|
|
|
|
2016-09-22 01:53:15 +02:00
|
|
|
} // namespace base
|
|
|
|
} // namespace android
|