shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

bug #1237: Move access to uses_name_pool to critical section

Browse Source
This commit is contained in:
Ruben S. Montero 2012-04-20 11:04:49 +02:00
parent 05f93acb38
commit 1696bb669e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pool/PoolSQL.cc
View File

@ -199,8 +199,6 @@ PoolObjectSQL * PoolSQL::get(
}
else
{
map<string,PoolObjectSQL *>::iterator name_index;
objectsql = create();
objectsql->oid = oid;
@ -217,10 +215,12 @@ PoolObjectSQL * PoolSQL::get(
}
if ( uses_name_pool )
{
string okey = key(objectsql->name,objectsql->uid);
{
map<string,PoolObjectSQL *>::iterator name_index;
string okey;
name_index = name_pool.find(okey);
okey = key(objectsql->name,objectsql->uid);
name_index = name_pool.find(okey);
if ( name_index != name_pool.end() )
{
@ -262,11 +262,6 @@ PoolObjectSQL * PoolSQL::get(
PoolObjectSQL * PoolSQL::get(const string& name, int ouid, bool olock)
{
if ( uses_name_pool == false )
{
return 0;
}
map<string,PoolObjectSQL *>::iterator index;
PoolObjectSQL * objectsql;
@ -274,6 +269,12 @@ PoolObjectSQL * PoolSQL::get(const string& name, int ouid, bool olock)
lock();
if ( uses_name_pool == false )
{
unlock();
return 0;
}
index = name_pool.find(key(name,ouid));
if ( index != name_pool.end() && index->second->isValid() == true )
@ -354,15 +355,16 @@ void PoolSQL::update_cache_index(string& old_name,
string& new_name,
int new_uid)
{
if ( uses_name_pool == false )
{
return;
}
map<string,PoolObjectSQL *>::iterator index;
lock();
if ( uses_name_pool == false )
{
unlock();
return;
}
string old_key = key(old_name, old_uid);
string new_key = key(new_name, new_uid);