Merge "Move system_shared_libs into target.bionic clause"
diff --git a/libc/Android.bp b/libc/Android.bp
index 4dfabaf..c1d6d6b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1202,6 +1202,7 @@
},
},
whole_static_libs: [
+ "libc_bionic_systrace",
"libsystemproperties",
],
cppflags: ["-Wold-style-cast"],
@@ -1938,11 +1939,6 @@
"//external/scudo",
"//system/core/property_service/libpropertyinfoparser",
"//system/extras/toolchain-extras",
- // TODO(b/153662223): Clean up these users that needed visibility when
- // the implicit addition of system Bionic paths was removed.
- "//art/tools/cpp-define-generator",
- "//external/boringssl",
- "//external/minijail",
],
stl: "none",
diff --git a/libc/bionic/bionic_systrace.cpp b/libc/bionic/bionic_systrace.cpp
index 0de51c5..fd97712 100644
--- a/libc/bionic/bionic_systrace.cpp
+++ b/libc/bionic/bionic_systrace.cpp
@@ -14,50 +14,52 @@
* limitations under the License.
*/
-#include "private/bionic_systrace.h"
-
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "private/bionic_lock.h"
+#include "private/bionic_systrace.h"
+#include "private/CachedProperty.h"
+
#include <async_safe/log.h>
#include <cutils/trace.h> // For ATRACE_TAG_BIONIC.
-#include "private/CachedProperty.h"
-#include "private/bionic_lock.h"
-
#define WRITE_OFFSET 32
static Lock g_lock;
+static CachedProperty g_debug_atrace_tags_enableflags("debug.atrace.tags.enableflags");
+static uint64_t g_tags;
+static int g_trace_marker_fd = -1;
-bool should_trace(const uint64_t enable_tags) {
- static uint64_t tags_val;
- static CachedProperty tags_prop(kTraceTagsProp);
+static bool should_trace() {
g_lock.lock();
- if (tags_prop.DidChange()) {
- tags_val = strtoull(tags_prop.Get(), nullptr, 0);
+ if (g_debug_atrace_tags_enableflags.DidChange()) {
+ g_tags = strtoull(g_debug_atrace_tags_enableflags.Get(), nullptr, 0);
}
g_lock.unlock();
- return tags_val & enable_tags;
+ return ((g_tags & ATRACE_TAG_BIONIC) != 0);
}
-int get_trace_marker_fd() {
- static int opened_trace_marker_fd = -1;
+static int get_trace_marker_fd() {
g_lock.lock();
- if (opened_trace_marker_fd == -1) {
- opened_trace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
- if (opened_trace_marker_fd == -1) {
- opened_trace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
+ if (g_trace_marker_fd == -1) {
+ g_trace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
+ if (g_trace_marker_fd == -1) {
+ g_trace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
}
}
g_lock.unlock();
- return opened_trace_marker_fd;
+ return g_trace_marker_fd;
}
-// event could be 'B' for begin or 'E' for end.
-void output_trace(const char* message, const char event) {
+void bionic_trace_begin(const char* message) {
+ if (!should_trace()) {
+ return;
+ }
+
int trace_marker_fd = get_trace_marker_fd();
if (trace_marker_fd == -1) {
return;
@@ -67,22 +69,13 @@
// kernel trace_marker.
int length = strlen(message);
char buf[length + WRITE_OFFSET];
- size_t len =
- async_safe_format_buffer(buf, length + WRITE_OFFSET, "%c|%d|%s", event, getpid(), message);
+ size_t len = async_safe_format_buffer(buf, length + WRITE_OFFSET, "B|%d|%s", getpid(), message);
// Tracing may stop just after checking property and before writing the message.
// So the write is acceptable to fail. See b/20666100.
TEMP_FAILURE_RETRY(write(trace_marker_fd, buf, len));
}
-void bionic_trace_begin(const char* message) {
- if (!should_trace()) {
- return;
- }
-
- output_trace(message);
-}
-
void bionic_trace_end() {
if (!should_trace()) {
return;
diff --git a/libc/bionic/system_property_set.cpp b/libc/bionic/system_property_set.cpp
index 6823b6a..212aafc 100644
--- a/libc/bionic/system_property_set.cpp
+++ b/libc/bionic/system_property_set.cpp
@@ -41,13 +41,12 @@
#include <sys/_system_properties.h>
#include <unistd.h>
-#include <async_safe/CHECK.h>
#include <async_safe/log.h>
-#include <system_properties/prop_trace.h>
+#include <async_safe/CHECK.h>
+#include "private/bionic_defs.h"
#include "platform/bionic/macros.h"
#include "private/ScopedFd.h"
-#include "private/bionic_defs.h"
static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME;
static const char* kServiceVersionPropertyName = "ro.property_service.version";
@@ -250,8 +249,6 @@
if (key == nullptr) return -1;
if (value == nullptr) value = "";
- SyspropTrace trace(key, value, nullptr /* prop_info */, PropertyAction::kPropertySet);
-
if (g_propservice_protocol_version == 0) {
detect_protocol_version();
}
diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h
index 7f00a7a..46e3543 100644
--- a/libc/include/netinet/in.h
+++ b/libc/include/netinet/in.h
@@ -33,7 +33,18 @@
#include <sys/cdefs.h>
#include <sys/socket.h>
+// Include linux/socket.h first to trigger the header guard without
+// the__kernel_sockaddr_storage define, so its definition uses the
+// kernel name.
+#include <linux/socket.h>
+
+// Redefine __kernel_sockaddr_storage to sockaddr_storage so that
+// the structs defined in linux/in.h use the sockaddr_storage defined
+// in sys/sockets.h.
+#define __kernel_sockaddr_storage sockaddr_storage
#include <linux/in.h>
+#undef __kernel_sockaddr_storage
+
#include <linux/in6.h>
#include <linux/ipv6.h>
diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h
index 3ecbcce..f33f112 100644
--- a/libc/include/sys/socket.h
+++ b/libc/include/sys/socket.h
@@ -31,7 +31,6 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <linux/socket.h>
#include <asm/fcntl.h>
#include <asm/socket.h>
@@ -71,6 +70,16 @@
char sa_data[14];
};
+struct sockaddr_storage {
+ union {
+ struct {
+ sa_family_t ss_family;
+ char __data[128 - sizeof(sa_family_t)];
+ };
+ void* __align;
+ };
+};
+
struct linger {
int l_onoff;
int l_linger;
diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index 04eb5f1..2089285 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -89,8 +89,6 @@
"udphdr": "__kernel_udphdr",
# This causes problems when trying to export the headers for the ndk.
"__attribute_const__": "__attribute__((__const__))",
- # In this case the kernel tries to keep out of our way, but we're happy to use its definition.
- "__kernel_sockaddr_storage": "sockaddr_storage",
# The kernel started using struct __kernel_old_timeval in some places,
# which is the exact same as struct timeval. Replace that name with
# timeval so that kernel structures all use the same named structure.
diff --git a/libc/kernel/uapi/linux/in.h b/libc/kernel/uapi/linux/in.h
index 10c6416..6f11f52 100644
--- a/libc/kernel/uapi/linux/in.h
+++ b/libc/kernel/uapi/linux/in.h
@@ -155,21 +155,21 @@
#define IP_MSFILTER_SIZE(numsrc) (sizeof(struct ip_msfilter) - sizeof(__u32) + (numsrc) * sizeof(__u32))
struct group_req {
__u32 gr_interface;
- struct sockaddr_storage gr_group;
+ struct __kernel_sockaddr_storage gr_group;
};
struct group_source_req {
__u32 gsr_interface;
- struct sockaddr_storage gsr_group;
- struct sockaddr_storage gsr_source;
+ struct __kernel_sockaddr_storage gsr_group;
+ struct __kernel_sockaddr_storage gsr_source;
};
struct group_filter {
__u32 gf_interface;
- struct sockaddr_storage gf_group;
+ struct __kernel_sockaddr_storage gf_group;
__u32 gf_fmode;
__u32 gf_numsrc;
- struct sockaddr_storage gf_slist[1];
+ struct __kernel_sockaddr_storage gf_slist[1];
};
-#define GROUP_FILTER_SIZE(numsrc) (sizeof(struct group_filter) - sizeof(struct sockaddr_storage) + (numsrc) * sizeof(struct sockaddr_storage))
+#define GROUP_FILTER_SIZE(numsrc) (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
#endif
#if __UAPI_DEF_IN_PKTINFO
struct in_pktinfo {
diff --git a/libc/kernel/uapi/linux/rds.h b/libc/kernel/uapi/linux/rds.h
index bc29233..7006c87 100644
--- a/libc/kernel/uapi/linux/rds.h
+++ b/libc/kernel/uapi/linux/rds.h
@@ -217,7 +217,7 @@
__u64 flags;
};
struct rds_get_mr_for_dest_args {
- struct sockaddr_storage dest_addr;
+ struct __kernel_sockaddr_storage dest_addr;
struct rds_iovec vec;
__u64 cookie_addr;
__u64 flags;
diff --git a/libc/kernel/uapi/linux/socket.h b/libc/kernel/uapi/linux/socket.h
index 608d31f..7ce5304 100644
--- a/libc/kernel/uapi/linux/socket.h
+++ b/libc/kernel/uapi/linux/socket.h
@@ -20,7 +20,7 @@
#define _UAPI_LINUX_SOCKET_H
#define _K_SS_MAXSIZE 128
typedef unsigned short __kernel_sa_family_t;
-struct sockaddr_storage {
+struct __kernel_sockaddr_storage {
union {
struct {
__kernel_sa_family_t ss_family;
diff --git a/libc/kernel/uapi/linux/tcp.h b/libc/kernel/uapi/linux/tcp.h
index 99c5bff..c96d695 100644
--- a/libc/kernel/uapi/linux/tcp.h
+++ b/libc/kernel/uapi/linux/tcp.h
@@ -226,7 +226,7 @@
#define TCP_MD5SIG_FLAG_PREFIX 0x1
#define TCP_MD5SIG_FLAG_IFINDEX 0x2
struct tcp_md5sig {
- struct sockaddr_storage tcpm_addr;
+ struct __kernel_sockaddr_storage tcpm_addr;
__u8 tcpm_flags;
__u8 tcpm_prefixlen;
__u16 tcpm_keylen;
diff --git a/libc/kernel/uapi/rdma/rdma_user_cm.h b/libc/kernel/uapi/rdma/rdma_user_cm.h
index 9618734..7b1f7ee 100644
--- a/libc/kernel/uapi/rdma/rdma_user_cm.h
+++ b/libc/kernel/uapi/rdma/rdma_user_cm.h
@@ -88,7 +88,7 @@
__u32 id;
__u16 addr_size;
__u16 reserved;
- struct sockaddr_storage addr;
+ struct __kernel_sockaddr_storage addr;
};
struct rdma_ucm_resolve_ip {
struct sockaddr_in6 src_addr;
@@ -102,8 +102,8 @@
__u16 src_size;
__u16 dst_size;
__u32 reserved;
- struct sockaddr_storage src_addr;
- struct sockaddr_storage dst_addr;
+ struct __kernel_sockaddr_storage src_addr;
+ struct __kernel_sockaddr_storage dst_addr;
};
struct rdma_ucm_resolve_route {
__u32 id;
@@ -137,8 +137,8 @@
__u16 pkey;
__u16 src_size;
__u16 dst_size;
- struct sockaddr_storage src_addr;
- struct sockaddr_storage dst_addr;
+ struct __kernel_sockaddr_storage src_addr;
+ struct __kernel_sockaddr_storage dst_addr;
__u32 ibdev_index;
__u32 reserved1;
};
@@ -225,7 +225,7 @@
__u32 id;
__u16 addr_size;
__u16 join_flags;
- struct sockaddr_storage addr;
+ struct __kernel_sockaddr_storage addr;
};
struct rdma_ucm_get_event {
__aligned_u64 response;
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp
index 609f030..d23ab15 100644
--- a/libc/malloc_debug/malloc_debug.cpp
+++ b/libc/malloc_debug/malloc_debug.cpp
@@ -362,10 +362,9 @@
backtrace_shutdown();
- delete g_debug;
- g_debug = nullptr;
-
- DebugDisableFinalize();
+ // In order to prevent any issues of threads freeing previous pointers
+ // after the main thread calls this code, simply leak the g_debug pointer
+ // and do not destroy the debug disable pthread key.
}
void debug_get_malloc_leak_info(uint8_t** info, size_t* overall_size, size_t* info_size,
diff --git a/libc/malloc_debug/tests/malloc_debug_system_tests.cpp b/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
index 1bfe61e..b20cef7 100644
--- a/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <poll.h>
#include <signal.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -449,12 +450,12 @@
}
static constexpr int kExpectedExitCode = 30;
+static constexpr size_t kMaxThreads = sizeof(uint32_t) * 8;
TEST(MallocTests, DISABLED_exit_while_threads_allocating) {
- std::atomic_uint32_t thread_mask;
- thread_mask = 0;
+ std::atomic_uint32_t thread_mask = {};
- for (size_t i = 0; i < 32; i++) {
+ for (size_t i = 0; i < kMaxThreads; i++) {
std::thread malloc_thread([&thread_mask, i] {
while (true) {
void* ptr = malloc(100);
@@ -462,14 +463,14 @@
exit(1000);
}
free(ptr);
- thread_mask.fetch_or(1 << i);
+ thread_mask.fetch_or(1U << i);
}
});
malloc_thread.detach();
}
// Wait until each thread has done at least one allocation.
- while (thread_mask.load() != 0xffffffff)
+ while (thread_mask.load() != UINT32_MAX)
;
exit(kExpectedExitCode);
}
@@ -492,6 +493,59 @@
}
}
+TEST(MallocTests, DISABLED_exit_while_threads_freeing_allocs_with_header) {
+ static constexpr size_t kMaxAllocsPerThread = 1000;
+ std::atomic_uint32_t thread_mask = {};
+ std::atomic_bool run;
+
+ std::vector<std::vector<void*>> allocs(kMaxThreads);
+ // Pre-allocate a bunch of memory so that we can try to trigger
+ // the frees after the main thread finishes.
+ for (size_t i = 0; i < kMaxThreads; i++) {
+ for (size_t j = 0; j < kMaxAllocsPerThread; j++) {
+ void* ptr = malloc(8);
+ ASSERT_TRUE(ptr != nullptr);
+ allocs[i].push_back(ptr);
+ }
+ }
+
+ for (size_t i = 0; i < kMaxThreads; i++) {
+ std::thread malloc_thread([&thread_mask, &run, &allocs, i] {
+ thread_mask.fetch_or(1U << i);
+ while (!run)
+ ;
+ for (auto ptr : allocs[i]) {
+ free(ptr);
+ }
+ });
+ malloc_thread.detach();
+ }
+
+ // Wait until all threads are running.
+ while (thread_mask.load() != UINT32_MAX)
+ ;
+ run = true;
+ exit(kExpectedExitCode);
+}
+
+TEST(MallocDebugSystemTest, exit_while_threads_freeing_allocs_with_header) {
+ for (size_t i = 0; i < 50; i++) {
+ SCOPED_TRACE(::testing::Message() << "Run " << i);
+ pid_t pid;
+ // Enable guard to force the use of a header.
+ ASSERT_NO_FATAL_FAILURE(
+ Exec("MallocTests.DISABLED_exit_while_threads_freeing_allocs_with_header", "verbose guard",
+ &pid, kExpectedExitCode));
+
+ ASSERT_NO_FATAL_FAILURE(FindStrings(pid, std::vector<const char*>{"malloc debug enabled"}));
+
+ std::string log_str;
+ GetLogStr(pid, &log_str, LOG_ID_CRASH);
+ ASSERT_TRUE(log_str.find("Fatal signal") == std::string::npos)
+ << "Found crash in log.\nLog message: " << log_str;
+ }
+}
+
TEST(MallocTests, DISABLED_write_leak_info) {
TemporaryFile tf;
ASSERT_TRUE(tf.fd != -1);
@@ -555,8 +609,11 @@
static constexpr size_t kNumUnwinds = 1000;
for (size_t i = 0; i < kNumUnwinds; i++) {
std::unique_ptr<Backtrace> backtrace(Backtrace::Create(getpid(), tid));
+ // Only verify that there is at least one frame in the unwind.
+ // This is not a test of the unwinder and clang for arm seems to
+ // produces an increasing number of code that does not have unwind
+ // information.
ASSERT_TRUE(backtrace->Unwind(0)) << "Failed on unwind " << i;
- ASSERT_LT(1, backtrace->NumFrames()) << "Failed on unwind " << i;
}
running = false;
thread.join();
diff --git a/libc/private/bionic_systrace.h b/libc/private/bionic_systrace.h
index 6b11812..dbe1739 100644
--- a/libc/private/bionic_systrace.h
+++ b/libc/private/bionic_systrace.h
@@ -16,12 +16,8 @@
#pragma once
-#include <cutils/trace.h> // For ATRACE_TAG_BIONIC.
-
#include "platform/bionic/macros.h"
-static constexpr char kTraceTagsProp[] = "debug.atrace.tags.enableflags";
-
// Tracing class for bionic. To begin a trace at a specified point:
// ScopedTrace("Trace message");
// The trace will end when the contructor goes out of scope.
@@ -37,9 +33,5 @@
BIONIC_DISALLOW_COPY_AND_ASSIGN(ScopedTrace);
};
-int get_trace_marker_fd();
-bool should_trace(const uint64_t enable_tags = ATRACE_TAG_BIONIC);
-void output_trace(const char* message, const char event = 'B');
-
void bionic_trace_begin(const char* message);
void bionic_trace_end();
diff --git a/libc/system_properties/Android.bp b/libc/system_properties/Android.bp
index 361fc79..af8bda9 100644
--- a/libc/system_properties/Android.bp
+++ b/libc/system_properties/Android.bp
@@ -18,11 +18,9 @@
"contexts_serialized.cpp",
"prop_area.cpp",
"prop_info.cpp",
- "prop_trace.cpp",
"system_properties.cpp",
],
whole_static_libs: [
- "libc_bionic_systrace",
"libpropertyinfoparser",
],
header_libs: [
diff --git a/libc/system_properties/include/system_properties/prop_trace.h b/libc/system_properties/include/system_properties/prop_trace.h
deleted file mode 100644
index 7c65a6d..0000000
--- a/libc/system_properties/include/system_properties/prop_trace.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-#pragma once
-
-#include "platform/bionic/macros.h"
-
-#include "prop_info.h"
-
-// Tracing class for sysprop. To begin a trace at a specified point:
-// SyspropTrace trace ("prop_name", "prop_value");
-// The trace will end when the constructor goes out of scope.
-// For read-only properties (ro.*), also need to pass prop_info struct.
-
-enum class PropertyAction {
- kPropertyFind = 0,
- kPropertySet,
- kPropertyGetReadOnly,
- kPropertyGetReadWrite,
-};
-
-class __LIBC_HIDDEN__ SyspropTrace {
- public:
- explicit SyspropTrace(const char* prop_name, const char* prop_value, const prop_info* pi,
- PropertyAction action);
- ~SyspropTrace();
-
- private:
- const char* prop_name_;
- const char* prop_value_;
- const prop_info* prop_info_;
- PropertyAction prop_action_;
- bool output_trace_;
-
- BIONIC_DISALLOW_COPY_AND_ASSIGN(SyspropTrace);
-};
diff --git a/libc/system_properties/prop_trace.cpp b/libc/system_properties/prop_trace.cpp
deleted file mode 100644
index ac7ff94..0000000
--- a/libc/system_properties/prop_trace.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2020 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 "system_properties/prop_trace.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "private/CachedProperty.h"
-#include "private/bionic_lock.h"
-#include "private/bionic_systrace.h"
-
-#include <async_safe/log.h>
-#include <cutils/trace.h> // For ATRACE_TAG_SYSPROP.
-
-#define PROP_TRACE_MSG_LENGTH 1024
-
-static bool should_trace_prop(const char* prop_name) {
- // Should not trace kTraceTagsProp to avoid infinite recursion.
- // Because the following g_trace_enable_flags.Get() will get the property value
- // of kTraceTagsProp again, which in turn invokes should_trace_prop() here.
- if (prop_name == nullptr || !strcmp(prop_name, kTraceTagsProp)) {
- return false;
- }
-
- return should_trace(ATRACE_TAG_SYSPROP);
-}
-
-static void sysprop_trace_end() {
- int trace_marker_fd = get_trace_marker_fd();
- if (trace_marker_fd == -1) {
- return;
- }
-
- TEMP_FAILURE_RETRY(write(trace_marker_fd, "E|", 2));
-}
-
-static void get_sysprop_trace_end(const prop_info* pi, const char* prop_value,
- bool read_only = false) {
- const char* output_value;
- char message[PROP_TRACE_MSG_LENGTH];
-
- if (read_only) {
- if (pi->is_long()) {
- output_value = pi->long_value();
- } else {
- output_value = pi->value;
- }
- } else {
- output_value = prop_value;
- }
-
- snprintf(message, sizeof(message), "prop_get: %s, value: %s", pi->name,
- output_value ? output_value : "null_value");
- output_trace(message, 'E'); // 'E' for end.
-}
-
-SyspropTrace::SyspropTrace(const char* prop_name, const char* prop_value, const prop_info* pi,
- PropertyAction action)
- : prop_name_(prop_name),
- prop_value_(prop_value),
- prop_info_(pi),
- prop_action_(action),
- output_trace_(false) {
- if (!should_trace_prop(prop_name)) {
- return;
- }
-
- char message[PROP_TRACE_MSG_LENGTH];
- if (prop_action_ == PropertyAction::kPropertyFind) {
- snprintf(message, sizeof(message), "prop_find: %s", prop_name_);
- } else if (prop_action_ == PropertyAction::kPropertySet) {
- snprintf(message, sizeof(message), "prop_set: %s, value: %s", prop_name_,
- prop_value_ ? prop_value_ : "null_value");
- } else {
- // For property get, the prop_value_ will be resolved then printed in the destructor.
- snprintf(message, sizeof(message), "prop_get: %s", prop_name_);
- }
-
- output_trace(message, 'B'); // 'B' for begin.
- output_trace_ = true;
-}
-
-SyspropTrace::~SyspropTrace() {
- if (!output_trace_) {
- return;
- }
- if (prop_action_ == PropertyAction::kPropertyFind ||
- prop_action_ == PropertyAction::kPropertySet) {
- sysprop_trace_end();
- } else if (prop_action_ == PropertyAction::kPropertyGetReadOnly) {
- get_sysprop_trace_end(prop_info_, prop_value_, true /* read_only */);
- } else if (prop_action_ == PropertyAction::kPropertyGetReadWrite) {
- get_sysprop_trace_end(prop_info_, prop_value_, false /* read_only */);
- }
- output_trace_ = false;
-}
diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
index 344c838..1cb15c3 100644
--- a/libc/system_properties/system_properties.cpp
+++ b/libc/system_properties/system_properties.cpp
@@ -46,7 +46,6 @@
#include "system_properties/context_node.h"
#include "system_properties/prop_area.h"
#include "system_properties/prop_info.h"
-#include "system_properties/prop_trace.h"
#define SERIAL_DIRTY(serial) ((serial)&1)
#define SERIAL_VALUE_LEN(serial) ((serial) >> 24)
@@ -128,9 +127,6 @@
return nullptr;
}
- SyspropTrace trace(name, nullptr /* prop_value */, nullptr /* prop_info */,
- PropertyAction::kPropertyFind);
-
prop_area* pa = contexts_->GetPropAreaForName(name);
if (!pa) {
async_safe_format_log(ANDROID_LOG_WARN, "libc", "Access denied finding property \"%s\"", name);
@@ -205,10 +201,6 @@
// Read only properties don't need to copy the value to a temporary buffer, since it can never
// change. We use relaxed memory order on the serial load for the same reason.
if (is_read_only(pi->name)) {
- // The 2nd argument is not required for read-only property tracing, as the
- // value can be obtained via pi->value or pi->long_value().
- SyspropTrace trace(pi->name, nullptr /* prop_value */, pi /* prop_info */,
- PropertyAction::kPropertyGetReadOnly);
uint32_t serial = load_const_atomic(&pi->serial, memory_order_relaxed);
if (pi->is_long()) {
callback(cookie, pi->name, pi->long_value(), serial);
@@ -219,8 +211,6 @@
}
char value_buf[PROP_VALUE_MAX];
- SyspropTrace trace(pi->name, value_buf, pi /* prop_info */,
- PropertyAction::kPropertyGetReadWrite);
uint32_t serial = ReadMutablePropertyValue(pi, value_buf);
callback(cookie, pi->name, value_buf, serial);
}