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:
bgrozev 2021-07-14 14:58:07 -05:00 committed by GitHub
parent 10346acade
commit 311a495b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 31 deletions

10
pom.xml
View File

@ -38,9 +38,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jicoco.version>1.1-73-gf8e9405</jicoco.version>
<kotlin.version>1.3.72</kotlin.version>
<kotest.version>4.1.3</kotest.version>
<jicoco.version>1.1-90-gfa0e11e</jicoco.version>
<kotlin.version>1.5.20</kotlin.version>
<kotest.version>4.6.1</kotest.version>
<junit.version>5.7.0</junit.version>
<dokka.version>1.4.32</dokka.version>
</properties>
@ -59,7 +59,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-utils</artifactId>
<version>1.0-72-gcf6d1f8</version>
<version>1.0-94-ge7c7a43</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@ -294,7 +294,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<version>0.8.7</version>
<executions>
<execution>
<goals>

View File

@ -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);
}
}
}

View File

@ -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 <tt>MessageProcessingTask</tt>
* completes processing it's <tt>RawMessage</tt>.
@ -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);