github/santa
1
1
Fork 0
mirror of https://github.com/google/santa.git synced 2026-04-24 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

santa-driver: remove unnecessary dataqueue lock

Browse Source
This commit is contained in:
Russell Hancox
2015-05-13 13:36:10 -04:00
parent 58b9dab74f
commit f5eb274aa0
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/santa-driver/SantaDecisionManager.cc
View File

@@ -23,7 +23,6 @@ bool SantaDecisionManager::init() {
if (!super::init()) return false;
sdm_lock_grp_ = lck_grp_alloc_init("santa-locks", lck_grp_attr_alloc_init());
dataqueue_lock_ = lck_mtx_alloc_init(sdm_lock_grp_, lck_attr_alloc_init());
cached_decisions_lock_ = lck_rw_alloc_init(sdm_lock_grp_,
lck_attr_alloc_init());
@@ -45,11 +44,6 @@ void SantaDecisionManager::free() {
cached_decisions_lock_ = NULL;
}
if (dataqueue_lock_) {
lck_mtx_free(dataqueue_lock_, sdm_lock_grp_);
dataqueue_lock_ = NULL;
}
if (sdm_lock_grp_) {
lck_grp_free(sdm_lock_grp_);
sdm_lock_grp_ = NULL;
@@ -68,10 +62,8 @@ void SantaDecisionManager::ConnectClient(IOSharedDataQueue *queue, pid_t pid) {
// connected should be cleared
ClearCache();
lck_mtx_lock(dataqueue_lock_);
dataqueue_ = queue;
dataqueue_->retain();
lck_mtx_unlock(dataqueue_lock_);
owning_pid_ = pid;
owning_proc_ = proc_find(pid);
@@ -92,10 +84,8 @@ void SantaDecisionManager::DisconnectClient() {
message.vnode_id = 0;
PostToQueue(message);
lck_mtx_lock(dataqueue_lock_);
dataqueue_->release();
dataqueue_ = NULL;
lck_mtx_unlock(dataqueue_lock_);
proc_rele(owning_proc_);
owning_proc_ = NULL;
@@ -239,12 +229,10 @@ santa_action_t SantaDecisionManager::GetFromCache(const char *identifier) {
#pragma mark Queue Management
bool SantaDecisionManager::PostToQueue(santa_message_t message) {
lck_mtx_lock(dataqueue_lock_);
bool kr = false;
if (dataqueue_) {
kr = dataqueue_->enqueue(&message, sizeof(message));
}
lck_mtx_unlock(dataqueue_lock_);
return kr;
}

2
Source/santa-driver/SantaDecisionManager.h
View File

@@ -142,8 +142,6 @@ class SantaDecisionManager : public OSObject {
private:
lck_grp_t *sdm_lock_grp_;
lck_rw_t *cached_decisions_lock_;
lck_mtx_t *dataqueue_lock_;
OSDictionary *cached_decisions_;
IOSharedDataQueue *dataqueue_;