<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20301">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">write_queue: use msgb_{en,de}queue_count()<br><br>The write_queue.c implemetation predates the msgb_*queue_count()<br>functions for maintaining a count alongside witha msgb queue. Let's<br>migrate over to those implementations.<br><br>Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7<br>---<br>M src/write_queue.c<br>1 file changed, 3 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/write_queue.c b/src/write_queue.c</span><br><span>index c7dedc4..422eda4 100644</span><br><span>--- a/src/write_queue.c</span><br><span>+++ b/src/write_queue.c</span><br><span>@@ -64,11 +64,9 @@</span><br><span> </span><br><span> fd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_dequeue_count(&queue->msg_queue, &queue->current_length);</span><br><span> /* the queue might have been emptied */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!llist_empty(&queue->msg_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- --queue->current_length;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_dequeue(&queue->msg_queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg) {</span><br><span> rc = queue->write_cb(fd, msg);</span><br><span> msgb_free(msg);</span><br><span> </span><br><span>@@ -110,8 +108,7 @@</span><br><span> if (queue->current_length >= queue->max_length)</span><br><span> return -ENOSPC;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ++queue->current_length;</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_enqueue(&queue->msg_queue, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_enqueue_count(&queue->msg_queue, data, &queue->current_length);</span><br><span> queue->bfd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20301">change 20301</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/+/20301"/><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: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 </div>
<div style="display:none"> Gerrit-Change-Number: 20301 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </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-MessageType: merged </div>