<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/20772">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Change-Id: Ic8c8c418e123fbdff625556a900b19650deefe0b<br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M TODO-RELEASE<br>M Transceiver52M/Transceiver.cpp<br>M Transceiver52M/device/ipc/IPCDevice.cpp<br>M Transceiver52M/device/ipc/ipc_chan.c<br>M Transceiver52M/device/ipc/ipc_sock.c<br>5 files changed, 18 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 75fe7b8..84ecf22 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -1,2 +1,3 @@</span><br><span> * update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread()</span><br><span> * update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include.</span><br><span style="color: hsl(120, 100%, 40%);">+* update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}()</span><br><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index 4980861..9c93e98 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -806,7 +806,7 @@</span><br><span> struct osmo_fd *conn_bfd = &s.conn_bfd;</span><br><span> </span><br><span> s.txmsgqueue.push_back(m);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(conn_bfd);</span><br><span> }</span><br><span> </span><br><span> int Transceiver::ctrl_sock_write(int chan)</span><br><span>@@ -821,7 +821,7 @@</span><br><span> while (s.txmsgqueue.size()) {</span><br><span> const ctrl_msg m = s.txmsgqueue.front();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- s.conn_bfd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(&s.conn_bfd);</span><br><span> </span><br><span> /* try to send it over the socket */</span><br><span> rc = write(s.conn_bfd.fd, m.data, strlen(m.data) + 1);</span><br><span>@@ -829,7 +829,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- s.conn_bfd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&s.conn_bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>index 102cb9b..a16f723 100644</span><br><span>--- a/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>+++ b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>@@ -522,7 +522,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(conn_bfd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -659,7 +659,7 @@</span><br><span> msg = llist_entry(master_sk_state.upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_if *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -676,7 +676,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -706,7 +706,7 @@</span><br><span> /* peek at the beginning of the queue */</span><br><span> msg = llist_entry(sk_chan_state[bfd->priv_nr].upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_chan_if *)msg->data;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span> LOGP(DDEV, LOGL_ERROR,</span><br><span>@@ -722,7 +722,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_chan.c b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>index 50782b9..2a6f490 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>@@ -142,7 +142,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(conn_bfd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -160,7 +160,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_chan_if *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -177,7 +177,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -231,7 +231,7 @@</span><br><span> "osmo-trx connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one IPC connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(&state->listen_bfd);</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>index b014fac..ca8e1b0 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(conn_bfd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -102,7 +102,7 @@</span><br><span> osmo_fd_unregister(bfd);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_enable(&state->listen_bfd);</span><br><span> </span><br><span> /* flush the queue */</span><br><span> while (!llist_empty(&state->upqueue)) {</span><br><span>@@ -172,7 +172,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_if *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -189,7 +189,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -244,7 +244,7 @@</span><br><span> "ip clent connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one IPC connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(&state->listen_bfd);</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/20772">change 20772</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/20772"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic8c8c418e123fbdff625556a900b19650deefe0b </div>
<div style="display:none"> Gerrit-Change-Number: 20772 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>