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

Unified Diff: sandbox/linux/services/thread_helpers.h

Issue 1310773006: Update sandbox/linux from upstream (Closed) Base URL: ssh://ssh.github.com/domokit/mojo.git@master
Patch Set: Update to 3909ebfa69566f7374a6900e63cd4d3c73a35378 Created 5 years, 4 months 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 | « sandbox/linux/services/syscall_wrappers.cc ('k') | sandbox/linux/services/thread_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/services/thread_helpers.h
diff --git a/sandbox/linux/services/thread_helpers.h b/sandbox/linux/services/thread_helpers.h
index f4abdffd03b418b15b07f08a6b32b3b08d499db9..73e041aa1b1ff745ffd115dbfb4c1903dd8daf7a 100644
--- a/sandbox/linux/services/thread_helpers.h
+++ b/sandbox/linux/services/thread_helpers.h
@@ -14,20 +14,24 @@ namespace sandbox {
class SANDBOX_EXPORT ThreadHelpers {
public:
- // Check whether the current process is single threaded. |proc_fd|
+ // Checks whether the current process is single threaded. |proc_fd|
// must be a file descriptor to /proc/ and remains owned by the
// caller.
static bool IsSingleThreaded(int proc_fd);
static bool IsSingleThreaded();
- // Crash if the current process is not single threaded. This will wait
+ // Crashes if the current process is not single threaded. This will wait
// on /proc to be updated. In the case where this doesn't crash, this will
// return promptly. In the case where this does crash, this will first wait
// for a few ms in Debug mode, a few seconds in Release mode.
static void AssertSingleThreaded(int proc_fd);
static void AssertSingleThreaded();
- // Stop |thread| and ensure that it does not have an entry in
+ // Starts |thread| and ensure that it has an entry in /proc/self/task/ from
+ // the point of view of the current thread.
+ static bool StartThreadAndWatchProcFS(int proc_fd, base::Thread* thread);
+
+ // Stops |thread| and ensure that it does not have an entry in
// /proc/self/task/ from the point of view of the current thread. This is
// the way to stop threads before calling IsSingleThreaded().
static bool StopThreadAndWatchProcFS(int proc_fd, base::Thread* thread);
« no previous file with comments | « sandbox/linux/services/syscall_wrappers.cc ('k') | sandbox/linux/services/thread_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698