diff options
author | Donald Sharp <sharpd@nvidia.com> | 2022-03-01 22:18:12 +0100 |
---|---|---|
committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
commit | e6685141aae8fc869d49cde1d459f73b87bbec89 (patch) | |
tree | 465539dece789430eaaf76bce18c754c5e18f452 /ripd | |
parent | *: Rename thread.[ch] to event.[ch] (diff) | |
download | frr-e6685141aae8fc869d49cde1d459f73b87bbec89.tar.xz frr-e6685141aae8fc869d49cde1d459f73b87bbec89.zip |
*: Rename `struct thread` to `struct event`
Effectively a massive search and replace of
`struct thread` to `struct event`. Using the
term `thread` gives people the thought that
this event system is a pthread when it is not
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ripd')
-rw-r--r-- | ripd/rip_interface.c | 2 | ||||
-rw-r--r-- | ripd/rip_peer.c | 2 | ||||
-rw-r--r-- | ripd/ripd.c | 16 | ||||
-rw-r--r-- | ripd/ripd.h | 16 |
4 files changed, 18 insertions, 18 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 309c18f9c..a32913766 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -774,7 +774,7 @@ int rip_enable_if_delete(struct rip *rip, const char *ifname) } /* Join to multicast group and send request to the interface. */ -static void rip_interface_wakeup(struct thread *t) +static void rip_interface_wakeup(struct event *t) { struct interface *ifp; struct rip_interface *ri; diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 85cd97150..88094e983 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -52,7 +52,7 @@ struct rip_peer *rip_peer_lookup_next(struct rip *rip, struct in_addr *addr) } /* RIP peer is timeout. */ -static void rip_peer_timeout(struct thread *t) +static void rip_peer_timeout(struct event *t) { struct rip_peer *peer; diff --git a/ripd/ripd.c b/ripd/ripd.c index 8b21af92f..8cc339e7c 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -50,7 +50,7 @@ DEFINE_MTYPE_STATIC(RIPD, RIP_DISTANCE, "RIP distance"); /* Prototypes. */ static void rip_output_process(struct connected *, struct sockaddr_in *, int, uint8_t); -static void rip_triggered_update(struct thread *); +static void rip_triggered_update(struct event *); static int rip_update_jitter(unsigned long); static void rip_distance_table_node_cleanup(struct route_table *table, struct route_node *node); @@ -121,7 +121,7 @@ struct rip *rip_info_get_instance(const struct rip_info *rinfo) } /* RIP route garbage collect timer. */ -static void rip_garbage_collect(struct thread *t) +static void rip_garbage_collect(struct event *t) { struct rip_info *rinfo; struct route_node *rp; @@ -287,7 +287,7 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo) } /* Timeout RIP routes. */ -static void rip_timeout(struct thread *t) +static void rip_timeout(struct event *t) { struct rip_info *rinfo = THREAD_ARG(t); struct rip *rip = rip_info_get_instance(rinfo); @@ -1697,7 +1697,7 @@ static void rip_request_process(struct rip_packet *packet, int size, } /* First entry point of RIP packet. */ -static void rip_read(struct thread *t) +static void rip_read(struct event *t) { struct rip *rip = THREAD_ARG(t); int sock; @@ -2478,7 +2478,7 @@ static void rip_update_process(struct rip *rip, int route_type) } /* RIP's periodical timer. */ -static void rip_update(struct thread *t) +static void rip_update(struct event *t) { struct rip *rip = THREAD_ARG(t); @@ -2520,7 +2520,7 @@ static void rip_clear_changed_flag(struct rip *rip) } /* Triggered update interval timer. */ -static void rip_triggered_interval(struct thread *t) +static void rip_triggered_interval(struct event *t) { struct rip *rip = THREAD_ARG(t); @@ -2531,7 +2531,7 @@ static void rip_triggered_interval(struct thread *t) } /* Execute triggered update. */ -static void rip_triggered_update(struct thread *t) +static void rip_triggered_update(struct event *t) { struct rip *rip = THREAD_ARG(t); int interval; @@ -2923,7 +2923,7 @@ static void rip_vty_out_uptime(struct vty *vty, struct rip_info *rinfo) struct tm tm; #define TIME_BUF 25 char timebuf[TIME_BUF]; - struct thread *thread; + struct event *thread; if ((thread = rinfo->t_timeout) != NULL) { clock = thread_timer_remain_second(thread); diff --git a/ripd/ripd.h b/ripd/ripd.h index 4894cb863..b987ee1a4 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -117,15 +117,15 @@ struct rip { struct list *peer_list; /* RIP threads. */ - struct thread *t_read; + struct event *t_read; /* Update and garbage timer. */ - struct thread *t_update; + struct event *t_update; /* Triggered update hack. */ int trigger; - struct thread *t_triggered_update; - struct thread *t_triggered_interval; + struct event *t_triggered_update; + struct event *t_triggered_interval; /* RIP timer values. */ uint32_t update_time; @@ -239,8 +239,8 @@ struct rip_info { uint8_t flags; /* Garbage collect timer. */ - struct thread *t_timeout; - struct thread *t_garbage_collect; + struct event *t_timeout; + struct event *t_garbage_collect; /* Route-map futures - this variables can be changed. */ struct in_addr nexthop_out; @@ -309,7 +309,7 @@ struct rip_interface { struct route_map *routemap[RIP_FILTER_MAX]; /* Wake up thread. */ - struct thread *t_wakeup; + struct event *t_wakeup; /* Interface statistics. */ int recv_badpackets; @@ -342,7 +342,7 @@ struct rip_peer { int recv_badroutes; /* Timeout thread. */ - struct thread *t_timeout; + struct event *t_timeout; }; struct rip_distance { |