File tree 1 file changed +4
-12
lines changed
1 file changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ use crate::{
10
10
ForkSync ,
11
11
NUM_PHIL ,
12
12
} ;
13
- use zephyr:: kobj_define;
14
13
use zephyr:: sync:: Mutex ;
15
14
use zephyr:: sync:: Condvar ;
16
15
// use zephyr::time::Forever;
@@ -26,12 +25,10 @@ pub struct CondSync {
26
25
impl CondSync {
27
26
#[ allow( dead_code) ]
28
27
pub fn new ( ) -> CondSync {
29
- let sys_mutex = MUTEX . init_once ( ( ) ) . unwrap ( ) ;
30
- let sys_condvar = CONDVAR . init_once ( ( ) ) . unwrap ( ) ;
31
-
32
- let lock = Mutex :: new_from ( [ false ; NUM_PHIL ] , sys_mutex) ;
33
- let cond = Condvar :: new_from ( sys_condvar) ;
34
- CondSync { lock, cond }
28
+ CondSync {
29
+ lock : Mutex :: new ( [ false ; NUM_PHIL ] ) ,
30
+ cond : Condvar :: new ( ) ,
31
+ }
35
32
}
36
33
}
37
34
@@ -51,8 +48,3 @@ impl ForkSync for CondSync {
51
48
self . cond . notify_all ( ) ;
52
49
}
53
50
}
54
-
55
- kobj_define ! {
56
- static MUTEX : StaticMutex ;
57
- static CONDVAR : StaticCondvar ;
58
- }
You can’t perform that action at this time.
0 commit comments