diff --git a/pom.xml b/pom.xml
index 56f3eee..cc9b43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,9 @@
UTF-8
- 1.1-73-gf8e9405
- 1.3.72
- 4.1.3
+ 1.1-90-gfa0e11e
+ 1.5.20
+ 4.6.1
5.7.0
1.4.32
@@ -59,7 +59,7 @@
${project.groupId}
jitsi-utils
- 1.0-72-gcf6d1f8
+ 1.0-94-ge7c7a43
${project.groupId}
@@ -294,7 +294,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.6
+ 0.8.7
diff --git a/src/main/java/org/ice4j/ice/harvest/AbstractUdpListener.java b/src/main/java/org/ice4j/ice/harvest/AbstractUdpListener.java
index ba05d0b..7334998 100644
--- a/src/main/java/org/ice4j/ice/harvest/AbstractUdpListener.java
+++ b/src/main/java/org/ice4j/ice/harvest/AbstractUdpListener.java
@@ -24,6 +24,7 @@ import org.jitsi.utils.queue.*;
import java.io.*;
import java.net.*;
+import java.time.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.logging.*;
@@ -460,7 +461,7 @@ public abstract class AbstractUdpListener
this.remoteAddress = remoteAddress;
if (logger.isLoggable(Level.FINEST))
{
- queueStatistics = new QueueStatistics();
+ queueStatistics = new QueueStatistics(QUEUE_SIZE, Clock.systemUTC());
}
else
{
@@ -485,7 +486,7 @@ public abstract class AbstractUdpListener
+ remoteAddress + " ufrag=" + ufrag);
if (queueStatistics != null)
{
- queueStatistics.remove(System.currentTimeMillis());
+ queueStatistics.dropped();
}
queue.poll();
}
@@ -493,7 +494,7 @@ public abstract class AbstractUdpListener
queue.offer(buf);
if (queueStatistics != null)
{
- queueStatistics.add(System.currentTimeMillis());
+ queueStatistics.added();
}
queue.notify();
@@ -631,9 +632,9 @@ public abstract class AbstractUdpListener
}
buf = queue.poll();
- if (queueStatistics != null)
+ if (buf != null && queueStatistics != null)
{
- queueStatistics.remove(System.currentTimeMillis());
+ queueStatistics.removed(queue.size(), null);
}
}
}
diff --git a/src/main/java/org/ice4j/stack/NetAccessManager.java b/src/main/java/org/ice4j/stack/NetAccessManager.java
index 15988b0..c54fdb6 100644
--- a/src/main/java/org/ice4j/stack/NetAccessManager.java
+++ b/src/main/java/org/ice4j/stack/NetAccessManager.java
@@ -21,7 +21,6 @@ import org.ice4j.*;
import org.ice4j.message.*;
import org.ice4j.socket.*;
import org.jitsi.utils.concurrent.*;
-import org.jitsi.utils.queue.*;
import java.io.*;
import java.net.*;
@@ -140,15 +139,6 @@ class NetAccessManager
*/
private final AtomicBoolean isStopped = new AtomicBoolean(false);
- /**
- * Optionally enabled QueueStatistics to keep track throughput
- * of processing {@link MessageProcessingTask}
- */
- private final QueueStatistics queueStatistics
- = logger.isLoggable(Level.FINEST)
- ? new QueueStatistics()
- : null;
-
/**
* Callback to be called when scheduled MessageProcessingTask
* completes processing it's RawMessage.
@@ -158,17 +148,11 @@ class NetAccessManager
activeTasks.remove(messageProcessingTask);
- if (queueStatistics != null)
- {
- queueStatistics.remove(System.currentTimeMillis());
- }
-
final boolean isAdded = taskPool.offer(messageProcessingTask);
if (!isAdded && logger.isLoggable(Level.FINEST))
{
logger.finest("Dropping MessageProcessingTask for "
- + this + " because pool is full, max pool size is "
- + String.valueOf(TASK_POOL_SIZE));
+ + this + " because pool is full, max pool size is " + TASK_POOL_SIZE);
}
};
@@ -568,10 +552,6 @@ class NetAccessManager
activeTasks.add(messageProcessingTask);
- if (queueStatistics != null)
- {
- queueStatistics.add(System.currentTimeMillis());
- }
// Use overload which does not return Future object to avoid
// unnecessary allocation
messageProcessingExecutor.execute(messageProcessingTask);