8365238: 'jfr' feature requires 'services' with 'custom' build variant

[fandreuz]

In this PR I add an autoconfigure check to make sure that jfr is not built without the feature services, which would lead to the following error:

/jdk/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp: In member function ‘virtual void VM_GC_SendObjectCountEvent::doit()’:
/jdk/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp:402:5: error: ‘ObjectCountEventSender’ has not been declared
  402 |     ObjectCountEventSender::enable_requestable_event();
      |     ^~~~~~~~~~~~~~~~~~~~~~
/jdk/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp:404:5: error: ‘ObjectCountEventSender’ has not been declared
  404 |     ObjectCountEventSender::disable_requestable_event();
      |     ^~~~~~~~~~~~~~~~~~~~~~

To reproduce:

sh configure --with-jvm-variants=custom --with-conf-name=cstm --enable-jvm-feature-jfr --enable-jvm-feature-serialgc
make -j hotspot CONF_NAME=cstm

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8365238: 'jfr' feature requires 'services' with 'custom' build variant (Enhancement - P4)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)
• Aleksey Shipilev (@shipilev - Reviewer)
• Magnus Ihse Bursie (@magicus - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26723/head:pull/26723
$ git checkout pull/26723

Update a local copy of the PR:
$ git checkout pull/26723
$ git pull https://git.openjdk.org/jdk.git pull/26723/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26723

View PR using the GUI difftool:
$ git pr show -t 26723

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26723.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back fandreuz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@fandreuz This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8365238: 'jfr' feature requires 'services' with 'custom' build variant

Reviewed-by: erikj, shade, ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

• 23985c2: 8357979: Compile jdk.internal.vm.ci targeting the Boot JDK version
• 0ad919c: 8352067: Remove the NMT treap and replace its uses with the utilities red-black tree
• 43cfd80: 8352502: Response message is null if expect 100 assertion fails with non 100
• ... and 1 more: https://git.openjdk.org/jdk/compare/fd766b27b9f862075a415780901c242a7d48c26f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79, @shipilev, @magicus) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

@fandreuz The following label will be automatically applied to this pull request:

• build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (2c70a6ca)

[erikj79]

I think this looks ok, but it would be good if someone from Hotspot could confirm that this is an intended dependency.

[shipilev]

Looks like ObjectCountEventSender is JFR-specific, and #if INCLUDE_SERVICES in objectCounterEventSender.cpp is incorrect. If this is the only dependency between jfr and services, we should just fix ObjectCountEventSender.

Agree, @egahlin?

[magicus]

I think it is not that simple, unfortunately. I tried changing the ifdef but ran into additional issues. In gcTrace.cpp we have:

  virtual void do_cinfo(KlassInfoEntry* entry) {
    if (should_send_event(entry)) {
      ObjectCountEventSender::send(entry, _timestamp);
    }
  }

 private:
  bool should_send_event(const KlassInfoEntry* entry) const {
    double percentage_of_heap = ((double) entry->words()) / _total_size_in_words;
    return percentage_of_heap >= _size_threshold_percentage;
  }

which requires KlassInfoEntry (defined in src/hotspot/share/memory/heapInspection.hpp). When I tried to change that ifdef to INCLUDE_JFR, building with the jfr feature succeeded, but building with services failed.

So it seems there is some shared code here. Either heapInspection needs to be included if either jfr or services are enabled, or we should go the route of this PR and say that JFR is dependent on services. I think the latter seems cleaner.

[shipilev]

Yes, all right.

[openjdk]

@fandreuz Only Committers are allowed to sponsor changes.

[fandreuz]

/integrate

[openjdk]

@fandreuz
Your change (at version 2c70a6c) is now ready to be sponsored by a Committer.

[phohensee]

/sponsor

[openjdk]

Going to push as commit e9e331b.
Since your change was applied there have been 5 commits pushed to the master branch:

• bdb1646: 8364611: (process) Child process SIGPIPE signal disposition should be default
• 23985c2: 8357979: Compile jdk.internal.vm.ci targeting the Boot JDK version
• 0ad919c: 8352067: Remove the NMT treap and replace its uses with the utilities red-black tree
• ... and 2 more: https://git.openjdk.org/jdk/compare/fd766b27b9f862075a415780901c242a7d48c26f...master

Your commit was automatically rebased without conflicts.

[openjdk]

@phohensee @fandreuz Pushed as commit e9e331b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.