From 5a299cd694025a395cdcf618a2151ef66942c339 Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Thu, 8 Apr 2021 15:51:51 -0400 Subject: [PATCH] Shut down harvester thread pool when it's done. (#223) * Shut down harvester thread pool when it's done. * Use ExecutorService to create harvester threads; name thread pool threads to match other ice4j threads. --- .../harvest/MappingCandidateHarvesters.java | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java b/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java index 1cae9e8..35bc6f9 100644 --- a/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java +++ b/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java @@ -17,6 +17,7 @@ package org.ice4j.ice.harvest; import org.ice4j.*; import org.jetbrains.annotations.*; +import org.jitsi.utils.concurrent.*; import java.net.*; import java.util.*; @@ -283,42 +284,49 @@ public class MappingCandidateHarvesters // Now run discover() on all created harvesters in parallel and pick // the ones which succeeded. - ExecutorService es = Executors.newFixedThreadPool(tasks.size()); + ExecutorService es = ExecutorFactory.createFixedThreadPool(tasks.size(), + "ice4j.Harvester-executor-"); - List> futures; try { - futures = es.invokeAll(tasks); - } - catch (InterruptedException ie) - { - Thread.currentThread().interrupt(); - return stunHarvesters; - } - - for (Future future : futures) - { + List> futures; try { - StunMappingCandidateHarvester harvester = future.get(); - - // The STUN server replied successfully. - if (harvester.getMask() != null) - { - stunHarvesters.add(harvester); - } + futures = es.invokeAll(tasks); } - catch (ExecutionException ee) - { - // The harvester failed for some reason, discard it. - } - catch(InterruptedException ie) + catch (InterruptedException ie) { Thread.currentThread().interrupt(); - throw new RuntimeException(ie); + return stunHarvesters; + } + + for (Future future : futures) + { + try + { + StunMappingCandidateHarvester harvester = future.get(); + + // The STUN server replied successfully. + if (harvester.getMask() != null) + { + stunHarvesters.add(harvester); + } + } + catch (ExecutionException ee) + { + // The harvester failed for some reason, discard it. + } + catch (InterruptedException ie) + { + Thread.currentThread().interrupt(); + throw new RuntimeException(ie); + } } } - + finally + { + es.shutdown(); + } return stunHarvesters; }