diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
| commit | 7fb07008fc1ab2b7a6d8da3d7079cf0fafda9928 (patch) | |
| tree | 311d04d5aca4a4ab6d0660a6bd5af2fb7bd5e45b /indra/llcommon/llworkerthread.h | |
| parent | 3365a39080744af0566adb7b6efd8e53fc6b3339 (diff) | |
| parent | 9f9465f5bd2160f0245805e32644ce37f8c6cca6 (diff) | |
Merged in SL-17219 (pull request #992)
SL-17219
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
| -rw-r--r-- | indra/llcommon/llworkerthread.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h index 0387e75c65..06bbb7369e 100644 --- a/indra/llcommon/llworkerthread.h +++ b/indra/llcommon/llworkerthread.h @@ -56,7 +56,7 @@ public: virtual ~WorkRequest(); // use deleteRequest() public: - WorkRequest(handle_t handle, U32 priority, LLWorkerClass* workerclass, S32 param); + WorkRequest(handle_t handle, LLWorkerClass* workerclass, S32 param); S32 getParam() { @@ -90,7 +90,7 @@ public: /*virtual*/ S32 update(F32 max_time_ms); - handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL); + handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param); S32 getNumDeletes() { return (S32)mDeleteList.size(); } // debug @@ -151,10 +151,6 @@ public: bool isWorking() { return getFlags(WCF_WORKING); } bool wasAborted() { return getFlags(WCF_ABORT_REQUESTED); } - // setPriority(): changes the priority of a request - void setPriority(U32 priority); - U32 getPriority() { return mRequestPriority; } - const std::string& getName() const { return mWorkerClassName; } protected: @@ -169,7 +165,7 @@ protected: void setWorkerThread(LLWorkerThread* workerthread); // addWork(): calls startWork, adds doWork() to queue - void addWork(S32 param, U32 priority = LLWorkerThread::PRIORITY_NORMAL); + void addWork(S32 param); // abortWork(): requests that work be aborted void abortWork(bool autocomplete); @@ -193,7 +189,6 @@ protected: LLWorkerThread* mWorkerThread; std::string mWorkerClassName; handle_t mRequestHandle; - U32 mRequestPriority; // last priority set private: LLMutex mMutex; |