Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8270867: Debug build of WebKit 613.1 fails on Linux #756

Closed

Conversation

petermz
Copy link
Collaborator

@petermz petermz commented Mar 16, 2022

The file wtf/linux/MemoryPressureLinux.cpp was renamed wtf/unix/MemoryPressureUnix.cpp in https://trac.webkit.org/changeset/261428 . In the openjfx workspace, both files are present. I'm removing the old file.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8270867: Debug build of WebKit 613.1 fails on Linux

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/756/head:pull/756
$ git checkout pull/756

Update a local copy of the PR:
$ git checkout pull/756
$ git pull https://git.openjdk.java.net/jfx pull/756/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 756

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/756.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2022

👋 Welcome back peterz! 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 openjdk bot added the rfr Ready for review label Mar 16, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2022

Webrevs

@kevinrushforth
Copy link
Member

Thanks for the PR to fix this? As I noted in the JBS issue, JDK-8283246 is a duplicate of JDK-8270867 . Can you modify the title of this PR to the following?

8270867: Debug build of WebKit 613.1 fails on Linux

/reviewers 2

@kevinrushforth kevinrushforth self-requested a review March 16, 2022 12:53
@kevinrushforth
Copy link
Member

@jaybhaskar Can you also review this?

@openjdk
Copy link

openjdk bot commented Mar 16, 2022

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@kevinrushforth
Copy link
Member

I'll run both a debug and normal CI build to test this.

@petermz petermz changed the title 8283246: WebKit fails to build on Linux 8270867 Debug build of WebKit 613.1 fails on Linux Mar 16, 2022
@petermz petermz changed the title 8270867 Debug build of WebKit 613.1 fails on Linux 8270867: Debug build of WebKit 613.1 fails on Linux Mar 16, 2022
@jaybhaskar
Copy link
Member

The patch https://trac.webkit.org/changeset/261428 committed in May 8, 2020. it is older than a recent patch https://bugs.webkit.org/attachment.cgi?id=443979&action=prettypatch

But i remember , the error for this file [MemoryPressureHandlerLinux.cpp] was at
if (ReliefLogger::loggingEnabled() && isUnderMemoryPressure())
LOG(MemoryPressure, "System is no longer under memory pressure.");

The variable isUnderMemoryPressure was giving error. saying right variable m_underMemoryPressure instead of isUnderMemoryPressure

Error:
[jfx/modules/javafx.web/src/main/native/Source/WTF/wtf/linux/MemoryPressureHandlerLinux.cpp:39:28: error: 'LogMemoryPressure' was not declared in this scope; did you mean 'isUnderMemoryPressure'? ]

There was anothe issue with the build, as below
JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb>:99:in parse': undefined method /' for

This was removed by updating rub version.

@kevinrushforth
Copy link
Member

There are two issues (which suggests that I should have filed a new bug when we updated to WebKit 613.1). The new one that this PR fixes, and the one we originally ran into in WebKit 612.1, possibly relating to the version of Ruby.

I can confirm that this PR by Peter solves the problem caused by the leftover MemoryPressureHandlerLinux. On our CI build system I still see the problem we initially ran into back in 612.1 in resolve-asm-file-conflicts.rb:

Scanning dependencies of target LowLevelInterpreterLib
[ 26%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o
modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:99:in `parse': undefined method `/' for #<Pathname:working_directory> (NoMethodError)
	from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:149:in `test'
	from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:237:in `block in selftest'
	from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:236:in `each'
	from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:236:in `selftest'
	from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:430:in `<main>'
Error running cmd: pid 12750 exit 1
gmake[2]: *** [Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o] Error 1
gmake[1]: *** [Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/all] Error 2
gmake: *** [all] Error 2

We might want to take this fix to remove the leftover file, and then file a new one for the original problem, since that one hits older systems with older version of Ruby.

@jaybhaskar what do you think?

@jaybhaskar
Copy link
Member

Yes , The PR looks good. We can file new bug for ruby version related issue.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to do a local debug build using -PCONF=DebugNative on my Linux system using this patch. I also confirmed that a production build still works fine on our CI build system.

Btw, I filed JDK-8283273 as a follow-up bug to track the problem of nor being able to do a debug build on Linux with an older version of Ruby.

Copy link
Member

@jaybhaskar jaybhaskar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there are two equivalent files for same purpose , it looks good to remove older one.

@openjdk
Copy link

openjdk bot commented Mar 17, 2022

@petermz 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:

8270867: Debug build of WebKit 613.1 fails on Linux

Reviewed-by: kcr, jbhaskar

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 1 new commit pushed to the master branch:

  • ff75917: 8283183: Skip failing PredefinedMeshManagerTest tests

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Mar 17, 2022
@petermz
Copy link
Collaborator Author

petermz commented Mar 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 17, 2022

Going to push as commit eb7fa5d.
Since your change was applied there has been 1 commit pushed to the master branch:

  • ff75917: 8283183: Skip failing PredefinedMeshManagerTest tests

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 17, 2022
@openjdk openjdk bot closed this Mar 17, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Mar 17, 2022
@openjdk
Copy link

openjdk bot commented Mar 17, 2022

@petermz Pushed as commit eb7fa5d.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
3 participants