vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-22 10:37:59 +01:00
Code Issues Releases Wiki Activity

tcp: increase unack'ed stanza queue size, decrease ack request limit

Browse source 
To reduce the chances of a deadlock between read and writer if SM
unacked stanza queue is full. See SMACK-881.
This commit is contained in:
Florian Schmaus 2020-04-07 23:10:35 +02:00
parent 9c7f62ec07
commit bfff412112
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -1152,6 +1152,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
protected class PacketWriter { protected class PacketWriter {
public static final int QUEUE_SIZE = XMPPTCPConnection.QUEUE_SIZE; public static final int QUEUE_SIZE = XMPPTCPConnection.QUEUE_SIZE;
public static final int UNACKKNOWLEDGED_STANZAS_QUEUE_SIZE = 1024;
public static final int UNACKKNOWLEDGED_STANZAS_QUEUE_SIZE_HIGH_WATER_MARK = (int) (0.3 * UNACKKNOWLEDGED_STANZAS_QUEUE_SIZE);
private final String threadName = "Smack Writer (" + getConnectionCounter() + ')'; private final String threadName = "Smack Writer (" + getConnectionCounter() + ')';
@ -1337,7 +1339,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
// The client needs to add messages to the unacknowledged stanzas queue // The client needs to add messages to the unacknowledged stanzas queue
// right after it sent 'enabled'. Stanza will be added once // right after it sent 'enabled'. Stanza will be added once
// unacknowledgedStanzas is not null. // unacknowledgedStanzas is not null.
unacknowledgedStanzas = new ArrayBlockingQueue<>(QUEUE_SIZE); unacknowledgedStanzas = new ArrayBlockingQueue<>(UNACKKNOWLEDGED_STANZAS_QUEUE_SIZE);
} }
maybeAddToUnacknowledgedStanzas(packet); maybeAddToUnacknowledgedStanzas(packet);
@ -1439,9 +1441,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
// packet order is not stable at this point (sendStanzaInternal() can be // packet order is not stable at this point (sendStanzaInternal() can be
// called concurrently). // called concurrently).
if (unacknowledgedStanzas != null && stanza != null) { if (unacknowledgedStanzas != null && stanza != null) {
// If the unacknowledgedStanza queue is nearly full, request an new ack // If the unacknowledgedStanza queue reaching its high water mark, request an new ack
// from the server in order to drain it // from the server in order to drain it
if (unacknowledgedStanzas.size() == 0.8 * XMPPTCPConnection.QUEUE_SIZE) { if (unacknowledgedStanzas.size() == UNACKKNOWLEDGED_STANZAS_QUEUE_SIZE_HIGH_WATER_MARK) {
writer.write(AckRequest.INSTANCE.toXML().toString()); writer.write(AckRequest.INSTANCE.toXML().toString());
writer.flush(); writer.flush();
} }