2929import java .time .Clock ;
3030import java .util .ArrayDeque ;
3131import java .util .HashSet ;
32+ import java .util .Iterator ;
33+ import java .util .Map ;
3234import java .util .Queue ;
3335import java .util .Set ;
3436import java .util .concurrent .ConcurrentHashMap ;
3537import java .util .concurrent .ConcurrentMap ;
3638import java .util .concurrent .Future ;
3739import java .util .concurrent .atomic .AtomicBoolean ;
3840import java .util .concurrent .locks .ReentrantLock ;
41+ import java .util .function .BiConsumer ;
3942
4043import org .apache .hc .core5 .annotation .Contract ;
4144import org .apache .hc .core5 .annotation .ThreadingBehavior ;
@@ -80,14 +83,38 @@ protected abstract Future<IOSession> connectSession(
8083 Timeout connectTimeout ,
8184 FutureCallback <IOSession > callback );
8285
83- protected abstract void validateSession (
84- IOSession ioSession ,
85- Callback <Boolean > callback );
86+ /**
87+ * @deprecated Use {@link #validateSession(Object, IOSession, Callback)}.
88+ */
89+ @ Deprecated
90+ protected void validateSession (
91+ final IOSession ioSession ,
92+ final Callback <Boolean > callback ) {
93+ callback .execute (Boolean .TRUE );
94+ }
95+
96+ /**
97+ * @since 5.5
98+ */
99+ @ SuppressWarnings ("deprecation" )
100+ protected void validateSession (
101+ final T endpoint ,
102+ final IOSession ioSession ,
103+ final Callback <Boolean > callback ) {
104+ validateSession (ioSession , callback );
105+ }
86106
87107 protected abstract void closeSession (
88108 IOSession ioSession ,
89109 CloseMode closeMode );
90110
111+ /**
112+ * @since 5.5
113+ */
114+ protected long clockMillis () {
115+ return clock .millis ();
116+ }
117+
91118 /**
92119 * Tests if the given session is idle. This method is expected to be communication protocol
93120 * aware.
@@ -98,6 +125,16 @@ protected boolean isIdle(final IOSession session) {
98125 return false ;
99126 }
100127
128+ /**
129+ * Tests if the given session has expired. This method is expected to be communication protocol
130+ * aware.
131+ *
132+ * @since 5.5
133+ */
134+ protected boolean isExpired (final T endpoint , final IOSession session ) {
135+ return false ;
136+ }
137+
101138 @ Override
102139 public final void close (final CloseMode closeMode ) {
103140 if (closed .compareAndSet (false , true )) {
@@ -157,14 +194,19 @@ public final Future<IOSession> getSession(
157194
158195 @ Override
159196 public void completed (final IOSession ioSession ) {
160- validateSession (ioSession , result -> {
161- if (result ) {
162- future .completed (ioSession );
163- } else {
164- getSessionInternal (poolEntry , true , endpoint , connectTimeout ,
197+ if (isIdle (ioSession ) && isExpired (endpoint , ioSession )) {
198+ getSessionInternal (poolEntry , true , endpoint , connectTimeout ,
165199 new CompletingFutureContribution <>(future ));
166- }
167- });
200+ } else {
201+ validateSession (endpoint , ioSession , result -> {
202+ if (result ) {
203+ future .completed (ioSession );
204+ } else {
205+ getSessionInternal (poolEntry , true , endpoint , connectTimeout ,
206+ new CompletingFutureContribution <>(future ));
207+ }
208+ });
209+ }
168210 }
169211
170212 @ Override
@@ -265,13 +307,31 @@ public void cancelled() {
265307 }
266308 }
267309
310+ /**
311+ * @deprecated Use {@link #enumAvailable(BiConsumer)}.
312+ */
313+ @ Deprecated
268314 public final void enumAvailable (final Callback <IOSession > callback ) {
269- for (final PoolEntry poolEntry : sessionPool .values ()) {
315+ Args .notNull (callback , "Callback" );
316+ enumAvailable ((endpoint , session ) -> callback .execute (session ));
317+ }
318+
319+ /**
320+ * @since 5.5
321+ */
322+ public final void enumAvailable (final BiConsumer <T , IOSession > consumer ) {
323+ Args .notNull (consumer , "consumer" );
324+ for (final Iterator <Map .Entry <T , PoolEntry >> it = sessionPool .entrySet ().iterator (); it .hasNext (); ) {
325+ final Map .Entry <T , PoolEntry > entry = it .next ();
326+ final PoolEntry poolEntry = entry .getValue ();
270327 if (poolEntry .session != null ) {
271328 poolEntry .lock .lock ();
272329 try {
273330 if (poolEntry .session != null ) {
274- callback .execute (poolEntry .session );
331+ if (poolEntry .session .isOpen ()) {
332+ final T endpoint = entry .getKey ();
333+ consumer .accept (endpoint , poolEntry .session );
334+ }
275335 if (!poolEntry .session .isOpen ()) {
276336 poolEntry .session = null ;
277337 }
@@ -283,25 +343,32 @@ public final void enumAvailable(final Callback<IOSession> callback) {
283343 }
284344 }
285345
286- protected long inactivityDeadline (final TimeValue inactivityTime ) {
287- return this .clock .millis () - (TimeValue .isPositive (inactivityTime ) ? inactivityTime .toMilliseconds () : 0 );
288- }
289-
290346 /**
291347 * Close sessions idle longer than the given period of inactivity. This method will also
292348 * Evict closed sessions.
293349 */
294350 public final void closeIdle (final TimeValue inactivityTime ) {
295- // Last tolerable point of inactivity
296- // Millisecond precision is good enough
297- final long deadline = inactivityDeadline (inactivityTime );
298- enumAvailable (session -> {
351+ final long deadline = clockMillis () - (TimeValue .isPositive (inactivityTime ) ? inactivityTime .toMilliseconds () : 0 );
352+ enumAvailable ((endpoint , session ) -> {
299353 if (isIdle (session ) && session .getLastEventTime () <= deadline ) {
300354 closeSession (session , CloseMode .GRACEFUL );
301355 }
302356 });
303357 }
304358
359+ /**
360+ * Evict expired (closed) sessions.
361+ * @since 5.5
362+ */
363+ public final void evictExpired () {
364+ // This method also causes closed sessions to get removed from the pool
365+ enumAvailable ((endpoint , session ) -> {
366+ if (isIdle (session ) && isExpired (endpoint , session )) {
367+ closeSession (session , CloseMode .GRACEFUL );
368+ }
369+ });
370+ }
371+
305372 public final Set <T > getRoutes () {
306373 return new HashSet <>(sessionPool .keySet ());
307374 }
0 commit comments