Revert "Synchronize arbitrary data list removals, as it seems that SynchronizedList and SynchronizedMap aren't overriding removeIf() with a thread-safe version."

This reverts commit e5f88fe2f4.
This commit is contained in:
CalDescent 2022-03-12 09:40:13 +00:00
parent df0a9701ba
commit c65de74d13
5 changed files with 10 additions and 30 deletions

View File

@ -75,13 +75,9 @@ public class ArbitraryDataBuildManager extends Thread {
if (now == null) {
return;
}
synchronized (arbitraryDataBuildQueue) {
arbitraryDataBuildQueue.entrySet().removeIf(entry -> entry.getValue().hasReachedBuildTimeout(now));
}
synchronized (arbitraryDataFailedBuilds) {
arbitraryDataFailedBuilds.entrySet().removeIf(entry -> entry.getValue().hasReachedFailureTimeout(now));
}
}
// Build queue

View File

@ -84,10 +84,8 @@ public class ArbitraryDataFileListManager {
return;
}
final long requestMinimumTimestamp = now - ArbitraryDataManager.ARBITRARY_REQUEST_TIMEOUT;
synchronized (arbitraryDataFileListRequests) {
arbitraryDataFileListRequests.entrySet().removeIf(entry -> entry.getValue().getC() == null || entry.getValue().getC() < requestMinimumTimestamp);
}
}
// Track file list lookups by signature

View File

@ -101,23 +101,15 @@ public class ArbitraryDataFileManager extends Thread {
return;
}
final long requestMinimumTimestamp = now - ArbitraryDataManager.getInstance().ARBITRARY_REQUEST_TIMEOUT;
synchronized (arbitraryDataFileRequests) {
arbitraryDataFileRequests.entrySet().removeIf(entry -> entry.getValue() == null || entry.getValue() < requestMinimumTimestamp);
}
final long relayMinimumTimestamp = now - ArbitraryDataManager.getInstance().ARBITRARY_RELAY_TIMEOUT;
synchronized (arbitraryRelayMap) {
arbitraryRelayMap.removeIf(entry -> entry == null || entry.getTimestamp() == null || entry.getTimestamp() < relayMinimumTimestamp);
}
synchronized (arbitraryDataFileHashResponses) {
arbitraryDataFileHashResponses.removeIf(entry -> entry.getTimestamp() < relayMinimumTimestamp);
}
final long directConnectionInfoMinimumTimestamp = now - ArbitraryDataManager.getInstance().ARBITRARY_DIRECT_CONNECTION_INFO_TIMEOUT;
synchronized (directConnectionInfo) {
directConnectionInfo.removeIf(entry -> entry.getTimestamp() < directConnectionInfoMinimumTimestamp);
}
}
@ -492,10 +484,8 @@ public class ArbitraryDataFileManager extends Thread {
}
private void removeFromRelayMap(ArbitraryRelayInfo entry) {
synchronized (arbitraryRelayMap) {
arbitraryRelayMap.removeIf(relayInfo -> relayInfo.equals(entry));
}
}
// Network handlers

View File

@ -56,10 +56,8 @@ public class ArbitraryDataRenderManager extends Thread {
return;
}
final long minimumTimestamp = now - AUTHORIZATION_TIMEOUT;
synchronized (this.authorizedResources) {
this.authorizedResources.entrySet().removeIf(entry -> entry.getValue() == null || entry.getValue() < minimumTimestamp);
}
}
public boolean isAuthorized(ArbitraryDataResource resource) {
ArbitraryDataResource broadResource = new ArbitraryDataResource(resource.getResourceId(), null, null, null);

View File

@ -73,10 +73,8 @@ public class ArbitraryMetadataManager {
return;
}
final long requestMinimumTimestamp = now - ArbitraryDataManager.ARBITRARY_REQUEST_TIMEOUT;
synchronized (arbitraryMetadataRequests) {
arbitraryMetadataRequests.entrySet().removeIf(entry -> entry.getValue().getC() == null || entry.getValue().getC() < requestMinimumTimestamp);
}
}
public ArbitraryDataTransactionMetadata fetchMetadata(ArbitraryDataResource arbitraryDataResource, boolean useRateLimiter) {