merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h
index 850e22e..a0ce405 100644
--- a/libc/include/sys/types.h
+++ b/libc/include/sys/types.h
@@ -85,17 +85,13 @@
#ifndef _SSIZE_T_DEFINED_
#define _SSIZE_T_DEFINED_
-/* Traditionally, bionic's ssize_t was "long int". This causes GCC to emit warnings when you
+/* Traditionally, bionic's ssize_t was "long int". This caused GCC to emit warnings when you
* pass a ssize_t to a printf-style function. The correct type is __kernel_ssize_t, which is
* "int", which isn't an ABI change for C code (because they're the same size) but is an ABI
* change for C++ because "int" and "long int" mangle to "i" and "l" respectively. So until
- * we can fix the ABI, this is the best we can do. http://b/8253769. */
-#if defined(__cplusplus)
-typedef long int ssize_t;
-#else
+ * we can fix the ABI, this change should not be propagated to the NDK. http://b/8253769. */
typedef __kernel_ssize_t ssize_t;
#endif
-#endif
typedef __kernel_suseconds_t suseconds_t;
typedef __kernel_time_t time_t;
diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c
index 447907e..689bbd3 100644
--- a/libc/tzcode/localtime.c
+++ b/libc/tzcode/localtime.c
@@ -404,10 +404,7 @@
}
static int
-tzload(name, sp, doextend)
-register const char * name;
-register struct state * const sp;
-register const int doextend;
+tzload(const char* name, struct state* const sp, const int doextend)
{
register const char * p;
register int i;
@@ -2068,32 +2065,55 @@
}
// BEGIN android-added
-time_t
-mktime_tz(tmp, tz)
-struct tm * const tmp;
-char const * tz;
-{
- struct state st;
- if (tzload(tz, &st, TRUE) != 0) {
- // TODO: not sure what's best here, but for now, we fall back to gmt.
- gmtload(&st);
- }
- return time1(tmp, localsub, 0L, &st);
+
+// Caches the most recent timezone (http://b/8270865).
+static int __bionic_tzload_cached(const char* name, struct state* const sp, const int doextend) {
+ _tzLock();
+
+ // Our single-item cache.
+ static char* gCachedTimeZoneName;
+ static struct state gCachedTimeZone;
+
+ // Do we already have this timezone cached?
+ if (gCachedTimeZoneName != NULL && strcmp(name, gCachedTimeZoneName) == 0) {
+ *sp = gCachedTimeZone;
+ _tzUnlock();
+ return 0;
+ }
+
+ // Can we load it?
+ int rc = tzload(name, sp, doextend);
+ if (rc == 0) {
+ // Update the cache.
+ free(gCachedTimeZoneName);
+ gCachedTimeZoneName = strdup(name);
+ gCachedTimeZone = *sp;
+ }
+
+ _tzUnlock();
+ return rc;
}
-void
-localtime_tz(timep, tmp, tz)
-const time_t * const timep;
-struct tm * tmp;
-const char* tz;
-{
- struct state st;
- if (tzload(tz, &st, TRUE) != 0) {
- // TODO: not sure what's best here, but for now, we fall back to gmt.
- gmtload(&st);
- }
- localsub(timep, 0L, tmp, &st);
+// Non-standard API: mktime(3) but with an explicit timezone parameter.
+time_t mktime_tz(struct tm* const tmp, const char* tz) {
+ struct state st;
+ if (__bionic_tzload_cached(tz, &st, TRUE) != 0) {
+ // TODO: not sure what's best here, but for now, we fall back to gmt.
+ gmtload(&st);
+ }
+ return time1(tmp, localsub, 0L, &st);
}
+
+// Non-standard API: localtime(3) but with an explicit timezone parameter.
+void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz) {
+ struct state st;
+ if (__bionic_tzload_cached(tz, &st, TRUE) != 0) {
+ // TODO: not sure what's best here, but for now, we fall back to gmt.
+ gmtload(&st);
+ }
+ localsub(timep, 0L, tmp, &st);
+}
+
// END android-added
#ifdef STD_INSPIRED
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index bd59e05..91cf3a6 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
diff --git a/tests/Android.mk b/tests/Android.mk
index 1e4ef59..633a6a9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,6 +32,7 @@
benchmark_main.cpp \
math_benchmark.cpp \
string_benchmark.cpp \
+ time_benchmark.cpp \
# Build benchmarks for the device (with bionic's .so). Run with:
# adb shell bionic-benchmarks
diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index 7569d04..4b5a1f9 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -171,19 +171,15 @@
}
TEST(stdio, printf_ssize_t) {
-#if __BIONIC__
// http://b/8253769
- ASSERT_EQ(sizeof(__kernel_ssize_t), sizeof(long int));
ASSERT_EQ(sizeof(ssize_t), sizeof(long int));
-#else
- // TODO: add a .c file so we can test this for bionic --- our C ssize_t is fine.
- // For our 32-bit C++ ABI, we have a ssize_t definition that confuses GCC into saying:
+ ASSERT_EQ(sizeof(ssize_t), sizeof(size_t));
+ // For our 32-bit ABI, we had a ssize_t definition that confuses GCC into saying:
// error: format '%zd' expects argument of type 'signed size_t',
// but argument 4 has type 'ssize_t {aka long int}' [-Werror=format]
ssize_t v = 1;
char buf[32];
snprintf(buf, sizeof(buf), "%zd", v);
-#endif
}
TEST(stdio, popen) {
diff --git a/tests/time_benchmark.cpp b/tests/time_benchmark.cpp
new file mode 100644
index 0000000..75132e5
--- /dev/null
+++ b/tests/time_benchmark.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+#include "benchmark.h"
+
+#include <time.h>
+
+#if defined(__BIONIC__)
+
+// Used by the horrible android.text.format.Time class, which is used by Calendar. http://b/8270865.
+extern "C" void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz);
+
+static void BM_time_localtime_tz(int iters) {
+ StartBenchmarkTiming();
+
+ time_t now(time(NULL));
+ tm broken_down_time;
+ for (int i = 0; i < iters; ++i) {
+ localtime_tz(&now, &broken_down_time, "Europe/Berlin");
+ }
+
+ StopBenchmarkTiming();
+}
+BENCHMARK(BM_time_localtime_tz);
+#endif