Commit graph

43424 commits

Author SHA1 Message Date
Elliott Hughes
f4a27aee8d Merge "Fix some wcwidth() special cases." into main 2024-05-30 11:41:24 +00:00
Treehugger Robot
69efc8ce41 Merge "Remove unused Android.mk under bionic" into main am: f6486e0e71 am: 3fc8fc4bb7
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3107717

Change-Id: I5d9e76dc4e1582ca118e1ef60218534535f98c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:32:20 +00:00
Elliott Hughes
8f653f8ad9 bionic_allocator: more detailed and consistent error reporting.
I only came to improve the signature mismatch error, but I was then annoyed by the copy & paste of the other checks.

get_chunk_size() seems to be deliberately avoiding any checks, though I think that might be a bug, and there should be a get_chunk_size() that _does_ check for most callers, and a get_chunk_size_unchecked() for the <sys/thread_properties.h> stuff that seems to want to only be "best effort" (but does still have _some_ possibility of aborting, in addition to the possibility of segfaulting).

Also a bit of "include what you use" after cider complained about all the unused includes in bionic_allocator.h.

Bug: https://issuetracker.google.com/341850283
Change-Id: I278b495601353733af516a2d60ed10feb9cef36b
2024-05-29 22:25:37 +00:00
Treehugger Robot
527b00e809 Merge "<sys/thread_properties.h>: remove stray semicolon in the implementation." into main am: 1395fa865f am: 00ee4c556b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3103457

Change-Id: I7defa9449cdb289c33e12361e1a4de4e573bac5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:23:48 +00:00
Elliott Hughes
7d0e6d7f67 Merge "Fix gettid() in functions that call fork() or equivalent." into main am: 7147a477c1 am: 3c7274d386
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3106497

Change-Id: I73006f8efaffe8e222dbc21ffd66ce6f1acb4972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:16:41 +00:00
Treehugger Robot
207cb76302 Merge "Revert^2 "Convert Android.mk under bionic to Android.bp"" into main am: cdaaa0a6bb am: 38ad80a3ad
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3102918

Change-Id: I8d51374d0dcf15dcc6e7f963a1a161d3a1574aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:07:26 +00:00
Automerger Merge Worker
981b587516 Merge "[automerger skipped] Skip 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: ce0d5cf48a -s ours" into main 2024-05-29 21:56:19 +00:00
Xin Li
958474f350 [automerger skipped] Skip 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: ce0d5cf48a -s ours
am skip reason: Merged-In I39365064e6c1538b0be1114479557d94a72ee369 with SHA-1 23a3482169 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/27555744

Change-Id: I71159110c9f800d28844508eb6e905ccf550b2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:55:51 +00:00
Xin Li
9c59dba8f3 [automerger skipped] Skip 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: ce0d5cf48a -s ours
am skip reason: Merged-In I39365064e6c1538b0be1114479557d94a72ee369 with SHA-1 23a3482169 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/27555744

Change-Id: I2fc25c08d87a363cf80deeeda272a92a38506311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:55:48 +00:00
Elliott Hughes
20a9f99b3b Fix some wcwidth() special cases.
Detailed explanation in the code comments.

Test: treehugger
Change-Id: I2aef2510724c1c622b83e226b51d4c8429b88272
2024-05-29 21:45:51 +00:00
Xin Li
15ccdaefd8 [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 431ecbca72 -s ours
am skip reason: Merged-In Ibe2ffda9155246f2217aaa0e7d589ed7effec311 with SHA-1 5951b4100c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/27273745

Change-Id: Id31e907cebece02702375d0fb03700abc3fda8ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:48:32 +00:00
Treehugger Robot
3fc8fc4bb7 Merge "Remove unused Android.mk under bionic" into main am: f6486e0e71
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3107717

Change-Id: I99607908de624c33d724063446b0b18fe6c11265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 12:34:37 +00:00
Elliott Hughes
13090d0bbf Spell "calling convention" out in full.
We only use this in one other place anyway.

Also be explicit about how `__tls_get_addr` and `___tls_get_addr` differ, since I missed that at first!

Change-Id: Ica214886c5346f118f063bca26e6dd8d74ee21f4
2024-05-29 12:34:18 +00:00
Treehugger Robot
f6486e0e71 Merge "Remove unused Android.mk under bionic" into main 2024-05-29 12:26:38 +00:00
Treehugger Robot
00ee4c556b Merge "<sys/thread_properties.h>: remove stray semicolon in the implementation." into main am: 1395fa865f
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3103457

Change-Id: I93338d0e279c99e91da9f19ac38e5e7f48c22d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 12:25:59 +00:00
Treehugger Robot
1395fa865f Merge "<sys/thread_properties.h>: remove stray semicolon in the implementation." into main 2024-05-29 12:02:00 +00:00
Elliott Hughes
3c7274d386 Merge "Fix gettid() in functions that call fork() or equivalent." into main am: 7147a477c1
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3106497

Change-Id: I9ef6fa58a96e6f21078fe8623753e0af4fdb73cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 11:41:04 +00:00
Elliott Hughes
7147a477c1 Merge "Fix gettid() in functions that call fork() or equivalent." into main 2024-05-29 11:23:06 +00:00
kellyhung
0aaab1b66f Remove unused Android.mk under bionic
Bug: b/311284462
Test: CIs
Change-Id: I2586c425616ef59dbf2ba88fe1cbaa75a3bc2d5c
2024-05-29 14:50:18 +08:00
Treehugger Robot
38ad80a3ad Merge "Revert^2 "Convert Android.mk under bionic to Android.bp"" into main am: cdaaa0a6bb
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3102918

Change-Id: I4729be9e39b605bb802392afdd568ec3fb1546f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:43:34 +00:00
Treehugger Robot
cdaaa0a6bb Merge "Revert^2 "Convert Android.mk under bionic to Android.bp"" into main 2024-05-29 03:25:37 +00:00
Elliott Hughes
c8ea872a2f Fix gettid() in functions that call fork() or equivalent.
Bug: https://github.com/android/ndk/issues/2024
Change-Id: Ia264ce219fac99e8823e60c4a2e0607af8518056
2024-05-28 15:23:52 +00:00
Xin Li
ce0d5cf48a Skip 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I39365064e6c1538b0be1114479557d94a72ee369
Change-Id: Ic67b42097570e2443193fcb9d37ae5c8a04e22d4
2024-05-27 23:23:17 -07:00
Elliott Hughes
118d5da898 pthread_exit(): reduce duplication.
Strictly, this is more of "swap one form of duplication for another", but
I found the existing code non-obvious in part because people have added new
code under existing comments (which don't apply), in two places. At this
point, duplicating the _condition_ (which is much less likely to change at
all, let alone grow more complex) clarifies the code and makes the comments
match the code they're adjacent to again.

Test: treehugger
Change-Id: Ic8f01dc5b4fd14e942bf8dd7c72cab7df06d99d5
2024-05-24 14:47:40 -04:00
Elliott Hughes
87589723cc <sys/thread_properties.h>: remove stray semicolon in the implementation.
Test: treehugger
Change-Id: I5f9d9d5b45ca74de2eb837c881582a6a87fdf0f6
2024-05-24 14:46:45 -04:00
Kelly Hung
9fb1a6cdbd Revert^2 "Convert Android.mk under bionic to Android.bp"
This reverts commit 1e32ad88ff.

Reason for revert: 1. aosp/3099017 merged. 2. verified in ABDT run
https://android-build.corp.google.com/abtd/run/L00400030004085752/

Change-Id: I6f07c67ab84ea93406dee88a5d20d0674a2d2a79
2024-05-24 13:56:08 +00:00
Android Build Coastguard Worker
aa9dd04911 Snap for 11881322 from 077af2a51a to 24Q3-release
Change-Id: Ib38970f33fceab4b32b3358974f05644af2458eb
2024-05-23 23:00:51 +00:00
Xin Li
431ecbca72 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Ibe2ffda9155246f2217aaa0e7d589ed7effec311
Change-Id: Ia5fa139b867a2043201c2253a7ccbff9607b8a83
2024-05-23 14:10:02 -07:00
Ryan Prichard
077af2a51a Merge "Revert^2 "Switch the loader to a noexcept version of libc++"" into main am: d475ee45aa am: 39a8277ac0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3073094

Change-Id: I0bd961a848738fbc06e29cf1c29e2ca259945f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:36:13 +00:00
Ryan Prichard
39a8277ac0 Merge "Revert^2 "Switch the loader to a noexcept version of libc++"" into main am: d475ee45aa
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3073094

Change-Id: Ibdf0247d840c5dda5b26ae90410e40ba789d80f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:18:27 +00:00
Ryan Prichard
d475ee45aa Merge "Revert^2 "Switch the loader to a noexcept version of libc++"" into main 2024-05-22 23:59:04 +00:00
Android Build Coastguard Worker
ed2b632c48 Snap for 11876238 from 47cb2775b7 to 24Q3-release
Change-Id: Ifc79ee0982ff4757e2b017581a72cc7c38d8facc
2024-05-22 23:01:17 +00:00
Steven Moreland
9ac6de1863 Merge "bionic: max_android_page_size to 16384" into main am: 5dd8ce7284 am: 8e73c1fe6b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3063230

Change-Id: I74180ef8083100567fd0a4099ecc490f8e5a4d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:22:14 +00:00
Steven Moreland
8e73c1fe6b Merge "bionic: max_android_page_size to 16384" into main am: 5dd8ce7284
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3063230

Change-Id: I10bd6cb14df5f04b423137e10b67234548ea72cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:01:39 +00:00
Steven Moreland
5dd8ce7284 Merge "bionic: max_android_page_size to 16384" into main 2024-05-22 21:41:54 +00:00
Christopher Ferris
7370db0af3 Merge "Read maps data before using and do safe reads." into main am: dc82bd1aae am: 5b573d3a7a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3093022

Change-Id: Id1a8a28a8966feb3ee823f035df4ad502e7aca94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:37:15 +00:00
Christopher Ferris
5b573d3a7a Merge "Read maps data before using and do safe reads." into main am: dc82bd1aae
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3093022

Change-Id: I95b991e11e27590c7c3f4aeef39de2a4e94e32d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:08:00 +00:00
Christopher Ferris
dc82bd1aae Merge "Read maps data before using and do safe reads." into main 2024-05-22 20:46:34 +00:00
Steven Moreland
8401230be6 bionic: max_android_page_size to 16384
The maximum page size Android supports
now is 16384, and Art only supports 16kB,
so we can save a bit of space.

Bug: 332556665
Test: N/A
Change-Id: I23df607bcc5cf9e96d7b6a66169413cd1a883f7e
2024-05-22 18:29:04 +00:00
Elliott Hughes
47cb2775b7 Merge "Don't leak a thread when timer_create() fails." into main am: 7c22b4c372 am: bab0010100
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3093205

Change-Id: I590e40a6eb195e83ad5f50535d819522a4e5b048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 12:14:00 +00:00
Elliott Hughes
bab0010100 Merge "Don't leak a thread when timer_create() fails." into main am: 7c22b4c372
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3093205

Change-Id: I67317733ecc70cafbf4df827f93bc6821ca9c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 11:57:30 +00:00
Elliott Hughes
7c22b4c372 Merge "Don't leak a thread when timer_create() fails." into main 2024-05-22 11:40:39 +00:00
Satish Yalla
10b0f112e0 Merge "Revert "Convert Android.mk under bionic to Android.bp"" into main am: b5c54ac8b6 am: 846af391c4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3095943

Change-Id: Ie97a0571cd637c0785e4aaf8ecaee8d84327655b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:19:31 +00:00
Satish Yalla
846af391c4 Merge "Revert "Convert Android.mk under bionic to Android.bp"" into main am: b5c54ac8b6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3095943

Change-Id: I0109afa7f1ed6028313f5f1f7221500ca7c17196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:02:32 +00:00
Satish Yalla
b5c54ac8b6 Merge "Revert "Convert Android.mk under bionic to Android.bp"" into main 2024-05-22 01:46:05 +00:00
Treehugger Robot
3dde44fb54 Merge "Convert Android.mk under bionic to Android.bp" into main am: d9864c21eb am: 05003aa452
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3057627

Change-Id: I9e2593de4e58ae5499a6fbf695baea6c9f6f1e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:43:28 +00:00
Christopher Ferris
65e349d6c8 Read maps data before using and do safe reads.
Rather than only updating the maps when a pc can't be found, always update
the maps before using them. This avoids issues where the maps change
and it could cause a crash reading from a map that has been modified.

This assumes that executed code never gets unloaded, or that the
code is unloaded so infrequently that it doesn't matter. This happens
because the pcs for the backtraces are gathered as the program runs
and those pcs are symbolized and made into relative pcs at a later time.

Also, add safe reading of the elf data when necessary to avoid any
crashes if maps are changing while this is running.

Since the MapEntry objects can be deleted, copy the values for
the current map in the backtrace code to detect when in our own code
instead of keeping a pointer.

Bug: 340988785

Test: malloc_debug unit/system tests pass.
Test: libmemunreachable tests pass.
Change-Id: Ica2ba50a5bcf9e19c7e4033e29a5a67a1847d1a6
2024-05-21 17:41:22 -07:00
Priyanka Advani
1e32ad88ff Revert "Convert Android.mk under bionic to Android.bp"
This reverts commit 12b2042a3f.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/342029467. Will be verifying through ABTD before submission.

Change-Id: I801b4999047732b86985f0be2f4aae90b9998e4a
2024-05-22 00:34:12 +00:00
Treehugger Robot
05003aa452 Merge "Convert Android.mk under bionic to Android.bp" into main am: d9864c21eb
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3057627

Change-Id: I4e5c7ec8533b9c3cb1cc962ceeb75e757ed72819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:24:23 +00:00
Treehugger Robot
d9864c21eb Merge "Convert Android.mk under bionic to Android.bp" into main 2024-05-22 00:07:46 +00:00