Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: src/trusted/service_runtime/thread_suspension_test.cc

Issue 11543028: Allow creating a NaClAppThread without creating a new host OS thread (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Review: Add NACL_WUR Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/trusted/service_runtime/sel_ldr_standard.c ('k') | src/trusted/service_runtime/win/thread_suspension.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/thread_suspension_test.cc
diff --git a/src/trusted/service_runtime/thread_suspension_test.cc b/src/trusted/service_runtime/thread_suspension_test.cc
index 1e52b1e07d1477fbff6927ed2ec1335e9df70bbe..0e921652bbc596fa61768d9279749cad7742aaf8 100644
--- a/src/trusted/service_runtime/thread_suspension_test.cc
+++ b/src/trusted/service_runtime/thread_suspension_test.cc
@@ -115,12 +115,13 @@ TEST_F(ThreadSuspensionTest, TestThreadSuspendsSynchronously) {
thread_args.natp = NULL;
thread_args.var = 0;
thread_args.should_exit = false;
- ASSERT_EQ(NaClThreadCreateJoinable(&app_thread.thread, MutatorThread,
+ app_thread.host_thread_is_defined = 1;
+ ASSERT_EQ(NaClThreadCreateJoinable(&app_thread.host_thread, MutatorThread,
&thread_args, NACL_KERN_STACK_SIZE), 1);
ASSERT_EQ(NaClAddThread(&app, &app_thread), 0);
TrySuspendingMutatorThread(&app, &thread_args.var);
thread_args.should_exit = true;
- NaClThreadJoin(&app_thread.thread);
+ NaClThreadJoin(&app_thread.host_thread);
}
@@ -172,12 +173,14 @@ TEST_F(ThreadSuspensionTest, TestNoDeadlockInSyscallCrossing) {
thread_args.natp = &app_thread;
thread_args.var = 0;
thread_args.should_exit = false;
- ASSERT_EQ(NaClThreadCreateJoinable(&app_thread.thread, SyscallInvokerThread,
+ app_thread.host_thread_is_defined = 1;
+ ASSERT_EQ(NaClThreadCreateJoinable(&app_thread.host_thread,
+ SyscallInvokerThread,
&thread_args, NACL_KERN_STACK_SIZE), 1);
ASSERT_EQ(NaClAddThread(&app, &app_thread), 0);
TrySuspendingSyscallInvokerThread(&app, &thread_args.var);
thread_args.should_exit = true;
- NaClThreadJoin(&app_thread.thread);
+ NaClThreadJoin(&app_thread.host_thread);
}
#endif
« no previous file with comments | « src/trusted/service_runtime/sel_ldr_standard.c ('k') | src/trusted/service_runtime/win/thread_suspension.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698