File src/emitter_impl.h changed (mode: 100644) (index 865c00d..403b598) |
... |
... |
namespace control { |
20 |
20 |
using typename base_type::listener_type; |
using typename base_type::listener_type; |
21 |
21 |
|
|
22 |
22 |
listener_type on(event_type, callback_type) override; |
listener_type on(event_type, callback_type) override; |
23 |
|
listener_type once(event_type, callback_type) override; |
|
24 |
|
|
|
25 |
23 |
void interupt(event_type, U...) override; |
void interupt(event_type, U...) override; |
26 |
24 |
|
|
27 |
25 |
private: |
private: |
|
... |
... |
namespace control { |
29 |
27 |
typedef std::map<event_type, batch_type> map_type; |
typedef std::map<event_type, batch_type> map_type; |
30 |
28 |
|
|
31 |
29 |
map_type m_repeat; |
map_type m_repeat; |
32 |
|
map_type m_once; |
|
33 |
30 |
}; |
}; |
34 |
31 |
} //control |
} //control |
35 |
32 |
} // om636 |
} // om636 |
File src/emitter_impl.hxx changed (mode: 100644) (index dfa9d36..3d316ac) |
... |
... |
namespace control { |
8 |
8 |
return m_repeat[e].hook(c); |
return m_repeat[e].hook(c); |
9 |
9 |
} |
} |
10 |
10 |
|
|
11 |
|
///////////////////////////////////////////////////////////////////////////////////// |
|
12 |
|
template <typename T, typename... U> |
|
13 |
|
auto EmitterImpl<T, U...>::once(event_type e, callback_type c) -> listener_type |
|
14 |
|
{ |
|
15 |
|
return m_once[e].hook(c); |
|
16 |
|
} |
|
17 |
|
|
|
18 |
11 |
///////////////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////////////// |
19 |
12 |
template <typename T, typename... U> |
template <typename T, typename... U> |
20 |
13 |
void EmitterImpl<T, U...>::interupt(event_type e, U... arg) |
void EmitterImpl<T, U...>::interupt(event_type e, U... arg) |
21 |
14 |
{ |
{ |
22 |
|
m_once[e].invoke_once(arg...); |
|
23 |
15 |
m_repeat[e].invoke(arg...); |
m_repeat[e].invoke(arg...); |
24 |
16 |
} |
} |
25 |
17 |
|
|
File src/interface.h changed (mode: 100644) (index 026c834..c7833a5) |
... |
... |
namespace control { |
17 |
17 |
typedef std::shared_ptr<callback_type> listener_type; |
typedef std::shared_ptr<callback_type> listener_type; |
18 |
18 |
|
|
19 |
19 |
virtual ~Emitter() = default; |
virtual ~Emitter() = default; |
20 |
|
|
|
21 |
20 |
virtual listener_type on(event_type, callback_type) = 0; |
virtual listener_type on(event_type, callback_type) = 0; |
22 |
|
virtual listener_type once(event_type, callback_type) = 0; |
|
23 |
|
|
|
24 |
21 |
virtual void interupt(event_type, U...) = 0; |
virtual void interupt(event_type, U...) = 0; |
25 |
22 |
}; |
}; |
26 |
23 |
|
|
File test/src/dispatch_logic.cpp changed (mode: 100644) (index c573342..ff5bf23) |
1 |
1 |
#include <iostream> |
#include <iostream> |
2 |
|
#include <lib/ohm/src/quemitter.h> |
|
3 |
|
#include <tmp/src/test.h> |
|
4 |
2 |
#include <vector> |
#include <vector> |
5 |
3 |
|
|
6 |
|
using namespace std; |
|
7 |
|
using namespace om636; |
|
8 |
|
///////////////////////////////////////////////////////////////// |
|
9 |
|
template <template <class, class> class T> |
|
10 |
|
void check_dispatch_logic() |
|
|
4 |
|
#include <tmp/src/test.h> |
|
5 |
|
|
|
6 |
|
#include <lib/ohm/src/emitter_impl.h> |
|
7 |
|
|
|
8 |
|
int main() |
11 |
9 |
{ |
{ |
12 |
|
typedef T<string, function<void()>> emitter_type; |
|
|
10 |
|
using namespace std; |
|
11 |
|
using namespace om636; |
|
12 |
|
using namespace control; |
|
13 |
|
|
|
14 |
|
typedef EmitterImpl<string> emitter_type; |
13 |
15 |
typedef typename emitter_type::listener_type listener_type; |
typedef typename emitter_type::listener_type listener_type; |
14 |
16 |
|
|
15 |
17 |
static unsigned trap(0); |
static unsigned trap(0); |
|
... |
... |
void check_dispatch_logic() |
27 |
29 |
trap = 0; |
trap = 0; |
28 |
30 |
|
|
29 |
31 |
// check dead agent |
// check dead agent |
30 |
|
emitter.once(event, tester::trigger_trap); |
|
31 |
|
emitter.emit(event); |
|
|
32 |
|
emitter.on(event, tester::trigger_trap); |
|
33 |
|
emitter.interupt(event); |
32 |
34 |
ASSERT(trap == 0); |
ASSERT(trap == 0); |
33 |
35 |
|
|
34 |
|
// check once |
|
35 |
|
listeners.push_back(emitter.once(event, tester::trigger_trap)); |
|
36 |
|
emitter.emit(event); |
|
37 |
|
ASSERT(trap == 1); |
|
38 |
|
emitter.emit(event); |
|
39 |
|
ASSERT(trap == 1); |
|
40 |
|
|
|
41 |
36 |
// check on |
// check on |
42 |
37 |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
43 |
|
emitter.emit(event); |
|
|
38 |
|
emitter.interupt(event); |
|
39 |
|
ASSERT(trap == 1); |
|
40 |
|
emitter.interupt(event); |
44 |
41 |
ASSERT(trap == 2); |
ASSERT(trap == 2); |
45 |
|
emitter.emit(event); |
|
46 |
|
ASSERT(trap == 3); |
|
47 |
42 |
|
|
48 |
43 |
// check duplicate |
// check duplicate |
49 |
44 |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
50 |
|
emitter.emit(event); |
|
51 |
|
ASSERT(trap == 5); |
|
52 |
|
|
|
53 |
|
FOOTER; |
|
54 |
|
} |
|
55 |
|
|
|
56 |
|
template <class T, class U> |
|
57 |
|
using QueuedEmitter = om636::control::Quemitter<T, U>; |
|
58 |
|
|
|
59 |
|
int main() |
|
60 |
|
{ |
|
61 |
|
using namespace std; |
|
62 |
|
|
|
63 |
|
check_dispatch_logic<om636::control::Emitter>(); |
|
64 |
|
check_dispatch_logic<QueuedEmitter>(); |
|
|
45 |
|
emitter.interupt(event); |
|
46 |
|
ASSERT(trap == 4); |
65 |
47 |
|
|
66 |
48 |
return 0; |
return 0; |
67 |
49 |
} |
} |
File test/src/modify_while_traversal.cpp changed (mode: 100644) (index 5827cc1..50d4107) |
2 |
2 |
#include <iostream> |
#include <iostream> |
3 |
3 |
#include <vector> |
#include <vector> |
4 |
4 |
|
|
5 |
|
#include <lib/ohm/src/quemitter.h> |
|
6 |
5 |
#include <tmp/src/test.h> |
#include <tmp/src/test.h> |
7 |
6 |
|
|
8 |
|
using namespace std; |
|
9 |
|
using namespace om636; |
|
10 |
|
///////////////////////////////////////////////////////////////// |
|
11 |
|
template <template <class, class> class T> |
|
12 |
|
void check_modify_while_traversal() |
|
|
7 |
|
#include <lib/ohm/src/emitter_impl.h> |
|
8 |
|
|
|
9 |
|
int main() |
13 |
10 |
{ |
{ |
14 |
|
typedef T<string, function<void()>> emitter_type; |
|
|
11 |
|
|
|
12 |
|
using namespace std; |
|
13 |
|
using namespace om636; |
|
14 |
|
using namespace control; |
|
15 |
|
|
|
16 |
|
typedef EmitterImpl<string> emitter_type; |
15 |
17 |
typedef typename emitter_type::listener_type listener_type; |
typedef typename emitter_type::listener_type listener_type; |
16 |
18 |
|
|
17 |
19 |
static emitter_type emitter; |
static emitter_type emitter; |
|
... |
... |
void check_modify_while_traversal() |
22 |
24 |
{ |
{ |
23 |
25 |
++trap; |
++trap; |
24 |
26 |
} |
} |
25 |
|
|
|
26 |
|
static void remove() |
|
27 |
|
{ |
|
28 |
|
++trap; |
|
29 |
|
emitter.removeListeners(event); |
|
30 |
|
} |
|
31 |
|
|
|
32 |
|
static void removeAll() |
|
33 |
|
{ |
|
34 |
|
++trap; |
|
35 |
|
emitter.removeAllListeners(); |
|
36 |
|
} |
|
37 |
27 |
}; |
}; |
38 |
28 |
|
|
39 |
29 |
vector<listener_type> listeners; |
vector<listener_type> listeners; |
40 |
30 |
|
|
41 |
|
// test remove while traverse |
|
42 |
|
listeners.push_back(emitter.on(event, tester::remove)); |
|
43 |
|
listeners.push_back(emitter.on(event, tester::remove)); |
|
44 |
|
listeners.push_back(emitter.once(event, tester::remove)); |
|
45 |
|
emitter.emit(event); |
|
46 |
|
ASSERT(trap == 1); |
|
47 |
|
|
|
48 |
|
// test removeAll while traverse |
|
49 |
|
listeners.push_back(emitter.on(event, tester::removeAll)); |
|
50 |
|
listeners.push_back(emitter.on(event, tester::removeAll)); |
|
51 |
|
listeners.push_back(emitter.once(event, tester::removeAll)); |
|
52 |
|
emitter.emit(event); |
|
53 |
|
ASSERT(trap == 2); |
|
54 |
|
|
|
55 |
31 |
// test insert while traverse |
// test insert while traverse |
56 |
|
listeners.push_back(emitter.once(event, [&]() { |
|
|
32 |
|
listeners.push_back(emitter.on(event, [&]() { |
57 |
33 |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
listeners.push_back(emitter.on(event, tester::trigger_trap)); |
58 |
|
listeners.push_back(emitter.once(event, tester::trigger_trap)); |
|
59 |
34 |
})); |
})); |
60 |
|
emitter.emit(event); |
|
61 |
|
ASSERT(trap == 2); |
|
62 |
|
|
|
63 |
|
emitter.emit(event); |
|
64 |
|
ASSERT(trap == 4); |
|
65 |
|
|
|
66 |
|
emitter.emit(event); |
|
67 |
|
ASSERT(trap == 5); |
|
68 |
|
|
|
69 |
|
FOOTER; |
|
70 |
|
} |
|
71 |
|
|
|
72 |
|
template <class T, class U> |
|
73 |
|
using QueuedEmitter = om636::control::Quemitter<T, U>; |
|
|
35 |
|
emitter.interupt(event); |
|
36 |
|
listeners.front().reset(); |
|
37 |
|
ASSERT(trap == 0)(trap); |
74 |
38 |
|
|
75 |
|
int main() |
|
76 |
|
{ |
|
77 |
|
using namespace std; |
|
|
39 |
|
emitter.interupt(event); |
|
40 |
|
ASSERT(trap == 1); |
78 |
41 |
|
|
79 |
|
check_modify_while_traversal<om636::control::Emitter>(); |
|
80 |
|
check_modify_while_traversal<QueuedEmitter>(); |
|
|
42 |
|
emitter.interupt(event); |
|
43 |
|
ASSERT(trap == 2 && "modify_while_traversau")(trap); |
81 |
44 |
|
|
82 |
45 |
return 0; |
return 0; |
83 |
46 |
} |
} |
File test/src/once_while_emit.cpp deleted (index 38809c1..0000000) |
1 |
|
|
|
2 |
|
#include <iostream> |
|
3 |
|
#include <vector> |
|
4 |
|
|
|
5 |
|
#include <tmp/src/test.h> |
|
6 |
|
|
|
7 |
|
#include <lib/ohm/src/emitter_impl.h> |
|
8 |
|
|
|
9 |
|
int main() |
|
10 |
|
{ |
|
11 |
|
using namespace std; |
|
12 |
|
using namespace om636; |
|
13 |
|
using namespace control; |
|
14 |
|
typedef EmitterImpl<string> emitter_type; |
|
15 |
|
typedef typename emitter_type::listener_type listener_type; |
|
16 |
|
|
|
17 |
|
emitter_type emitter; |
|
18 |
|
vector<listener_type> listeners; |
|
19 |
|
|
|
20 |
|
unsigned counter(0); |
|
21 |
|
|
|
22 |
|
listeners.push_back(emitter.once("load", [&]() { |
|
23 |
|
listeners.push_back(emitter.once("on", [&]() { |
|
24 |
|
++counter; |
|
25 |
|
})); |
|
26 |
|
|
|
27 |
|
emitter.interupt("on"); |
|
28 |
|
})); |
|
29 |
|
|
|
30 |
|
emitter.interupt("load"); |
|
31 |
|
emitter.interupt("on"); |
|
32 |
|
|
|
33 |
|
ASSERT(counter == 1); |
|
34 |
|
|
|
35 |
|
return 0; |
|
36 |
|
} |
|