<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1_recorder: Skip storing data to disk if line is in ALARM state<br><br>Change-Id: Ie4c671053d372bc700f506198d1916853da03b9e<br>---<br>M src/e1_recorder.c<br>M src/recorder.h<br>2 files changed, 31 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1_recorder.c b/src/e1_recorder.c</span><br><span>index 82558b2..333375d 100644</span><br><span>--- a/src/e1_recorder.c</span><br><span>+++ b/src/e1_recorder.c</span><br><span>@@ -31,6 +31,29 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int sig_inp_cbfn(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct input_signal_data *isd = signal_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_recorder_line *rline;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(subsys == SS_L_INPUT);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(isd->line && isd->line->num < ARRAY_SIZE(g_recorder.line));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_L_INP_LINE_ALARM:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Line %u: ALARM\n", isd->line->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ rline = &g_recorder.line[isd->line->num];</span><br><span style="color: hsl(120, 100%, 40%);">+ rline->has_alarm = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_L_INP_LINE_NOALARM:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Line %u: NOALARM\n", isd->line->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ rline = &g_recorder.line[isd->line->num];</span><br><span style="color: hsl(120, 100%, 40%);">+ rline->has_alarm = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* receive a raw message frome the E1 timeslot */</span><br><span> void e1ts_raw_recv(struct e1inp_ts *ts, struct msgb *msg)</span><br><span> {</span><br><span>@@ -38,6 +61,11 @@</span><br><span> enum osmo_e1cap_capture_mode cap_mode = ts2cap_mode(ts);</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (rline->has_alarm) {</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMAIN, "Skipping storage as line %u is in ALARM\n", ts->line->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: special processing of TFP and PGSL */</span><br><span> </span><br><span> rc = e1frame_store(ts, msg, cap_mode);</span><br><span>@@ -170,6 +198,8 @@</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_register_handler(SS_L_INPUT, sig_inp_cbfn, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = vty_read_config_file(g_config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span> fprintf(stderr, "Cannot parse configuration file '%s': %s\n", g_config_file,</span><br><span>diff --git a/src/recorder.h b/src/recorder.h</span><br><span>index 12bc993..458fb1d 100644</span><br><span>--- a/src/recorder.h</span><br><span>+++ b/src/recorder.h</span><br><span>@@ -17,6 +17,7 @@</span><br><span> };</span><br><span> </span><br><span> struct e1_recorder_line {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool has_alarm;</span><br><span> struct {</span><br><span> bool enabled;</span><br><span> uint8_t line_nr;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185">change 16185</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-e1-recorder/+/16185"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1-recorder </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie4c671053d372bc700f506198d1916853da03b9e </div>
<div style="display:none"> Gerrit-Change-Number: 16185 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </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-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>