RFR: 8277954: Replace use of monitors with explicit locks in the JDK LDAP provider implementation [v2]

Aleksei Efimov aefimov at openjdk.org
Fri Sep 8 23:18:10 UTC 2023


> The change proposed in this PR improves the behavior of the JDK JNDI/LDAP provider when running in a virtual thread. Currently, when an LDAP operation is performed from a virtual thread context a pinned carrier thread is detected:
> 
>      Thread[#29,ForkJoinPool-1-worker-1,5,CarrierThreads]
>         java.naming/com.sun.jndi.ldap.Connection.read reply(Connection.java:444) <== monitors:1
>         java.naming/com.sun.jndi.ldap.LdapClient.ldapBind(LdapClient.java:369) <== monitors:1
>         java.naming/com.sun.jndi.ldap.LdapClient.authenticate(LdapClient.java:196) <== monitors:1
>         java.naming/com.sun.jndi.ldap.LdapCtx.connect(LdapCtx.java:2896) <== monitors:1
> 
> To fix that monitor usages are replaced with `j.u.c` locks. All synchronized blocks/methods have been replaced with locks even if it is only guarding memory access - the motivation behind such a decision was to avoid an analysis of scenarios where a mix of monitors and `j.u.c` locks is used.
> 
> There are three types of mechanical changes done in this PR:
> 
> 1. Classes with `synchronized` blocks or `synchronized` methods have been updated to include a new `ReentrantLock` field. These new fields are used to replace `synchronized` blocks/methods.
> 1. classes that use notify/wait on object monitor have been updated to use `ReentrantLock.Condition`s signal/await.
> 1. if one class `synchronized` on an instance of another class - the `ReentrantLock` added in item (1) was made a package-protected to give access to another class.
> 
> With the proposed changes pinned carrier threads are no longer detected during execution of LDAP operations. 
> 
> Testing: `jdk-tier1` to `jdk-tier3`, other `jndi/ldap` regression and JCK naming tests show no failures.

Aleksei Efimov has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains three additional commits since the last revision:

 - Merge branch 'master' into JDK-8277954_replace_synchronized_ldap
 - revert incorrect changes in LdapCtx.addNamingListener, formatting and (c) updates
 - draft version

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/15526/files
  - new: https://git.openjdk.org/jdk/pull/15526/files/85bbe2a7..9794b094

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15526&range=01
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15526&range=00-01

  Stats: 31231 lines in 922 files changed: 18653 ins; 7610 del; 4968 mod
  Patch: https://git.openjdk.org/jdk/pull/15526.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15526/head:pull/15526

PR: https://git.openjdk.org/jdk/pull/15526


More information about the core-libs-dev mailing list