diff options
| author | Maria Matejka <mq@ucw.cz> | 2023-01-24 11:01:34 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2023-01-26 13:22:28 +0100 |
| commit | 05d8c3699d51866c68747167556e7c1f06390afe (patch) | |
| tree | f4d02839aa5ad2086779974625e52ba5c2b028d0 /proto/bgp | |
| parent | 4334f86251429eb39bfe81ff19496d141fccef84 (diff) | |
Object locks use events
Instead of calling custom hooks from object locks, we use standard event
sending mechanism to inform protocols about object lock changes. This is
a backport from version 3 where these events are passed across threads.
This implementation of object locks doesn't use mutexes to lock the
whole data structure. In version 3, this data structure may get accessed
from multiple threads and must be protected by mutex.
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/bgp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 2e442e16..5b0569ae 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1467,9 +1467,9 @@ bgp_feed_end(struct channel *C) static void -bgp_start_locked(struct object_lock *lock) +bgp_start_locked(void *_p) { - struct bgp_proto *p = lock->data; + struct bgp_proto *p = _p; const struct bgp_config *cf = p->cf; if (p->p.proto_state != PS_START) @@ -1574,8 +1574,10 @@ bgp_start(struct proto *P) lock->iface = p->cf->iface; lock->vrf = p->cf->iface ? NULL : p->p.vrf; lock->type = OBJLOCK_TCP; - lock->hook = bgp_start_locked; - lock->data = p; + lock->event = (event) { + .hook = bgp_start_locked, + .data = p, + }; /* For dynamic BGP, we use inst 1 to avoid collisions with regular BGP */ if (bgp_is_dynamic(p)) |