niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include payload in retransmit queue length

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-06-22 17:29:59 +02:00 • committed by eboasson
parent 66daba9f2f
commit 312df32605
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/options.md
View file

@ -640,7 +640,7 @@ This setting limits the maximum number of bytes queued for retransmission. The d
The unit must be specified explicitly. Recognised units: B (bytes), kB & KiB (2^10 bytes), MB & MiB (2^20 bytes), GB & GiB (2^30 bytes). The unit must be specified explicitly. Recognised units: B (bytes), kB & KiB (2^10 bytes), MB & MiB (2^20 bytes), GB & GiB (2^30 bytes).
The default value is: "50 kB". The default value is: "512 kB".
#### //CycloneDDS/Domain/Internal/MaxQueuedRexmitMessages #### //CycloneDDS/Domain/Internal/MaxQueuedRexmitMessages

2
etc/cyclonedds.rnc
View file

@ -452,7 +452,7 @@ CycloneDDS configuration""" ] ]
& [ a:documentation [ xml:lang="en" """ & [ a:documentation [ xml:lang="en" """
<p>This setting limits the maximum number of bytes queued for retransmission. The default value of 0 is unlimited unless an AuxiliaryBandwidthLimit has been set, in which case it becomes NackDelay * AuxiliaryBandwidthLimit. It must be large enough to contain the largest sample that may need to be retransmitted.</p> <p>This setting limits the maximum number of bytes queued for retransmission. The default value of 0 is unlimited unless an AuxiliaryBandwidthLimit has been set, in which case it becomes NackDelay * AuxiliaryBandwidthLimit. It must be large enough to contain the largest sample that may need to be retransmitted.</p>
<p>The unit must be specified explicitly. Recognised units: B (bytes), kB & KiB (2<sup>10</sup> bytes), MB & MiB (2<sup>20</sup> bytes), GB & GiB (2<sup>30</sup> bytes).</p> <p>The unit must be specified explicitly. Recognised units: B (bytes), kB & KiB (2<sup>10</sup> bytes), MB & MiB (2<sup>20</sup> bytes), GB & GiB (2<sup>30</sup> bytes).</p>
<p>The default value is: "50 kB".</p>""" ] ] <p>The default value is: "512 kB".</p>""" ] ]
element MaxQueuedRexmitBytes { element MaxQueuedRexmitBytes {
memsize memsize
}? }?

2
etc/cyclonedds.xsd
View file

@ -739,7 +739,7 @@ CycloneDDS configuration</xs:documentation>
<xs:documentation> <xs:documentation>
&lt;p&gt;This setting limits the maximum number of bytes queued for retransmission. The default value of 0 is unlimited unless an AuxiliaryBandwidthLimit has been set, in which case it becomes NackDelay * AuxiliaryBandwidthLimit. It must be large enough to contain the largest sample that may need to be retransmitted.&lt;/p&gt; &lt;p&gt;This setting limits the maximum number of bytes queued for retransmission. The default value of 0 is unlimited unless an AuxiliaryBandwidthLimit has been set, in which case it becomes NackDelay * AuxiliaryBandwidthLimit. It must be large enough to contain the largest sample that may need to be retransmitted.&lt;/p&gt;
&lt;p&gt;The unit must be specified explicitly. Recognised units: B (bytes), kB &amp; KiB (2&lt;sup&gt;10&lt;/sup&gt; bytes), MB &amp; MiB (2&lt;sup&gt;20&lt;/sup&gt; bytes), GB &amp; GiB (2&lt;sup&gt;30&lt;/sup&gt; bytes).&lt;/p&gt; &lt;p&gt;The unit must be specified explicitly. Recognised units: B (bytes), kB &amp; KiB (2&lt;sup&gt;10&lt;/sup&gt; bytes), MB &amp; MiB (2&lt;sup&gt;20&lt;/sup&gt; bytes), GB &amp; GiB (2&lt;sup&gt;30&lt;/sup&gt; bytes).&lt;/p&gt;
&lt;p&gt;The default value is: "50 kB".&lt;/p&gt;</xs:documentation> &lt;p&gt;The default value is: "512 kB".&lt;/p&gt;</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>
<xs:element name="MaxQueuedRexmitMessages" type="xs:integer"> <xs:element name="MaxQueuedRexmitMessages" type="xs:integer">

2
src/core/ddsi/include/dds/ddsi/ddsi_cfgelems.h
View file

@ -1140,7 +1140,7 @@ static struct cfgelem internal_cfgelems[] = {
"<p>This element allows configuring the base interval for sending " "<p>This element allows configuring the base interval for sending "
"writer heartbeats and the bounds within which it can vary.</p>"), "writer heartbeats and the bounds within which it can vary.</p>"),
UNIT("duration_inf")), UNIT("duration_inf")),
STRING("MaxQueuedRexmitBytes", NULL, 1, "50 kB", STRING("MaxQueuedRexmitBytes", NULL, 1, "512 kB",
MEMBER(max_queued_rexmit_bytes), MEMBER(max_queued_rexmit_bytes),
FUNCTIONS(0, uf_memsize, 0, pf_memsize), FUNCTIONS(0, uf_memsize, 0, pf_memsize),
DESCRIPTION( DESCRIPTION(

2
src/core/ddsi/src/q_xmsg.c
View file

@ -492,7 +492,7 @@ int nn_xmsg_compare_fragid (const struct nn_xmsg *a, const struct nn_xmsg *b)
size_t nn_xmsg_size (const struct nn_xmsg *m) size_t nn_xmsg_size (const struct nn_xmsg *m)
{ {
return m->sz; return m->sz + (m->refd_payload ? (size_t) m->refd_payload_iov.iov_len : 0);
} }
enum nn_xmsg_kind nn_xmsg_kind (const struct nn_xmsg *m) enum nn_xmsg_kind nn_xmsg_kind (const struct nn_xmsg *m)