<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/17030">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stream: Re-arrange cli states to fix 100% cpu usage bug<br><br>With previous state, osmo_stream_cli_close() could be called from<br>osmo_stream_cli_open()(), and in that case state was kept as NONE while<br>ending up with an associated fd being registered in the select loop.<br>As a result, osmo_stream_cli_fd_cb() could be called while in state<br>NONE, which was not expected and would simply return without modifying<br>fd state flags, causing it to be called again and again.<br><br>Related: OS#4378<br>Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4<br>---<br>M src/stream.c<br>1 file changed, 11 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 1a38e77..c47ae3e 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -129,9 +129,9 @@</span><br><span> */</span><br><span> </span><br><span> enum osmo_stream_cli_state {</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_NONE = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_CONNECTING = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_CONNECTED = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_NONE = 0, /* No fd associated, may have timer active to try to connect again */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_CONNECTING = 1, /* Fd associated, but connection not yet confirmed by peer or lower layers */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_CONNECTED = 2, /* Fd associated and connection is established */</span><br><span> STREAM_CLI_STATE_MAX</span><br><span> };</span><br><span> </span><br><span>@@ -190,7 +190,6 @@</span><br><span> LOGSCLI(cli, LOGL_INFO, "retrying in %d seconds...\n",</span><br><span> cli->reconnect_timeout);</span><br><span> osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- cli->state = STREAM_CLI_STATE_CONNECTING;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Check if Osmocom Stream Client is in connected state</span><br><span>@@ -324,7 +323,8 @@</span><br><span> }</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state);</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -345,11 +345,10 @@</span><br><span> </span><br><span> cli->proto = IPPROTO_TCP;</span><br><span> cli->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span> cli->ofd.priv_nr = 0; /* XXX */</span><br><span> cli->ofd.cb = osmo_stream_cli_fd_cb;</span><br><span> cli->ofd.data = cli;</span><br><span style="color: hsl(0, 100%, 40%);">- cli->state = STREAM_CLI_STATE_CONNECTING;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->state = STREAM_CLI_STATE_NONE;</span><br><span> osmo_timer_setup(&cli->timer, cli_timer_cb, cli);</span><br><span> cli->reconnect_timeout = 5; /* default is 5 seconds. */</span><br><span> INIT_LLIST_HEAD(&cli->tx_queue);</span><br><span>@@ -583,6 +582,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> cli->ofd.fd = ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span> </span><br><span> if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span> ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -593,6 +593,7 @@</span><br><span> if (osmo_fd_register(&cli->ofd) < 0)</span><br><span> goto error_close_socket;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ cli->state = STREAM_CLI_STATE_CONNECTING;</span><br><span> return 0;</span><br><span> </span><br><span> error_close_socket:</span><br><span>@@ -653,6 +654,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> cli->ofd.fd = ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span> </span><br><span> if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span> ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -663,6 +665,7 @@</span><br><span> if (osmo_fd_register(&cli->ofd) < 0)</span><br><span> goto error_close_socket;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ cli->state = STREAM_CLI_STATE_CONNECTING;</span><br><span> return 0;</span><br><span> </span><br><span> error_close_socket:</span><br><span>@@ -676,15 +679,7 @@</span><br><span> struct osmo_stream_cli *cli = data;</span><br><span> </span><br><span> LOGSCLI(cli, LOGL_DEBUG, "reconnecting.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch(cli->state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case STREAM_CLI_STATE_CONNECTING:</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stream_cli_open(cli);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stream_cli_open(cli);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Enqueue data to be sent via an Osmocom stream client</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/17030">change 17030</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-netif/+/17030"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 </div>
<div style="display:none"> Gerrit-Change-Number: 17030 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>