Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
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
Alchemy Viewer
Alchemy Viewer
Commits
f06ebd05
Commit
f06ebd05
authored
4 years ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-14807 Missed a pool init in unused constructor, additional protections
parent
4a3e32e7
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llmessage/llcoproceduremanager.cpp
+11
-0
11 additions, 0 deletions
indra/llmessage/llcoproceduremanager.cpp
indra/newview/llviewerassetstorage.cpp
+1
-0
1 addition, 0 deletions
indra/newview/llviewerassetstorage.cpp
with
12 additions
and
0 deletions
indra/llmessage/llcoproceduremanager.cpp
+
11
−
0
View file @
f06ebd05
...
@@ -140,11 +140,22 @@ LLCoprocedureManager::~LLCoprocedureManager()
...
@@ -140,11 +140,22 @@ LLCoprocedureManager::~LLCoprocedureManager()
void
LLCoprocedureManager
::
initializePool
(
const
std
::
string
&
poolName
)
void
LLCoprocedureManager
::
initializePool
(
const
std
::
string
&
poolName
)
{
{
poolMap_t
::
iterator
it
=
mPoolMap
.
find
(
poolName
);
if
(
it
!=
mPoolMap
.
end
())
{
// Pools are not supposed to be initialized twice
// Todo: ideally restrict init to STATE_FIRST
LL_ERRS
()
<<
"Pool is already present "
<<
poolName
<<
LL_ENDL
;
return
;
}
// Attempt to look up a pool size in the configuration. If found use that
// Attempt to look up a pool size in the configuration. If found use that
std
::
string
keyName
=
"PoolSize"
+
poolName
;
std
::
string
keyName
=
"PoolSize"
+
poolName
;
int
size
=
0
;
int
size
=
0
;
LL_ERRS_IF
(
poolName
.
empty
(),
"CoprocedureManager"
)
<<
"Poolname must not be empty"
<<
LL_ENDL
;
LL_ERRS_IF
(
poolName
.
empty
(),
"CoprocedureManager"
)
<<
"Poolname must not be empty"
<<
LL_ENDL
;
LL_INFOS
(
"CoprocedureManager"
)
<<
"Initializing pool "
<<
poolName
<<
LL_ENDL
;
if
(
mPropertyQueryFn
)
if
(
mPropertyQueryFn
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerassetstorage.cpp
+
1
−
0
View file @
f06ebd05
...
@@ -115,6 +115,7 @@ LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *
...
@@ -115,6 +115,7 @@ LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *
mCountSucceeded
(
0
),
mCountSucceeded
(
0
),
mTotalBytesFetched
(
0
)
mTotalBytesFetched
(
0
)
{
{
LLCoprocedureManager
::
instance
().
initializePool
(
VIEWER_ASSET_STORAGE_CORO_POOL
);
}
}
...
...
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