Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
ec1368be
Commit
ec1368be
authored
9 years ago
by
Rider Linden
Browse files
Options
Downloads
Patches
Plain Diff
Code review results with Nat
parent
ed409962
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llcoproceduremanager.cpp
+13
-14
13 additions, 14 deletions
indra/newview/llcoproceduremanager.cpp
indra/newview/llcoproceduremanager.h
+5
-4
5 additions, 4 deletions
indra/newview/llcoproceduremanager.h
with
18 additions
and
18 deletions
indra/newview/llcoproceduremanager.cpp
+
13
−
14
View file @
ec1368be
/**
* @file ll
updload
manager.cpp
* @file ll
coprocedure
manager.cpp
* @author Rider Linden
* @brief Singleton class for managing asset uploads to the sim.
*
...
...
@@ -44,18 +44,6 @@ LLCoprocedureManager::LLCoprocedureManager():
mCoroMapping
(),
mHTTPPolicy
(
LLCore
::
HttpRequest
::
DEFAULT_POLICY_ID
)
{
initializeManager
();
}
LLCoprocedureManager
::~
LLCoprocedureManager
()
{
shutdown
();
}
//=========================================================================
void
LLCoprocedureManager
::
initializeManager
()
{
mShutdown
=
false
;
// *TODO: Retrieve the actual number of concurrent coroutines fro gSavedSettings and
// clamp to a "reasonable" number.
...
...
@@ -74,6 +62,13 @@ void LLCoprocedureManager::initializeManager()
mWakeupTrigger
.
post
(
LLSD
());
}
LLCoprocedureManager
::~
LLCoprocedureManager
()
{
shutdown
();
}
//=========================================================================
void
LLCoprocedureManager
::
shutdown
(
bool
hardShutdown
)
{
CoroAdapterMap_t
::
iterator
it
;
...
...
@@ -123,7 +118,7 @@ void LLCoprocedureManager::cancelCoprocedure(const LLUUID &id)
return
;
}
for
(
Asset
Queue_t
::
iterator
it
=
mPendingCoprocs
.
begin
();
it
!=
mPendingCoprocs
.
end
();
++
it
)
for
(
Coproc
Queue_t
::
iterator
it
=
mPendingCoprocs
.
begin
();
it
!=
mPendingCoprocs
.
end
();
++
it
)
{
if
((
*
it
)
->
mId
==
id
)
{
...
...
@@ -164,6 +159,10 @@ void LLCoprocedureManager::coprocedureInvokerCoro(LLCoros::self& self, LLCoreHtt
LL_WARNS
()
<<
"Coprocedure("
<<
coproc
->
mName
<<
") id="
<<
coproc
->
mId
.
asString
()
<<
" threw an exception! Message=
\"
"
<<
e
.
what
()
<<
"
\"
"
<<
LL_ENDL
;
}
catch
(...)
{
LL_WARNS
()
<<
"A non std::exception was thrown from "
<<
coproc
->
mName
<<
" with id="
<<
coproc
->
mId
<<
"."
<<
LL_ENDL
;
}
LL_INFOS
()
<<
"Finished coprocedure("
<<
coproc
->
mName
<<
")"
<<
LL_ENDL
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llcoproceduremanager.h
+
5
−
4
View file @
ec1368be
/**
* @file ll
updload
manager.h
* @file ll
coprocedure
manager.h
* @author Rider Linden
* @brief Singleton class for managing asset uploads to the sim.
*
...
...
@@ -97,10 +97,12 @@ class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager >
CoProcedure_t
mProc
;
};
typedef
std
::
deque
<
QueuedCoproc
::
ptr_t
>
AssetQueue_t
;
// we use a deque here rather than std::queue since we want to be able to
// iterate through the queue and potentially erase an entry from the middle.
typedef
std
::
deque
<
QueuedCoproc
::
ptr_t
>
CoprocQueue_t
;
typedef
std
::
map
<
LLUUID
,
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
ptr_t
>
ActiveCoproc_t
;
Asset
Queue_t
mPendingCoprocs
;
Coproc
Queue_t
mPendingCoprocs
;
ActiveCoproc_t
mActiveCoprocs
;
bool
mShutdown
;
LLEventStream
mWakeupTrigger
;
...
...
@@ -111,7 +113,6 @@ class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager >
CoroAdapterMap_t
mCoroMapping
;
void
initializeManager
();
void
coprocedureInvokerCoro
(
LLCoros
::
self
&
self
,
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
ptr_t
httpAdapter
);
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment