diff options
| author | Bob Lee <crazybob@crazybob.org> | 2009-09-16 10:23:01 -0700 |
|---|---|---|
| committer | Bob Lee <crazybob@crazybob.org> | 2009-09-16 10:23:01 -0700 |
| commit | f56201c2c2ff6e2c9f22cc0b5e98dec7a55804eb (patch) | |
| tree | 5fb6f9bbef0c2f68ebf4c65f178b9516e3f3177a /vm/Thread.h | |
| parent | f6a6f20adbb2b23a30508df18136d0ef064c72bb (diff) | |
| parent | 3eae287ea5c8df8674059716d4cea6ed713b7fe0 (diff) | |
| download | android_dalvik-f56201c2c2ff6e2c9f22cc0b5e98dec7a55804eb.tar.gz android_dalvik-f56201c2c2ff6e2c9f22cc0b5e98dec7a55804eb.tar.bz2 android_dalvik-f56201c2c2ff6e2c9f22cc0b5e98dec7a55804eb.zip | |
resolved conflicts for merge of 3eae287e to master
Diffstat (limited to 'vm/Thread.h')
| -rw-r--r-- | vm/Thread.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/vm/Thread.h b/vm/Thread.h index 1b01e08c2..e12088dfe 100644 --- a/vm/Thread.h +++ b/vm/Thread.h @@ -53,7 +53,6 @@ typedef enum ThreadStatus { THREAD_STARTING = 6, /* started, not yet on thread list */ THREAD_NATIVE = 7, /* off in a JNI native method */ THREAD_VMWAIT = 8, /* waiting on a VM resource */ - THREAD_PAGING = 9, /* paging memory */ } ThreadStatus; /* thread priorities, from java.lang.Thread */ @@ -81,6 +80,11 @@ void dvmSlayDaemons(void); #define kMaxStackSize (256*1024 + STACK_OVERFLOW_RESERVE) /* + * System thread state. See native/SystemThread.h. + */ +typedef struct SystemThread SystemThread; + +/* * Our per-thread data. * * These are allocated on the system heap. @@ -223,10 +227,8 @@ typedef struct Thread { struct ShadowSpace* shadowSpace; #endif - /* /proc/PID/task/TID/stat */ - int statFile; - /* offset of state char in stat file, last we checked */ - int stateOffset; + /* system thread state */ + SystemThread* systemThread; } Thread; /* start point for an internal thread; mimics pthread args */ @@ -435,7 +437,6 @@ void dvmChangeThreadSchedulerPolicy(SchedPolicy policy); */ void dvmChangeThreadPriority(Thread* thread, int newPriority); - /* * Debug: dump information about a single thread. */ @@ -449,14 +450,6 @@ void dvmDumpThreadEx(const DebugOutputTarget* target, Thread* thread, void dvmDumpAllThreads(bool grabLock); void dvmDumpAllThreadsEx(const DebugOutputTarget* target, bool grabLock); -/* - * Reads the native thread status. If the thread is in native code, this - * function queries the native thread state and converts it to an equivalent - * ThreadStatus. If the native status can't be read, this function returns - * THREAD_NATIVE. - */ -ThreadStatus dvmGetNativeThreadStatus(Thread* thread); - #ifdef WITH_MONITOR_TRACKING /* * Track locks held by the current thread, along with the stack trace at |