<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26704">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: Add watchdog timer to detect dead lines / USB devices<br><br>We just found a bug in icE1usb (likely firmware) which was hard to find<br>as there was zero notification from osmo-e1d that it actually never<br>received any data from the icE1usb hardware/firmware anymore.<br><br>Change-Id: Id22e4110b9067f50b1818eb12295b2d4eb9cdc12<br>---<br>M src/e1d.h<br>M src/intf_line.c<br>M src/mux_demux.c<br>3 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/04/26704/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index af6c09e..618776d 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -123,6 +123,12 @@</span><br><span>              struct osmo_timer_list timer;</span><br><span>        } ts0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    /* watchdog timer to catch situations where no more USB data is received */</span><br><span style="color: hsl(120, 100%, 40%);">+   struct {</span><br><span style="color: hsl(120, 100%, 40%);">+              struct osmo_timer_list timer;</span><br><span style="color: hsl(120, 100%, 40%);">+         uint32_t rx_bytes;</span><br><span style="color: hsl(120, 100%, 40%);">+    } watchdog;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        void *e1gen_priv;</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 5143e45..5659129 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include <osmocom/e1d/proto.h></span><br><span> </span><br><span> #include "e1d.h"</span><br><span>@@ -64,6 +65,20 @@</span><br><span>         .ctr_desc = line_ctr_description,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* watchdog timer, called once per second to check if we still receive data on the line */</span><br><span style="color: hsl(120, 100%, 40%);">+static void line_watchdog_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  struct e1_line *line = data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (line->watchdog.rx_bytes < 240000) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPLI(line, DE1D, LOGL_ERROR, "Received Only %u bytes/s (expected: 262144): Line dead?\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                 line->watchdog.rx_bytes);</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   line->watchdog.rx_bytes = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_timer_schedule(&line->watchdog.timer, 1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> // ---------------------------------------------------------------------------</span><br><span> // e1d structures</span><br><span> // ---------------------------------------------------------------------------</span><br><span>@@ -196,6 +211,10 @@</span><br><span> </span><br><span>    llist_add_tail(&line->list, &intf->lines);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  /* start watchdog timer */</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_timer_setup(&line->watchdog.timer, line_watchdog_cb, line);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_timer_schedule(&line->watchdog.timer, 1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   LOGPLI(line, DE1D, LOGL_NOTICE, "Created\n");</span><br><span> </span><br><span>  return line;</span><br><span>@@ -206,6 +225,8 @@</span><br><span> {</span><br><span>      LOGPLI(line, DE1D, LOGL_NOTICE, "Destroying\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_timer_del(&line->watchdog.timer);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      /* close all [peer] file descriptors */</span><br><span>      for (int i=0; i<32; i++)</span><br><span>          e1_ts_stop(&line->ts[i]);</span><br><span>diff --git a/src/mux_demux.c b/src/mux_demux.c</span><br><span>index 341256a..b0a9cf2 100644</span><br><span>--- a/src/mux_demux.c</span><br><span>+++ b/src/mux_demux.c</span><br><span>@@ -391,6 +391,8 @@</span><br><span>              return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ line->watchdog.rx_bytes += size;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        ftr = size / 32;</span><br><span>     OSMO_ASSERT(size % 32 == 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26704">change 26704</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-e1d/+/26704"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id22e4110b9067f50b1818eb12295b2d4eb9cdc12 </div>
<div style="display:none"> Gerrit-Change-Number: 26704 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>