Update kotlin to 1.5.20. (#232)
* ref: Remove unused code (stats never queried). * chore: Update jitsi-utils. * chore: Update kotlin to 1.5.20. * chore: Update jitsi-utils * Update kotlin to 1.5.20. * chore: Update jicoco. * chore: Update jacoco to 0.8.7.
This commit is contained in:
parent
10346acade
commit
311a495b21
10
pom.xml
10
pom.xml
@ -38,9 +38,9 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<jicoco.version>1.1-73-gf8e9405</jicoco.version>
|
<jicoco.version>1.1-90-gfa0e11e</jicoco.version>
|
||||||
<kotlin.version>1.3.72</kotlin.version>
|
<kotlin.version>1.5.20</kotlin.version>
|
||||||
<kotest.version>4.1.3</kotest.version>
|
<kotest.version>4.6.1</kotest.version>
|
||||||
<junit.version>5.7.0</junit.version>
|
<junit.version>5.7.0</junit.version>
|
||||||
<dokka.version>1.4.32</dokka.version>
|
<dokka.version>1.4.32</dokka.version>
|
||||||
</properties>
|
</properties>
|
||||||
@ -59,7 +59,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>jitsi-utils</artifactId>
|
<artifactId>jitsi-utils</artifactId>
|
||||||
<version>1.0-72-gcf6d1f8</version>
|
<version>1.0-94-ge7c7a43</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
@ -294,7 +294,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jacoco</groupId>
|
<groupId>org.jacoco</groupId>
|
||||||
<artifactId>jacoco-maven-plugin</artifactId>
|
<artifactId>jacoco-maven-plugin</artifactId>
|
||||||
<version>0.8.6</version>
|
<version>0.8.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import org.jitsi.utils.queue.*;
|
|||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
|
import java.time.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
import java.util.logging.*;
|
import java.util.logging.*;
|
||||||
@ -460,7 +461,7 @@ public abstract class AbstractUdpListener
|
|||||||
this.remoteAddress = remoteAddress;
|
this.remoteAddress = remoteAddress;
|
||||||
if (logger.isLoggable(Level.FINEST))
|
if (logger.isLoggable(Level.FINEST))
|
||||||
{
|
{
|
||||||
queueStatistics = new QueueStatistics();
|
queueStatistics = new QueueStatistics(QUEUE_SIZE, Clock.systemUTC());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -485,7 +486,7 @@ public abstract class AbstractUdpListener
|
|||||||
+ remoteAddress + " ufrag=" + ufrag);
|
+ remoteAddress + " ufrag=" + ufrag);
|
||||||
if (queueStatistics != null)
|
if (queueStatistics != null)
|
||||||
{
|
{
|
||||||
queueStatistics.remove(System.currentTimeMillis());
|
queueStatistics.dropped();
|
||||||
}
|
}
|
||||||
queue.poll();
|
queue.poll();
|
||||||
}
|
}
|
||||||
@ -493,7 +494,7 @@ public abstract class AbstractUdpListener
|
|||||||
queue.offer(buf);
|
queue.offer(buf);
|
||||||
if (queueStatistics != null)
|
if (queueStatistics != null)
|
||||||
{
|
{
|
||||||
queueStatistics.add(System.currentTimeMillis());
|
queueStatistics.added();
|
||||||
}
|
}
|
||||||
|
|
||||||
queue.notify();
|
queue.notify();
|
||||||
@ -631,9 +632,9 @@ public abstract class AbstractUdpListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
buf = queue.poll();
|
buf = queue.poll();
|
||||||
if (queueStatistics != null)
|
if (buf != null && queueStatistics != null)
|
||||||
{
|
{
|
||||||
queueStatistics.remove(System.currentTimeMillis());
|
queueStatistics.removed(queue.size(), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,6 @@ import org.ice4j.*;
|
|||||||
import org.ice4j.message.*;
|
import org.ice4j.message.*;
|
||||||
import org.ice4j.socket.*;
|
import org.ice4j.socket.*;
|
||||||
import org.jitsi.utils.concurrent.*;
|
import org.jitsi.utils.concurrent.*;
|
||||||
import org.jitsi.utils.queue.*;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
@ -140,15 +139,6 @@ class NetAccessManager
|
|||||||
*/
|
*/
|
||||||
private final AtomicBoolean isStopped = new AtomicBoolean(false);
|
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 <tt>MessageProcessingTask</tt>
|
* Callback to be called when scheduled <tt>MessageProcessingTask</tt>
|
||||||
* completes processing it's <tt>RawMessage</tt>.
|
* completes processing it's <tt>RawMessage</tt>.
|
||||||
@ -158,17 +148,11 @@ class NetAccessManager
|
|||||||
|
|
||||||
activeTasks.remove(messageProcessingTask);
|
activeTasks.remove(messageProcessingTask);
|
||||||
|
|
||||||
if (queueStatistics != null)
|
|
||||||
{
|
|
||||||
queueStatistics.remove(System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
|
|
||||||
final boolean isAdded = taskPool.offer(messageProcessingTask);
|
final boolean isAdded = taskPool.offer(messageProcessingTask);
|
||||||
if (!isAdded && logger.isLoggable(Level.FINEST))
|
if (!isAdded && logger.isLoggable(Level.FINEST))
|
||||||
{
|
{
|
||||||
logger.finest("Dropping MessageProcessingTask for "
|
logger.finest("Dropping MessageProcessingTask for "
|
||||||
+ this + " because pool is full, max pool size is "
|
+ this + " because pool is full, max pool size is " + TASK_POOL_SIZE);
|
||||||
+ String.valueOf(TASK_POOL_SIZE));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -568,10 +552,6 @@ class NetAccessManager
|
|||||||
|
|
||||||
activeTasks.add(messageProcessingTask);
|
activeTasks.add(messageProcessingTask);
|
||||||
|
|
||||||
if (queueStatistics != null)
|
|
||||||
{
|
|
||||||
queueStatistics.add(System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
// Use overload which does not return Future object to avoid
|
// Use overload which does not return Future object to avoid
|
||||||
// unnecessary allocation
|
// unnecessary allocation
|
||||||
messageProcessingExecutor.execute(messageProcessingTask);
|
messageProcessingExecutor.execute(messageProcessingTask);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user