<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20733">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use osmo_fd_setup() everywhere<br><br>Change-Id: I9be55f791a15fae2362dc431dc778b9b9d8db349<br>---<br>M src/common/pcu_sock.c<br>M src/osmo-bts-litecell15/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-octphy/l1_if.c<br>M src/osmo-bts-sysmo/l1_fwd_main.c<br>M src/osmo-bts-sysmo/l1_transp_fwd.c<br>M src/osmo-bts-sysmo/l1_transp_hw.c<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c<br>M src/osmo-bts-virtual/osmo_mcast_sock.c<br>10 files changed, 18 insertions(+), 62 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 6586af8..0466698 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -1071,10 +1071,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->cb = pcu_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->data = state;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, pcu_sock_cb, state, 0);</span><br><span> </span><br><span> if (osmo_fd_register(conn_bfd) != 0) {</span><br><span> LOGP(DPCU, LOGL_ERROR, "Failed to register new connection "</span><br><span>@@ -1108,18 +1105,15 @@</span><br><span> </span><br><span> bfd = &state->listen_bfd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span> LOGP(DPCU, LOGL_ERROR, "Could not create %s unix socket: %s\n",</span><br><span> path, strerror(errno));</span><br><span> talloc_free(state);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->cb = pcu_sock_accept;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->data = state;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(bfd, rc, OSMO_FD_READ, pcu_sock_accept, state, 0);</span><br><span> </span><br><span> rc = osmo_fd_register(bfd);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_transp_hw.c b/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>index c353f43..ffe8613 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>@@ -265,11 +265,7 @@</span><br><span> buf, strerror(errno));</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -288,11 +284,7 @@</span><br><span> }</span><br><span> osmo_wqueue_init(wq, 10);</span><br><span> wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->cb = wqueue_vector_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, wqueue_vector_cb, hdl, q);</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</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 f9d4510..daebf60 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>@@ -265,11 +265,7 @@</span><br><span> buf, strerror(errno));</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -288,11 +284,7 @@</span><br><span> }</span><br><span> osmo_wqueue_init(wq, 10);</span><br><span> wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->cb = wqueue_vector_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, wqueue_vector_cb, hdl, q);</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</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 bb2984e..b9f8dc5 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>@@ -220,10 +220,8 @@</span><br><span> mgr->gps.gps_open = 1;</span><br><span> gps_stream(&mgr->gps.gpsdata, WATCH_ENABLE, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgr->gps.gpsfd.data = mgr;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->gps.gpsfd.cb = mgr_gps_read;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->gps.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->gps.gpsfd.fd = mgr->gps.gpsdata.gps_fd;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&mgr->gps.gpsfd, mgr->gps.gpsdata.gps_fd, OSMO_FD_READ | OSMO_FD_EXCEPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr_gps_read, mgr, 0);</span><br><span> if (osmo_fd_register(&mgr->gps.gpsfd) < 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");</span><br><span> calib_state_reset(mgr, CALIB_FAIL_GPSFIX);</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index c03b411..f20f21a 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -1826,10 +1826,7 @@</span><br><span> osmo_wqueue_init(&fl1h->phy_wq, 10);</span><br><span> fl1h->phy_wq.write_cb = octphy_write_cb;</span><br><span> fl1h->phy_wq.read_cb = octphy_read_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_wq.bfd.fd = sfd;</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_wq.bfd.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_wq.bfd.cb = osmo_wqueue_bfd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_wq.bfd.data = fl1h;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&fl1h->phy_wq.bfd, sfd, OSMO_FD_READ, osmo_wqueue_bfd_cb, fl1h, 0);</span><br><span> rc = osmo_fd_register(&fl1h->phy_wq.bfd);</span><br><span> if (rc < 0) {</span><br><span> close(sfd);</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_fwd_main.c b/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>index 8e8bd83..db35ec3 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>@@ -213,9 +213,7 @@</span><br><span> wq->write_cb = udp_write_cb;</span><br><span> wq->read_cb = udp_read_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.data = l1fh;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.priv_nr = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&wq->bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, l1fh, i);</span><br><span> rc = osmo_sock_init_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM,</span><br><span> IPPROTO_UDP, NULL, fwd_udp_ports[i],</span><br><span> OSMO_SOCK_F_BIND);</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_transp_fwd.c b/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>index 97200ce..ef272eb 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>@@ -126,10 +126,7 @@</span><br><span> wq->write_cb = prim_write_cb;</span><br><span> wq->read_cb = fwd_read_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ofd->data = fl1h;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(ofd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, fl1h, q);</span><br><span> rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,</span><br><span> bts_host, fwd_udp_ports[q],</span><br><span> OSMO_SOCK_F_CONNECT);</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 45f4a07..5561af4 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>@@ -271,11 +271,7 @@</span><br><span> q, rd_devnames[q], strerror(errno));</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -291,11 +287,7 @@</span><br><span> }</span><br><span> osmo_wqueue_init(wq, 10);</span><br><span> wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->cb = wqueue_vector_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, wqueue_vector_cb, hdl, q);</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</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 2fbdfa6..0126aaa 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>@@ -167,10 +167,8 @@</span><br><span> #else</span><br><span> gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.data = mgr;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.cb = mgr_gps_read;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&mgr->calib.gpsfd, mgr->calib.gpsdata->gps_fd, OSMO_FD_READ | OSMO_FD_EXCEPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr_gps_read, mgr, 0);</span><br><span> if (osmo_fd_register(&mgr->calib.gpsfd) < 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");</span><br><span> calib_state_reset(mgr, CALIB_FAIL_GPS);</span><br><span>diff --git a/src/osmo-bts-virtual/osmo_mcast_sock.c b/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>index 91203b7..3e56514 100644</span><br><span>--- a/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>+++ b/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>@@ -43,9 +43,7 @@</span><br><span> int rc;</span><br><span> unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ofd->cb = fd_rx_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->data = osmo_fd_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(ofd, -1, OSMO_FD_READ, fd_rx_cb, osmo_fd_data, 0);</span><br><span> </span><br><span> /* Create mcast client socket */</span><br><span> rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20733">change 20733</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/+/20733"/><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: I9be55f791a15fae2362dc431dc778b9b9d8db349 </div>
<div style="display:none"> Gerrit-Change-Number: 20733 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>