Merge change Iba48fe2f
* changes:
Fix memory deallocation bug in toy vector class.
diff --git a/logcat/event-log-tags b/logcat/event-log-tags
index 1262f44..a51e2fa 100644
--- a/logcat/event-log-tags
+++ b/logcat/event-log-tags
@@ -375,9 +375,13 @@
#//device/dalvik/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.c
51000 socket_stats (send|1|2),(recv|1|2),(ip|1|5),(port|1|5),(close|1|5)
-# db stats. 0 is query, 1 is write (may become more fine grained in the
-# future)
-52000 db_operation (name|3),(op_type|1|5),(time|2|3)
+# Database operation samples.
+# db: the filename of the database
+# sql: the executed query (without query args)
+# time: cpu time millis (not wall time), including lock acquisition
+# blocking_package: if this is on a main thread, the package name, otherwise ""
+# sample_percent: the percent likelihood this query was logged
+52000 db_operation (db|3),(sql|3),(time|1|3),(blocking_package|3),(sample_percent|1|6)
# http request/response stats
52001 http_stats (useragent|3),(response|2|3),(processing|2|3),(tx|1|2),(rx|1|2)
diff --git a/rootdir/init.rc b/rootdir/init.rc
index f62d1d8..808255e 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -86,18 +86,13 @@
write /proc/apanic_console 1
- # Collect ramconsole data
- copy /proc/last_kmsg /data/dontpanic/last_kmsg
- chown root log /data/dontpanic/last_kmsg
- chmod 0640 /data/dontpanic/last_kmsg
-
# Same reason as /data above
mount yaffs2 mtd@cache /cache nosuid nodev
chown system cache /cache
chmod 0770 /cache
# This may have been created by the recovery system with odd permissions
- chown system system /cache/recovery
+ chown system cache /cache/recovery
chmod 0770 /cache/recovery
#change permissions on vmallocinfo so we can grab it from bugreports