<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19681">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support setting rt-prio and cpu-affinity mask through VTY<br><br>Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a<br>Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c<br>Related: SYS#4986<br>Change-Id: Ib9faa68c1cd09a026909c792a1fd5557c9893fe3<br>---<br>M TODO-RELEASE<br>M configure.ac<br>M debian/control<br>M doc/manuals/osmostp-usermanual.adoc<br>M doc/manuals/vty/osmo-stp_vty_reference.xml<br>M stp/stp_main.c<br>6 files changed, 49 insertions(+), 5 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 d0852fc..b274427 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -7,3 +7,4 @@</span><br><span> # If any interfaces have been added since the last public release: c:r:a + 1.</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-stp update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 33b71b7..1ec3b01 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -34,9 +34,9 @@</span><br><span> fi</span><br><span> PKG_PROG_PKG_CONFIG([0.20])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0)</span><br><span> </span><br><span> old_LIBS=$LIBS</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index fd23fbd..f8d25f6 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -5,7 +5,7 @@</span><br><span> Build-Depends: debhelper (>= 9),</span><br><span> autotools-dev,</span><br><span> pkg-config,</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev (>= 1.3.0),</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev (>= 1.4.0),</span><br><span> autoconf,</span><br><span> automake,</span><br><span> libtool,</span><br><span>diff --git a/doc/manuals/osmostp-usermanual.adoc b/doc/manuals/osmostp-usermanual.adoc</span><br><span>index 9f41e5d..a34c2b1 100644</span><br><span>--- a/doc/manuals/osmostp-usermanual.adoc</span><br><span>+++ b/doc/manuals/osmostp-usermanual.adoc</span><br><span>@@ -18,6 +18,8 @@</span><br><span> </span><br><span> include::./common/chapters/logging.adoc[]</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+include::./common/chapters/vty_cpu_sched.adoc[]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> //include::./common/chapters/bts.adoc[]</span><br><span> </span><br><span> //include::../OsmoNITB/chapters/bts-examples.adoc[]</span><br><span>@@ -31,4 +33,3 @@</span><br><span> include::./common/chapters/glossary.adoc[]</span><br><span> </span><br><span> include::./common/chapters/gfdl.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/doc/manuals/vty/osmo-stp_vty_reference.xml b/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>index ebe8b29..e904469 100644</span><br><span>--- a/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>@@ -430,6 +430,13 @@</span><br><span> <param name='timers' doc='Show List of SCCP timers' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show cpu-sched threads'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Show Sched section information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='threads' doc='Show information about running threads)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show fsm NAME'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -917,6 +924,13 @@</span><br><span> <param name='timers' doc='Show List of SCCP timers' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show cpu-sched threads'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Show Sched section information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='threads' doc='Show information about running threads)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show fsm NAME'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -1220,6 +1234,11 @@</span><br><span> <param name='<0-15>' doc='An instance of the SS7 stack' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='cpu-sched'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Configure CPU Scheduler related settings' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> </node></span><br><span> <node id='config-log'></span><br><span> <name>config-log</name></span><br><span>@@ -1893,4 +1912,25 @@</span><br><span> </params></span><br><span> </command></span><br><span> </node></span><br><span style="color: hsl(120, 100%, 40%);">+ <node id='config-cpu-sched'></span><br><span style="color: hsl(120, 100%, 40%);">+ <name>config-cpu-sched</name></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='policy rr <1-32>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='policy' doc='Set the scheduling policy to use for the process' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='rr' doc='Use the SCHED_RR real-time scheduling algorithm' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='<1-32>' doc='Set the SCHED_RR real-time priority' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='cpu-affinity (self|all|<0-4294967295>|THREADNAME) CPUHEXMASK [delay]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-affinity' doc='Set CPU affinity mask on a (group of) thread(s)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='self' doc='Set CPU affinity mask on thread running the VTY' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='all' doc='Set CPU affinity mask on all process' threads' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='<0-4294967295>' doc='Set CPU affinity mask on a thread with specified PID' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='THREADNAME' doc='Set CPU affinity mask on a thread with specified thread name' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='CPUHEXMASK' doc='CPU affinity mask' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[delay]' doc='If set, delay applying the affinity mask now and let the app handle it at a later point' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span style="color: hsl(120, 100%, 40%);">+ </node></span><br><span> </vtydoc></span><br><span>diff --git a/stp/stp_main.c b/stp/stp_main.c</span><br><span>index 19420c0..33305b3 100644</span><br><span>--- a/stp/stp_main.c</span><br><span>+++ b/stp/stp_main.c</span><br><span>@@ -40,6 +40,7 @@</span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/cpu_sched_vty.h></span><br><span> </span><br><span> #include <osmocom/sigtran/osmo_ss7.h></span><br><span> #include <osmocom/sigtran/sccp_sap.h></span><br><span>@@ -186,6 +187,7 @@</span><br><span> osmo_stats_vty_add_cmds();</span><br><span> osmo_ss7_vty_init_sg(tall_stp_ctx);</span><br><span> osmo_sccp_vty_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cpu_sched_vty_init(tall_stp_ctx);</span><br><span> osmo_fsm_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19681">change 19681</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/libosmo-sccp/+/19681"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib9faa68c1cd09a026909c792a1fd5557c9893fe3 </div>
<div style="display:none"> Gerrit-Change-Number: 19681 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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-MessageType: merged </div>