<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21751">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: fr: implement a write queue<br><br>Change-Id: Id6eba04d5fb744f791b333c168729bbbd28cabd9<br>---<br>M src/gb/gprs_ns2_fr.c<br>1 file changed, 20 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/21751/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index fc6f166..6aa687c 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/write_queue.h></span><br><span> #include <osmocom/gprs/gprs_ns2.h></span><br><span> </span><br><span> #ifdef ENABLE_LIBMNL</span><br><span>@@ -83,9 +84,9 @@</span><br><span> };</span><br><span> </span><br><span> struct priv_bind {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct osmo_fd fd;</span><br><span>   char netif[IF_NAMESIZE];</span><br><span>     struct osmo_fr_link *link;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct osmo_wqueue wqueue;</span><br><span>   int ifindex;</span><br><span>         bool if_running;</span><br><span> };</span><br><span>@@ -142,7 +143,7 @@</span><br><span>         OSMO_ASSERT(llist_empty(&bind->nsvc));</span><br><span> </span><br><span>    osmo_fr_link_free(priv->link);</span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_fd_close(&priv->fd);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_close(&priv->wqueue.bfd);</span><br><span>     talloc_free(priv);</span><br><span> }</span><br><span> </span><br><span>@@ -238,22 +239,9 @@</span><br><span>   return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int handle_netif_write(struct osmo_fd *bfd)</span><br><span style="color: hsl(120, 100%, 40%);">+static int handle_netif_write(struct osmo_fd *ofd, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">-     return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int fr_fd_cb(struct osmo_fd *bfd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     if (what & OSMO_FD_READ)</span><br><span style="color: hsl(0, 100%, 40%);">-            rc = handle_netif_read(bfd);</span><br><span style="color: hsl(0, 100%, 40%);">-    if (what & OSMO_FD_WRITE)</span><br><span style="color: hsl(0, 100%, 40%);">-           rc = handle_netif_write(bfd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    return write(ofd->fd, msgb_data(msg), msgb_length(msg));</span><br><span> }</span><br><span> </span><br><span> /*! determine if given bind is for FR-GRE encapsulation. */</span><br><span>@@ -276,13 +264,15 @@</span><br><span> {</span><br><span>     struct gprs_ns2_vc_bind *bind = data;</span><br><span>        struct priv_bind *priv = bind->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     /* FIXME half writes */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = write(priv->fd.fd, msg->data, msg->len);</span><br><span style="color: hsl(0, 100%, 40%);">-  msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (osmo_wqueue_enqueue(&priv->wqueue, msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DLNS, LOGL_ERROR, "frame relay %s: failed to enqueue message\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                    priv->netif);</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    return 0;</span><br><span> }</span><br><span> </span><br><span> static int devname2ifindex(const char *ifname)</span><br><span>@@ -492,8 +482,6 @@</span><br><span>           goto err_name;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   priv->fd.cb = fr_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-      priv->fd.data = bind;</span><br><span>     if (strlen(netif) > IF_NAMESIZE) {</span><br><span>                rc = -EINVAL;</span><br><span>                goto err_priv;</span><br><span>@@ -520,12 +508,16 @@</span><br><span>               goto err_fr;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   priv->fd.fd = rc = open_socket(priv->ifindex);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_wqueue_init(&priv->wqueue, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+   priv->wqueue.write_cb = handle_netif_write;</span><br><span style="color: hsl(120, 100%, 40%);">+        priv->wqueue.read_cb = handle_netif_read;</span><br><span style="color: hsl(120, 100%, 40%);">+  priv->wqueue.bfd.data = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+      priv->wqueue.bfd.fd = rc = open_socket(priv->ifindex);</span><br><span>         if (rc < 0)</span><br><span>               goto err_fr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        priv->fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-        rc = osmo_fd_register(&priv->fd);</span><br><span style="color: hsl(120, 100%, 40%);">+      priv->wqueue.bfd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = osmo_fd_register(&priv->wqueue.bfd);</span><br><span>     if (rc < 0)</span><br><span>               goto err_fd;</span><br><span> </span><br><span>@@ -545,7 +537,7 @@</span><br><span>       return rc;</span><br><span> </span><br><span> err_fd:</span><br><span style="color: hsl(0, 100%, 40%);">-       close(priv->fd.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+        close(priv->wqueue.bfd.fd);</span><br><span> err_fr:</span><br><span>    osmo_fr_link_free(fr_link);</span><br><span> err_priv:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21751">change 21751</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/libosmocore/+/21751"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id6eba04d5fb744f791b333c168729bbbd28cabd9 </div>
<div style="display:none"> Gerrit-Change-Number: 21751 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>