ben-manes / caffeine / #5659

100%

master: 100%

push

github

Reschedule jcache access expiry outside the compute

The jcache access-expiry paths ran policy().setExpiresAfter (which calls
afterWrite) from inside their own cache.asMap().compute* lambdas on the
failed-conditional remove/replace and invoke-READ branches, violating
Cache.policy(): under the bin lock afterWrite can block on the eviction
lock (ABBA) or run maintenance inline (a nested same-bin CHM mutation).

On those write paths the reschedule is redundant: the enclosing compute's
Expiry (ExpirableToExpiry, which derives the deadline from the Expirable
timestamp) refreshes the native timer on commit, and expireAfterUpdate
fires even on a same-instance return. Split setAccessExpireTime into
getAccessExpireTime (eval), setAccessExpireTime (write the timestamp, all
paths), and setVariableExpiration (poke the native timer, reads only);
write paths now write only the timestamp and let the compute refresh it.

Add native-timer regression tests for the three write paths; the prior
mismatch/invoke tests asserted only the Expirable field, leaving the
native timer on write paths untested.

4193 of 4200 branches covered (99.83%)

41 of 41 new or added lines in 2 files covered. (100.0%)

8454 of 8454 relevant lines covered (100.0%)

1.0 hits per line