Skip to content

Commit

Permalink
Fix memory leak orphaned from Wisp
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mindgamesnl
Mindgamesnl committed Jun 18, 2024
1 parent 3603bf5 commit 2aa7ada
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 89 deletions.
1 change: 1 addition & 0 deletions modules/vistas-server/.tool-versions
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java adoptopenjdk-8.0.332+9
24 changes: 1 addition & 23 deletions modules/vistas-server/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,29 +115,7 @@
<additionalClasspathElements>
<additionalClasspathElement>${project.basedir}/target/classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
<configuration>
<destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
<datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/mats/Desktop</argLine>
</configuration>
</plugin>
<plugin>
Expand Down
29 changes: 3 additions & 26 deletions modules/vistas-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,32 +130,9 @@
<additionalClasspathElements>
<additionalClasspathElement>${project.basedir}/target/classes</additionalClasspathElement>
</additionalClasspathElements>
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/mats/Desktop</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<configuration>
<destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
<datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
</configuration>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<!-- attached to Maven test phase -->
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down Expand Up @@ -223,7 +200,7 @@
<dependency>
<groupId>com.coreoz</groupId>
<artifactId>wisp</artifactId>
<version>2.2.1</version>
<version>2.4.0</version>
<scope>compile</scope>
</dependency>

Expand All @@ -237,4 +214,4 @@

</dependencies>

</project>
</project>
61 changes: 24 additions & 37 deletions modules/vistas-server/src/main/java/com/craftmend/vistas/server/base/VistasScheduler.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
package com.craftmend.vistas.server.base;

import com.coreoz.wisp.JobStatus;
import com.coreoz.wisp.Scheduler;
import com.coreoz.wisp.schedule.Schedules;
import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
import com.craftmend.openaudiomc.generic.service.Service;

import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class VistasScheduler extends Service implements TaskService {

private Scheduler scheduler;
private final Scheduler scheduler;
private int taskCount = 0;
private List<Integer> runningTasks = new ArrayList<>();

public VistasScheduler() {
scheduler = new Scheduler();

scheduler.schedule(
"Terminated jobs cleaner",
() -> scheduler
.jobStatus()
.stream()
.filter(job -> job.status() == JobStatus.DONE)
// Clean only jobs that have finished executing since at least 10 seconds
.filter(job -> job.lastExecutionEndedTimeInMillis() < (System.currentTimeMillis() - 10000))
.forEach(job -> scheduler.remove(job.name())),
Schedules.fixedDelaySchedule(Duration.ofSeconds(5))
);
}

@Override
Expand All @@ -25,29 +36,12 @@ public int scheduleAsyncRepeatingTask(Runnable runnable, int delayUntilFirst, in
int intervalMs = tickInterval * 50;
int currentTask = taskCount++;

runningTasks.add(currentTask);
WrappedRunnable handler = new WrappedRunnable();

handler.setTask(() -> {
if (isCancelled(currentTask)) {
runningTasks.removeIf(task -> task == currentTask);
return;
}

runnable.run();

scheduler.schedule(
() -> {
handler.getTask().run();
},
Schedules.executeOnce(Schedules.fixedDelaySchedule(Duration.ofMillis(intervalMs)))
);

});

scheduler.schedule(
handler.getTask(),
Schedules.executeOnce(Schedules.fixedDelaySchedule(Duration.ofMillis(delayMs)))
currentTask + "",
() -> {
runnable.run();
},
Schedules.fixedDelaySchedule(Duration.ofMillis(intervalMs))
);

return currentTask;
Expand All @@ -62,35 +56,27 @@ public int scheduleSyncRepeatingTask(Runnable runnable, int delayUntilFirst, int
public int schduleSyncDelayedTask(Runnable runnable, int delay) {
int delayMs = delay * 50;
int currentTask = taskCount++;
runningTasks.add(currentTask);

scheduler.schedule(
currentTask + "",
() -> {
if (isCancelled(currentTask)) {
runningTasks.removeIf(task -> task == currentTask);
return;
}
runnable.run();
runningTasks.removeIf(task -> task == currentTask);
},
Schedules.executeOnce(Schedules.fixedDelaySchedule(Duration.ofMillis(delayMs)))
);

return currentTask;
}

public boolean isCancelled(int task) {
return !runningTasks.contains(task);
}

@Override
public void cancelRepeatingTask(int i) {
runningTasks.removeIf(task -> task == i);
scheduler.cancel(i + "");
}

@Override
public void runAsync(Runnable runnable) {
scheduler.schedule(
UUID.randomUUID().toString(),
() -> {
runnable.run();
},
Expand All @@ -101,6 +87,7 @@ public void runAsync(Runnable runnable) {
@Override
public void runSync(Runnable runnable) {
scheduler.schedule(
UUID.randomUUID().toString(),
runnable,
Schedules.executeOnce(Schedules.fixedDelaySchedule(Duration.ofMillis(1)))
);
Expand Down
78 changes: 75 additions & 3 deletions modules/vistas-server/src/test/java/vistas/test/TestServer.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package vistas.test;

import com.craftmend.openaudiomc.OpenAudioMc;
import com.craftmend.openaudiomc.generic.client.helpers.ClientRtcLocationUpdate;
import com.craftmend.openaudiomc.generic.client.objects.ClientConnection;
import com.craftmend.openaudiomc.generic.networking.packets.client.voice.PacketClientUpdateVoiceLocations;
import com.craftmend.openaudiomc.generic.networking.payloads.client.voice.ClientVoiceUpdatePeerLocationsPayload;
import com.craftmend.openaudiomc.generic.node.packets.ForwardSocketPacket;
import com.craftmend.openaudiomc.generic.oac.OpenaudioAccountService;
import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger;
import com.craftmend.openaudiomc.generic.proxy.interfaces.UserHooks;
import com.craftmend.openaudiomc.vistas.client.redis.packets.ServerRegisterPacket;
import com.craftmend.openaudiomc.vistas.client.redis.packets.UserJoinPacket;
import com.craftmend.openaudiomc.vistas.client.redis.packets.UserLeavePacket;
import com.craftmend.openaudiomc.vistas.client.Vistas;
import com.craftmend.openaudiomc.vistas.client.client.VistasRedisClient;
import com.craftmend.openaudiomc.vistas.client.redis.packets.*;
import com.craftmend.openaudiomc.vistas.client.server.networking.VistasRedisServer;
import com.craftmend.openaudiomc.vistas.client.users.ServerUserHooks;
import com.craftmend.vistas.server.VistasServer;
Expand All @@ -20,6 +25,8 @@
import vistas.test.utils.Waiter;

import java.net.Socket;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;

public class TestServer extends TestCase {
Expand Down Expand Up @@ -68,6 +75,7 @@ public void testFullStack() {
// fake register a minecraft server
UUID fakeServer1 = UUID.randomUUID();
UUID fakeServer2 = UUID.randomUUID();

OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new ServerRegisterPacket(fakeServer1));
OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new ServerRegisterPacket(fakeServer2));

Expand Down Expand Up @@ -151,6 +159,70 @@ public void testFullStack() {
assertEquals(0, OpenAudioMc.resolveDependency(ServerUserHooks.class).getRemoteUsers().size());
assertEquals(0, OpenAudioMc.resolveDependency(ServerUserHooks.class).getRemoteUsers().size());

startLoggingMemory();
startStressTesting();
}

private void startStressTesting() {
// crate server
UUID fakeServer1 = UUID.randomUUID();
OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new ServerRegisterPacket(fakeServer1));

Set<ClientRtcLocationUpdate> updates = new HashSet<>();

// loop 50 times
for (int i = 0; i < 50; i++) {
ClientRtcLocationUpdate update = new ClientRtcLocationUpdate("RandomStreamKey" + i, 1, 2, 3, 4);
updates.add(update);
}

TempUser tempUser = new TempUser(UUID.randomUUID().toString(), UUID.randomUUID());

while (true) {
// create user, send 1000 movement packets, then leave
//System.out.println("Stress testing user " + tempUser.getName());
OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new UserJoinPacket(
tempUser.getName(),
tempUser.getUuid(),
fakeServer1,
"localhost"
));

for (int i = 0; i < 1000; i++) {
// make movement update packet
PacketClientUpdateVoiceLocations packet = new PacketClientUpdateVoiceLocations(new ClientVoiceUpdatePeerLocationsPayload(updates));
OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new WrappedProxyPacket(
new ForwardSocketPacket(packet),
fakeServer1,
tempUser.getUuid()
));
}

// user logout
OpenAudioMc.getService(VistasRedisServer.class).getPacketEvents().handlePacket(null, new UserLeavePacket(
tempUser.getName(),
tempUser.getUuid(),
fakeServer1
));
}
}

private void startLoggingMemory() {
new Thread(() -> {
int max = 0;
while (true) {
int used = (int) ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024);
if (used > max) max = used;

System.out.println("Memory usage: " + used + "MB (max: " + max + "MB)");

try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}).start();
}

@Getter
Expand Down

0 comments on commit 2aa7ada

Please sign in to comment.