generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "bionic: tzset running hot"

Browse Source
This commit is contained in:
Mark Salyzyn
2015-10-02 21:04:50 +00:00
committed by Gerrit Code Review
parent cf92ebcfe3 d0578949ac
commit f7cf8b2c1f
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libc/tzcode/localtime.c
View File

@@ -1211,7 +1211,9 @@ tzsetwall(void)
settzname(); settzname();
} }
#include <sys/system_properties.h> // For __system_property_get. #include <stdbool.h>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h> // For __system_property_serial.
static void static void
tzset_locked(void) tzset_locked(void)
@@ -1221,9 +1223,27 @@ tzset_locked(void)
name = getenv("TZ"); name = getenv("TZ");
// try the "persist.sys.timezone" system property first // try the "persist.sys.timezone" system property first
static char buf[PROP_VALUE_MAX]; if (name == NULL) {
if (name == NULL && __system_property_get("persist.sys.timezone", buf) > 0) { static const prop_info *pi;
name = buf;
if (!pi) {
pi = __system_property_find("persist.sys.timezone");
}
if (pi) {
static char buf[PROP_VALUE_MAX];
static uint32_t s = -1;
static bool ok = false;
uint32_t serial;
serial = __system_property_serial(pi);
if (serial != s) {
ok = __system_property_read(pi, 0, buf) > 0;
s = serial;
}
if (ok) {
name = buf;
}
}
} }
if (name == NULL) { if (name == NULL) {