merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am: 2010fb6722
am: eebe01b523 * commit 'eebe01b523075c0634b04463c210510f192f154d': Fix potential race condition on CTS TC pthread_gettid_np
2015-11-12 01:00:14 -08:00 · 2015-11-11 19:00:17 +00:00 · 2015-11-11 18:57:14 +00:00 · 2015-11-11 18:53:16 +00:00 · 2015-11-11 04:54:52 +00:00 · 2015-10-25 01:00:18 -07:00
1 changed files with 7 additions and 0 deletions
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@ -1245,8 +1245,11 @@ TEST(pthread, pthread_attr_getstack_18908062) {
 }

 #if defined(__BIONIC__)
+static pthread_mutex_t gettid_mutex;
 static void* pthread_gettid_np_helper(void* arg) {
+  pthread_mutex_lock(&gettid_mutex);
  *reinterpret_cast<pid_t*>(arg) = gettid();
+  pthread_mutex_unlock(&gettid_mutex);
  return NULL;
 }
 #endif
@ -1257,11 +1260,15 @@ TEST(pthread, pthread_gettid_np) {

  pid_t t_gettid_result;
  pthread_t t;
+  pthread_mutex_init(&gettid_mutex, NULL);
+  pthread_mutex_lock(&gettid_mutex);
  pthread_create(&t, NULL, pthread_gettid_np_helper, &t_gettid_result);

  pid_t t_pthread_gettid_np_result = pthread_gettid_np(t);
+  pthread_mutex_unlock(&gettid_mutex);

  pthread_join(t, NULL);
+  pthread_mutex_destroy(&gettid_mutex);

  ASSERT_EQ(t_gettid_result, t_pthread_gettid_np_result);
 #else
Author	SHA1	Message	Date
The Android Automerger	5308b48c87	merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev	2015-11-12 01:00:14 -08:00
Daniel Xie	1a5bfd9eaf	Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am: 2010fb6722 am: eebe01b523 * commit 'eebe01b523075c0634b04463c210510f192f154d': Fix potential race condition on CTS TC pthread_gettid_np	2015-11-11 19:00:17 +00:00
Daniel Xie	eebe01b523	Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am: 2010fb6722 * commit '2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9': Fix potential race condition on CTS TC pthread_gettid_np	2015-11-11 18:57:14 +00:00
Daniel Xie	2010fb6722	Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev	2015-11-11 18:53:16 +00:00
Junjie Hu	4f80102935	Fix potential race condition on CTS TC pthread_gettid_np Root cause: If start_routine thread exits before pthread_gettid_np is invokded, the "tid" field will be cleared so that pthread_gettid_np will get "0" (which is cleared by kernel, due to the flag "CLONE_CHILD_CLEARTID" is set while calling clone system call inside pthread_create). Proposed patch: Use a mutex to guarantee pthread_gettid_np will be invoked and returned before the start_routine exits Signed-off-by: Junjie Hu <junjie.hu@mediatek.com> Change-Id: I22411f1b0f7446d76a0373cef4ccec858fac7018	2015-11-11 04:54:52 +00:00
The Android Automerger	7cfba3b057	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-10-25 01:00:18 -07:00
The Android Automerger	306ae636fd	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-10-19 06:43:02 -07:00
The Android Automerger	ab900ef9d4	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-10-15 01:00:23 -07:00
The Android Automerger	f2e4f3c1fa	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-10-14 01:00:28 -07:00
The Android Automerger	63265e59fa	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-10-13 01:00:24 -07:00
The Android Automerger	509940238d	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-09-30 01:00:22 -07:00
The Android Automerger	bad632a16a	merge in mnc-dr-ryu-release history after reset to mnc-dr-dev	2015-09-23 21:29:19 -07:00
The Android Automerger	22af16f113	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-08-26 01:01:31 -07:00
The Android Automerger	0aa018ccc0	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-08-12 01:00:55 -07:00
The Android Automerger	b97c8b4024	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-28 01:01:08 -07:00
The Android Automerger	2e8ac0b72c	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-25 01:01:52 -07:00
The Android Automerger	b6b6fcfa31	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-23 01:00:43 -07:00
The Android Automerger	f117eb873b	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-22 01:01:18 -07:00
The Android Automerger	89fddb56ed	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-14 01:00:58 -07:00
The Android Automerger	b530200ef3	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-11 01:00:59 -07:00
The Android Automerger	d5887751b2	merge in mnc-dr-release history after reset to mnc-dr-dev	2015-07-06 16:02:04 -07:00
The Android Automerger	2cddffe900	merge in mnc-release history after reset to mnc-dev	2015-06-18 01:00:43 -07:00
The Android Automerger	04363e4437	merge in mnc-release history after reset to mnc-dev	2015-06-17 01:00:50 -07:00
The Android Automerger	01c72f8c1c	merge in mnc-release history after reset to mnc-dev	2015-06-16 01:00:37 -07:00
The Android Automerger	0e7aca1dff	merge in mnc-release history after reset to mnc-dev	2015-06-15 11:57:26 -07:00
The Android Automerger	1a78032e30	merge in mnc-release history after reset to mnc-dev	2015-06-13 01:00:53 -07:00
The Android Automerger	64eb843f74	merge in mnc-release history after reset to mnc-dev	2015-06-11 01:00:38 -07:00
The Android Automerger	8b18a3c922	merge in mnc-release history after reset to mnc-dev	2015-06-09 01:00:42 -07:00
The Android Automerger	741df2881b	merge in mnc-release history after reset to mnc-dev	2015-06-07 01:00:29 -07:00
The Android Automerger	9660d32e74	merge in mnc-release history after reset to mnc-dev	2015-06-06 01:01:01 -07:00
The Android Automerger	2ff7422771	merge in mnc-release history after reset to mnc-dev	2015-06-03 01:01:03 -07:00
The Android Automerger	3619d6b922	merge in mnc-release history after reset to mnc-dev	2015-06-02 01:00:48 -07:00
The Android Automerger	2783166c35	merge in mnc-release history after reset to mnc-dev	2015-05-30 01:01:05 -07:00
Dmitriy Ivanov	c3351ea94d	Work around incorrect dt_needed entries This applies for apps targeting sdk<=22 and only for lp32 platforms. Bug: http://b/21364029 Change-Id: I903e81c9ccda2a8beaba1d132d68c77d30a4cdb2 (cherry picked from commit d974e8804689058714dc4fe9adcb57ee9a6996a8)	2015-05-28 17:42:27 -07:00
The Android Automerger	730c0a475c	merge in mnc-release history after reset to mnc-dev	2015-05-28 01:00:47 -07:00
The Android Automerger	c8e23a4c1a	merge in mnc-release history after reset to mnc-dev	2015-05-23 01:00:56 -07:00
The Android Automerger	4d49212a5f	merge in mnc-release history after reset to mnc-dev	2015-05-21 01:00:54 -07:00
The Android Automerger	aa3ef00a43	merge in mnc-release history after reset to mnc-dev	2015-05-19 01:01:19 -07:00
The Android Automerger	304307243f	merge in mnc-release history after reset to mnc-dev	2015-05-17 01:00:23 -07:00
The Android Automerger	51d3926d8a	merge in mnc-release history after reset to mnc-dev	2015-05-16 01:00:43 -07:00
John Reck	4cb434df9b	Fix regression in crash reporting Bug: 19532651 Partial revert of be0e43b77676338fd5e6a82c9cc2b6302d579de2 Change-Id: I99e220328aff985facb920ebcd84ac1a016759b5	2015-05-15 15:12:36 -07:00