safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1427: Favor ConcurrentHashMap over Collections.synchronizedMap(). Keeping sessions/tunnels in order is not worth the extreme overhead of a map-wide lock.

Browse Source
This commit is contained in:
Michael Jumper
2015-12-16 17:50:18 -08:00
parent 681b8722d6
commit 002ec0c50e
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelMap.java
View File

@@ -22,10 +22,10 @@
package org.glyptodon.guacamole.servlet;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -65,8 +65,8 @@ class GuacamoleHTTPTunnelMap {
/**
* Map of all tunnels that are using HTTP, indexed by tunnel UUID.
*/
private final Map<String, GuacamoleHTTPTunnel> tunnelMap =
Collections.synchronizedMap(new LinkedHashMap<String, GuacamoleHTTPTunnel>(16, 0.75f, true));
private final ConcurrentMap<String, GuacamoleHTTPTunnel> tunnelMap =
new ConcurrentHashMap<String, GuacamoleHTTPTunnel>();
/**
* Creates a new GuacamoleHTTPTunnelMap which automatically closes and
@@ -124,9 +124,12 @@ class GuacamoleHTTPTunnelMap {
// If tunnel is too old, close and remove it
if (age >= tunnelTimeout) {
// Remove old entry
logger.debug("HTTP tunnel \"{}\" has timed out.", entry.getKey());
entries.remove();
// Attempt to close tunnel
try {
tunnel.close();
}
@@ -136,14 +139,9 @@ class GuacamoleHTTPTunnelMap {
}
// Otherwise, this tunnel has been recently used, as have all
// other tunnels following this one within tunnelMap
else
break;
} // end for each tunnel
}
}
} // end timeout task run()
}