Skip to content

Port of a fix for stale sleeping threads that was originally done in … #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Port of a fix for stale sleeping threads that was originally done in … #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e8ed84
added a testcase and fixed Issue-918
marco-kaeferbeck Apr 22, 2022
c06adb8
Merge pull request #948 from eclipse/develop
rdasgupt Aug 6, 2022
5d7dc22
Merge pull request #926 from marco-kaeferbeck/bugfix/Issue-918_topic_…
rdasgupt Aug 6, 2022
aa69bcc
Merge pull request #949 from eclipse/develop
rdasgupt Aug 6, 2022
f4e0db8
Merge pull request #950 from eclipse/develop
rdasgupt Aug 6, 2022
478cfe9
Port of a fix for stale sleeping threads that was originally done in …
Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ....mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/common/utils/MqttTopicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void testMatchedTopicFilterWildcards() throws Exception {
String[][] matchingTopics = new String[][] { { "sport/tennis/player1/#", "sport/tennis/player1" },
{ "sport/tennis/player1/#", "sport/tennis/player1/ranking" },
{ "sport/tennis/player1/#", "sport/tennis/player1/score/wimbledon" }, { "sport/#", "sport" },
{ "#", "sport/tennis/player1" } };
{ "#", "sport/tennis/player1" } , {"sport/+/player1/ranking/#","sport/tennis/player1/ranking"} };

for (String[] pair : matchingTopics) {
Assert.assertTrue(pair[0] + " should match " + pair[1], MqttTopicValidator.isMatched(pair[0], pair[1]));
Expand Down
9 changes: 9 additions & 0 deletions ...ho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
*/
public class CommsCallback implements Runnable {
private static final String CLASS_NAME = CommsCallback.class.getName();
private static final int MAX_STOPPED_STATE_TO_STOP_THREAD = 300; //30s
private Logger log = LoggerFactory.getLogger(LoggerFactory.MQTT_CLIENT_MSG_CAT, CLASS_NAME);

private static final int INBOUND_QUEUE_SIZE = 10;
Expand Down Expand Up @@ -119,8 +120,16 @@ public void start(String threadName, ExecutorService executorService) {
}
}
}
AtomicInteger stoppedStateCounter = new AtomicInteger(0);
while (!isRunning()) {
try { Thread.sleep(100); } catch (Exception e) { }
if (current_state == State.STOPPED) {
if (stoppedStateCounter.incrementAndGet() > MAX_STOPPED_STATE_TO_STOP_THREAD) {
break;
}
} else {
stoppedStateCounter.set(0);
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions ...ho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.InputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;

import org.eclipse.paho.mqttv5.client.MqttClientException;
import org.eclipse.paho.mqttv5.client.MqttToken;
Expand All @@ -35,6 +36,7 @@
*/
public class CommsReceiver implements Runnable {
private static final String CLASS_NAME = CommsReceiver.class.getName();
private static final int MAX_STOPPED_STATE_TO_STOP_THREAD = 300; //30s
private Logger log = LoggerFactory.getLogger(LoggerFactory.MQTT_CLIENT_MSG_CAT, CLASS_NAME);

private enum State {STOPPED, RUNNING, STARTING, RECEIVING}
Expand Down Expand Up @@ -82,8 +84,16 @@ public void start(String threadName, ExecutorService executorService) {
}
}
}
AtomicInteger stoppedStateCounter = new AtomicInteger(0);
while (!isRunning()) {
try { Thread.sleep(100); } catch (Exception e) { }
if (current_state == State.STOPPED) {
if (stoppedStateCounter.incrementAndGet() > MAX_STOPPED_STATE_TO_STOP_THREAD) {
break;
}
} else {
stoppedStateCounter.set(0);
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions ...paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.OutputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;

import org.eclipse.paho.mqttv5.client.MqttClientException;
import org.eclipse.paho.mqttv5.client.MqttToken;
Expand All @@ -33,6 +34,7 @@

public class CommsSender implements Runnable {
private static final String CLASS_NAME = CommsSender.class.getName();
private static final int MAX_STOPPED_STATE_TO_STOP_THREAD = 300; //30s
private Logger log = LoggerFactory.getLogger(LoggerFactory.MQTT_CLIENT_MSG_CAT, CLASS_NAME);

//Sends MQTT packets to the server on its own thread
Expand Down Expand Up @@ -76,8 +78,16 @@ public void start(String threadName, ExecutorService executorService) {
}
}
}
AtomicInteger stoppedStateCounter = new AtomicInteger(0);
while (!isRunning()) {
try { Thread.sleep(100); } catch (Exception e) { }
if (current_state == State.STOPPED) {
if (stoppedStateCounter.incrementAndGet() > MAX_STOPPED_STATE_TO_STOP_THREAD) {
break;
}
} else {
stoppedStateCounter.set(0);
}
}
}

Expand Down
Loading