matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add access type checking error

Browse source
This commit is contained in:
Matthias Beyer 2016-03-04 21:39:43 +01:00
parent 5ba260943b
commit 987b271cc7
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libimagstore/src/hook/aspect.rs
View file

@ -5,6 +5,9 @@ use hook::result::HookResult;
use hook::accessor::{StoreIdAccessor, MutableHookDataAccessor, NonMutableHookDataAccessor};
use hook::accessor::HookDataAccessor as HDA;
use hook::error::HookError as HE;
use hook::error::HookErrorKind as HEK;
#[derive(Debug)]
pub struct Aspect {
name: String,
@ -36,12 +39,9 @@ impl StoreIdAccessor for Aspect {
use std::thread;
use std::thread::JoinHandle;
use hook::error::HookError as HE;
use hook::error::HookErrorKind as HEK;
let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
if !accessors.iter().all(|a| match a { &HDA::StoreIdAccess(_) => true, _ => false }) {
unimplemented!()
return Err(HE::new(HEK::AccessTypeViolation, None));
}
let threads : Vec<HookResult<()>> = accessors
@ -74,7 +74,7 @@ impl MutableHookDataAccessor for Aspect {
fn access_mut(&self, fle: &mut FileLockEntry) -> HookResult<()> {
let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
if !accessors.iter().all(|a| match a { &HDA::MutableAccess(_) => true, _ => false }) {
unimplemented!()
return Err(HE::new(HEK::AccessTypeViolation, None));
}
for accessor in accessors {
@ -93,12 +93,9 @@ impl NonMutableHookDataAccessor for Aspect {
use std::thread;
use std::thread::JoinHandle;
use hook::error::HookError as HE;
use hook::error::HookErrorKind as HEK;
let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
if !accessors.iter().all(|a| match a { &HDA::NonMutableAccess(_) => true, _ => false }) {
unimplemented!()
return Err(HE::new(HEK::AccessTypeViolation, None));
}
let threads : Vec<HookResult<()>> = accessors

1
libimagstore/src/hook/error.rs
View file

@ -10,6 +10,7 @@ use std::convert::Into;
#[derive(Clone, Copy, Debug)]
pub enum HookErrorKind {
HookExecutionError,
AccessTypeViolation,
Pre(PreHookErrorKind),
Post(PostHookErrorKind)
}