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

Fix some thread safety and exception-related problems #195

Merged
merged 3 commits into from
Aug 28, 2022
+57 −50
Merged

Fix some thread safety and exception-related problems #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bfb429
Fix handling of futures and exceptions in EconomyProvider
A248 Aug 25, 2022
242bcf4
Use ExecutorService#execute to avoid swallowing exceptions
A248 Aug 25, 2022
6690f82
Make EventTypeTracker thread-safe + some code cleanup
A248 Aug 25, 2022
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
2 changes: 1 addition & 1 deletion api/src/main/java/me/lokka30/treasury/api/common/event/EventBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public <T> FireCompletion<T> fire(@NotNull T event) {
List<Class<?>> friends = eventTypes.getFriendsOf(event.getClass());
ExecutorService async = EventExecutorTracker.INSTANCE.getExecutor(event.getClass());
FireCompletion<T> ret = new FireCompletion<>(event.getClass());
async.submit(() -> {
async.execute(() -> {
List<Completion> completions = new ArrayList<>();
EventCaller caller = events.get(event.getClass());
if (caller != null) {
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/me/lokka30/treasury/api/common/event/EventCaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public Completion call(Object event) {
return Completion.completed();
}
Completion completion = new Completion();
EventExecutorTracker.INSTANCE.getExecutor(eventClass).submit(() -> {
EventExecutorTracker.INSTANCE.getExecutor(eventClass).execute(() -> {
List<Throwable> errors = call(event, new ArrayList<>(), 0);
if (!errors.isEmpty()) {
completion.completeExceptionally(errors);
Expand Down
29 changes: 12 additions & 17 deletions api/src/main/java/me/lokka30/treasury/api/common/event/EventTypeTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,32 @@

import com.google.common.reflect.TypeToken;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;

class EventTypeTracker {

private Map<Class<?>, List<Class<?>>> friends = new HashMap<>();
private final Map<Class<?>, List<Class<?>>> friends = new ConcurrentHashMap<>();

public List<Class<?>> getFriendsOf(Class<?> eventType) {
if (friends.containsKey(eventType)) {
return Collections.unmodifiableList(friends.get(eventType));
}

List<Class<?>> types = getEventTypes(eventType);
friends.put(
eventType,
types.stream().filter(type -> type != eventType).collect(Collectors.toList())
);

return friends.get(eventType);
public List<Class<?>> getFriendsOf(Class<?> event) {
List<Class<?>> computedFriends = friends.computeIfAbsent((event), (eventType) -> {
return getEventTypes(eventType)
.filter(type -> type != eventType)
.collect(Collectors.toList());
});
return Collections.unmodifiableList(computedFriends);
}

private static List<Class<?>> getEventTypes(Class<?> eventType) {
private static <E> Stream<Class<? super E>> getEventTypes(Class<E> eventType) {
return TypeToken
.of(eventType)
.getTypes()
.rawTypes()
.stream()
.filter(type -> type != Object.class && type != Cancellable.class)
.collect(Collectors.toList());
.filter(type -> type != Object.class && type != Cancellable.class);
}

}
74 changes: 43 additions & 31 deletions api/src/main/java/me/lokka30/treasury/api/economy/EconomyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

package me.lokka30.treasury.api.economy;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -222,20 +225,12 @@ default void retrieveAllAccountsPlayerIsMemberOf(
subscription.succeed(identifiers);
return;
}
Set<String> ret = new HashSet<>();
Set<String> ret = Collections.synchronizedSet(new HashSet<>());
List<CompletableFuture<Void>> futures = new ArrayList<>(identifiers.size());
for (String identifier : identifiers) {
EconomySubscriber.<Account>asFuture(subscriber -> retrieveAccount(identifier,
subscriber
)).exceptionally(throwable -> {
if (throwable instanceof EconomyException) {
subscription.fail((EconomyException) throwable);
} else {
subscription.fail(new EconomyException(EconomyFailureReason.OTHER_FAILURE,
throwable
));
}
return null;
}).thenCompose(account -> {
futures.add(EconomySubscriber.<Account>asFuture(
subscriber -> retrieveAccount(identifier, subscriber)
).thenCompose(account -> {
if (account == null) {
return CompletableFuture.completedFuture(false);
}
Expand All @@ -250,10 +245,22 @@ default void retrieveAllAccountsPlayerIsMemberOf(
if (val) {
ret.add(identifier);
}
});

}));
}
subscription.succeed(ret);
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.thenRun(() -> {
subscription.succeed(ret);
})
.exceptionally((throwable) -> {
if (throwable instanceof EconomyException) {
subscription.fail((EconomyException) throwable);
} else {
subscription.fail(new EconomyException(EconomyFailureReason.OTHER_FAILURE,
throwable
));
}
return null;
});
});
}

Expand Down Expand Up @@ -288,20 +295,12 @@ default void retrieveAllAccountsPlayerHasPermission(
subscription.succeed(identifiers);
return;
}
Set<String> ret = new HashSet<>();
Set<String> ret = Collections.synchronizedSet(new HashSet<>());
List<CompletableFuture<Void>> futures = new ArrayList<>(identifiers.size());
for (String identifier : identifiers) {
EconomySubscriber.<Account>asFuture(subscriber -> retrieveAccount(identifier,
subscriber
)).exceptionally(throwable -> {
if (throwable instanceof EconomyException) {
subscription.fail((EconomyException) throwable);
} else {
subscription.fail(new EconomyException(EconomyFailureReason.OTHER_FAILURE,
throwable
));
}
return null;
}).thenCompose(account -> {
futures.add(EconomySubscriber.<Account>asFuture(
subscriber -> retrieveAccount(identifier, subscriber)
).thenCompose(account -> {
if (account == null) {
return CompletableFuture.completedFuture(false);
}
Expand All @@ -327,9 +326,22 @@ public void fail(@NotNull final EconomyException exception) {
if (val) {
ret.add(identifier);
}
});
}));
}
subscription.succeed(ret);
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.thenRun(() -> {
subscription.succeed(ret);
})
.exceptionally((throwable) -> {
if (throwable instanceof EconomyException) {
subscription.fail((EconomyException) throwable);
} else {
subscription.fail(new EconomyException(EconomyFailureReason.OTHER_FAILURE,
throwable
));
}
return null;
});
});
}

Expand Down