From: Mark Stapp <mjs@voltanet.io>
Date: Tue, 6 Apr 2021 18:40:39 +0000 (-0400)
Subject: lib: use public task-scheduling apis
X-Git-Tag: base_8.1~474^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1dffe35773d910e6a400279d103dfe46052093d7;p=mirror%2Ffrr.git

lib: use public task-scheduling apis

The frr_zmq shim was trying to use some internal scheduling
macros, and that was causing trouble. Just use the public
apis.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c
index 05f0fce5fc..f87200d641 100644
--- a/lib/frr_zmq.c
+++ b/lib/frr_zmq.c
@@ -135,8 +135,8 @@ static int frrzmq_read_msg(struct thread *t)
 	if (read)
 		frrzmq_check_events(cbp, &cb->write, ZMQ_POLLOUT);
 
-	_thread_add_read_write(t->xref, t->master, frrzmq_read_msg, cbp,
-			       cb->fd, &cb->read.thread);
+	thread_add_read(t->master, frrzmq_read_msg, cbp,
+			cb->fd, &cb->read.thread);
 	return 0;
 
 out_err:
@@ -191,11 +191,11 @@ int _frrzmq_thread_add_read(const struct xref_threadsched *xref,
 	if (events & ZMQ_POLLIN) {
 		thread_cancel(&cb->read.thread);
 
-		_thread_add_event(xref, master, frrzmq_read_msg, cbp, fd,
+		thread_add_event(master, frrzmq_read_msg, cbp, fd,
 				  &cb->read.thread);
 	} else
-		_thread_add_read_write(xref, master, frrzmq_read_msg, cbp, fd,
-				       &cb->read.thread);
+		thread_add_read(master, frrzmq_read_msg, cbp, fd,
+				&cb->read.thread);
 	return 0;
 }
 
@@ -241,8 +241,8 @@ static int frrzmq_write_msg(struct thread *t)
 	if (written)
 		frrzmq_check_events(cbp, &cb->read, ZMQ_POLLIN);
 
-	_thread_add_read_write(t->xref, t->master, frrzmq_write_msg, cbp,
-			       cb->fd, &cb->write.thread);
+	thread_add_write(t->master, frrzmq_write_msg, cbp,
+			 cb->fd, &cb->write.thread);
 	return 0;
 
 out_err:
@@ -297,8 +297,8 @@ int _frrzmq_thread_add_write(const struct xref_threadsched *xref,
 		_thread_add_event(xref, master, frrzmq_write_msg, cbp, fd,
 				  &cb->write.thread);
 	} else
-		_thread_add_read_write(xref, master, frrzmq_write_msg, cbp, fd,
-				       &cb->write.thread);
+		thread_add_write(master, frrzmq_write_msg, cbp, fd,
+				 &cb->write.thread);
 	return 0;
 }