diff options
Diffstat (limited to 'linden/indra/llcommon/llthread.h')
-rw-r--r-- | linden/indra/llcommon/llthread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h index 5c71c34..608b218 100644 --- a/linden/indra/llcommon/llthread.h +++ b/linden/indra/llcommon/llthread.h | |||
@@ -56,14 +56,14 @@ public: | |||
56 | virtual ~LLThread(); // Warning! You almost NEVER want to destroy a thread unless it's in the STOPPED state. | 56 | virtual ~LLThread(); // Warning! You almost NEVER want to destroy a thread unless it's in the STOPPED state. |
57 | virtual void shutdown(); // stops the thread | 57 | virtual void shutdown(); // stops the thread |
58 | 58 | ||
59 | static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure. | ||
60 | |||
61 | |||
62 | bool isQuitting() const { return (QUITTING == mStatus); } | 59 | bool isQuitting() const { return (QUITTING == mStatus); } |
63 | bool isStopped() const { return (STOPPED == mStatus); } | 60 | bool isStopped() const { return (STOPPED == mStatus); } |
64 | 61 | ||
65 | // PAUSE / RESUME functionality. See source code for important usage notes. | 62 | static U32 currentID(); // Return ID of current thread |
63 | static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure. | ||
64 | |||
66 | public: | 65 | public: |
66 | // PAUSE / RESUME functionality. See source code for important usage notes. | ||
67 | // Called from MAIN THREAD. | 67 | // Called from MAIN THREAD. |
68 | void pause(); | 68 | void pause(); |
69 | void unpause(); | 69 | void unpause(); |
@@ -127,7 +127,7 @@ protected: | |||
127 | class LLMutex | 127 | class LLMutex |
128 | { | 128 | { |
129 | public: | 129 | public: |
130 | LLMutex(apr_pool_t *apr_poolp); // Defaults to global pool, could use the thread pool as well. | 130 | LLMutex(apr_pool_t *apr_poolp); // NULL pool constructs a new pool for the mutex |
131 | ~LLMutex(); | 131 | ~LLMutex(); |
132 | 132 | ||
133 | void lock(); // blocks | 133 | void lock(); // blocks |