<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20775">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec<br>---<br>M TODO-RELEASE<br>M src/common/pcu_sock.c<br>M src/osmo-bts-lc15/l1_transp_hw.c<br>M src/osmo-bts-oc2g/l1_transp_hw.c<br>M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c<br>M src/osmo-bts-sysmo/l1_transp_hw.c<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c<br>7 files changed, 19 insertions(+), 18 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 03c11eb..66a9bb3 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -1 +1,2 @@</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 for osmo_fd_{read,write}_{enable,disable}()</span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index ffa8e77..fb32773 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -926,7 +926,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>@@ -956,7 +956,7 @@</span><br><span> regenerate_si4_restoctets(bts);</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> #if 0</span><br><span> /* remove si13, ... */</span><br><span>@@ -1045,7 +1045,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> pcu_prim = (struct gsm_pcu_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>@@ -1060,7 +1060,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/src/osmo-bts-lc15/l1_transp_hw.c b/src/osmo-bts-lc15/l1_transp_hw.c</span><br><span>index ffe8613..36b77fe 100644</span><br><span>--- a/src/osmo-bts-lc15/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-lc15/l1_transp_hw.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(fd);</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -117,7 +117,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -125,7 +125,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -144,7 +144,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_transp_hw.c b/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>index daebf60..3738b23 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(fd);</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -117,7 +117,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -125,7 +125,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -144,7 +144,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>index b9f8dc5..f66761a 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>@@ -605,7 +605,7 @@</span><br><span> select_led_pattern(mgr);</span><br><span> </span><br><span> /* The connection failures are to be expected during boot */</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->oc2gbts_ctrl.bts_conn->ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(mgr->oc2gbts_ctrl.bts_conn->ofd);</span><br><span> rc = ipa_client_conn_open(mgr->oc2gbts_ctrl.bts_conn);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n");</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>index 5561af4..7df74eb 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>@@ -106,7 +106,7 @@</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(fd);</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -124,7 +124,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -132,7 +132,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -151,7 +151,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(fd);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>index 0126aaa..6ea2876 100644</span><br><span>--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>@@ -457,7 +457,7 @@</span><br><span> struct sysmobts_mgr_instance *mgr = data;</span><br><span> </span><br><span> /* The connection failures are to be expected during boot */</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.bts_conn->ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(mgr->calib.bts_conn->ofd);</span><br><span> rc = ipa_client_conn_open(mgr->calib.bts_conn);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20775">change 20775</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-bts/+/20775"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec </div>
<div style="display:none"> Gerrit-Change-Number: 20775 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: fixeria <vyanitskiy@sysmocom.de> </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>