use a rwlock in attribute manager to allow simultaneous access

This commit is contained in:
Martin Willi 2008-11-27 15:22:41 +00:00
parent c50ad6f613
commit 96eb7b44a0
1 changed files with 12 additions and 12 deletions

View File

@ -38,9 +38,9 @@ struct private_attribute_manager_t {
linked_list_t *providers;
/**
* mutex to lock provider list
* rwlock provider list
*/
mutex_t *mutex;
rwlock_t *lock;
};
/**
@ -54,7 +54,7 @@ static host_t* acquire_address(private_attribute_manager_t *this,
attribute_provider_t *current;
host_t *host = NULL;
this->mutex->lock(this->mutex);
this->lock->read_lock(this->lock);
enumerator = this->providers->create_enumerator(this->providers);
while (enumerator->enumerate(enumerator, &current))
{
@ -65,7 +65,7 @@ static host_t* acquire_address(private_attribute_manager_t *this,
}
}
enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex);
this->lock->unlock(this->lock);
return host;
}
@ -79,7 +79,7 @@ static void release_address(private_attribute_manager_t *this,
enumerator_t *enumerator;
attribute_provider_t *current;
this->mutex->lock(this->mutex);
this->lock->read_lock(this->lock);
enumerator = this->providers->create_enumerator(this->providers);
while (enumerator->enumerate(enumerator, &current))
{
@ -89,7 +89,7 @@ static void release_address(private_attribute_manager_t *this,
}
}
enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex);
this->lock->unlock(this->lock);
}
/**
@ -98,9 +98,9 @@ static void release_address(private_attribute_manager_t *this,
static void add_provider(private_attribute_manager_t *this,
attribute_provider_t *provider)
{
this->mutex->lock(this->mutex);
this->lock->write_lock(this->lock);
this->providers->insert_last(this->providers, provider);
this->mutex->unlock(this->mutex);
this->lock->unlock(this->lock);
}
/**
@ -109,9 +109,9 @@ static void add_provider(private_attribute_manager_t *this,
static void remove_provider(private_attribute_manager_t *this,
attribute_provider_t *provider)
{
this->mutex->lock(this->mutex);
this->lock->write_lock(this->lock);
this->providers->remove(this->providers, provider, NULL);
this->mutex->unlock(this->mutex);
this->lock->unlock(this->lock);
}
/**
@ -120,7 +120,7 @@ static void remove_provider(private_attribute_manager_t *this,
static void destroy(private_attribute_manager_t *this)
{
this->providers->destroy(this->providers);
this->mutex->destroy(this->mutex);
this->lock->destroy(this->lock);
free(this);
}
@ -138,7 +138,7 @@ attribute_manager_t *attribute_manager_create()
this->public.destroy = (void(*)(attribute_manager_t*))destroy;
this->providers = linked_list_create();
this->mutex = mutex_create(MUTEX_DEFAULT);
this->lock = rwlock_create(RWLOCK_DEFAULT);
return &this->public;
}