Skip to content
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

Jump to bottom

Use monotonic clocks for QMUX. #416

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use monotonic clocks for QMUX. #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions jpos/src/main/java/org/jpos/q2/iso/QMUX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

import java.io.IOException;
import java.io.PrintStream;
import java.time.Duration;
import java.time.Instant;
import java.util.*;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -58,7 +60,7 @@ public class QMUX

List<ISORequestListener> listeners;
private volatile int rx, tx, rxExpired, txExpired, rxPending, rxUnhandled, rxForwarded;
private volatile long lastTxn = 0L;
private volatile Duration lastTxn = null;
private boolean listenerRegistered;
public QMUX () {
super ();
Expand Down Expand Up @@ -161,7 +163,7 @@ public ISOMsg request (ISOMsg m, long timeout) throws ISOException {
if (resp != null)
{
rx++;
lastTxn = System.currentTimeMillis();
lastTxn = Duration.ofNanos(System.nanoTime());
}else {
rxExpired++;
if (m.getDirection() != ISOMsg.OUTGOING)
Expand Down Expand Up @@ -351,7 +353,7 @@ public boolean removeISORequestListener(ISORequestListener l) {
}
public synchronized void resetCounters() {
rx = tx = rxExpired = txExpired = rxPending = rxUnhandled = rxForwarded = 0;
lastTxn = 0l;
lastTxn = null;
}
public String getCountersAsString () {
StringBuffer sb = new StringBuffer();
Expand All @@ -366,10 +368,10 @@ public String getCountersAsString () {
sb.append (", connected=");
sb.append (Boolean.toString(isConnected()));
sb.append (", last=");
sb.append (lastTxn);
if (lastTxn > 0) {
sb.append (getLastTxnTimestampInMillis());
if (lastTxn != null) {
sb.append (", idle=");
sb.append(System.currentTimeMillis() - lastTxn);
sb.append(Duration.ofNanos(System.nanoTime()).minus(lastTxn).toMillis());
sb.append ("ms");
}
return sb.toString();
Expand Down Expand Up @@ -413,10 +415,12 @@ public int getRXForwarded() {
}

public long getLastTxnTimestampInMillis() {
return lastTxn;
if (lastTxn == null)
return 0L;
return Instant.now().minus(Duration.ofNanos(System.nanoTime()).minus(lastTxn)).toEpochMilli();
}
public long getIdleTimeInMillis() {
return lastTxn > 0L ? System.currentTimeMillis() - lastTxn : -1L;
return lastTxn != null ? Duration.ofNanos(System.nanoTime()).minus(lastTxn).toMillis() : -1L;
}

protected void processUnhandled (ISOMsg m) {
Expand Down Expand Up @@ -529,7 +533,7 @@ public void responseReceived (ISOMsg response) {
synchronized (QMUX.this) {
rx++;
rxPending--;
lastTxn = System.currentTimeMillis();
lastTxn = Duration.ofNanos(System.nanoTime());
}
long elapsed = chrono.elapsed();
metrics.record("all", elapsed);
Expand Down
1 change: 1 addition & 0 deletions jpos/src/test/java/org/jpos/q2/iso/QMUXTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public static void setUp(@TempDir Path deployDir) throws IOException {
});
q2 = new Q2(deployDir.toString());
q2.start();
q2.ready(5000L);
mux = NameRegistrar.get("mux.mux", 2000L);
assertNotNull(mux);
receivedHandback = null;
Expand Down