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.

Sign up for GitHub

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

Jump to bottom

Add dt_filesocket to sapmachine17 #1618

Merged
merged 25 commits into from
Mar 13, 2024
Merged

Add dt_filesocket to sapmachine17 #1618

merged 25 commits into from
Mar 13, 2024

Conversation

schmelter-sap
Copy link
Member

@schmelter-sap schmelter-sap commented Feb 26, 2024 •
edited

This adds support for dt_filesocket to sapmachine17. In contrast to the sapmachine11 implementation, this uses Unix Domain Sockets on Windows too, since Java 16 added support for them.

fixes #1611

@SapMachine
Copy link
Member

Hello @schmelter-sap, I'm sorry, this pull request doesn't meet the expectations. The pull request description has an invalid format. Please have a look at https://github.com/SAP/SapMachine/wiki/Formal-Requirements-of-Pull-Requests .

@SapMachine
Copy link
Member

Hello @schmelter-sap, I'm sorry, this pull request doesn't meet the expectations. The pull request description has an invalid format. Please have a look at https://github.com/SAP/SapMachine/wiki/Formal-Requirements-of-Pull-Requests .

@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

MBaesken
MBaesken reviewed Feb 27, 2024
View reviewed changes
Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

Looks mostly good but added a couple of minor comments/suggestions/questions

make/modules/jdk.jdwp.agent/Lib.gmk Show resolved Hide resolved
src/jdk.jdwp.agent/share/native/libdt_filesocket/fileSocketTransport.c Show resolved Hide resolved
src/jdk.jdwp.agent/share/native/libdt_filesocket/fileSocketTransport.c Show resolved Hide resolved
src/jdk.jdwp.agent/share/native/libdt_filesocket/fileSocketTransport.h Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/share/native/libdt_filesocket/fileSocketTransport.h Show resolved Hide resolved
src/jdk.jdwp.agent/unix/native/libdt_filesocket/fileSocketTransport_md.c Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/unix/native/libdt_filesocket/fileSocketTransport_md.c Show resolved Hide resolved
src/jdk.jdwp.agent/unix/native/libdt_filesocket/fileSocketTransport_md.c Outdated
#error "Unknown platform"
#endif

if (other_user != geteuid()) {
Copy link
Member

Choose a reason for hiding this comment

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

At some other/similar places of the OpenJDK codebase e.g. os::Posix::matches_effective_uid_and_gid_or_root we do similar checks but allow root too. Was this considered here too (but not done e.g. because of security reasons) ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added an additional check for uid == 0.

RealCLanger
RealCLanger requested changes Feb 28, 2024
View reviewed changes
Copy link
Member

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

I made some Copyright suggestions

make/common/modules/LauncherCommon.gmk Outdated Show resolved Hide resolved
make/modules/jdk.jdwp.agent/Lib.gmk Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/share/native/libdt_filesocket/fileSocketTransport.c Show resolved Hide resolved
@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

RealCLanger
RealCLanger requested changes Mar 4, 2024
View reviewed changes
Copy link
Member

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

A few minor things/questions left

make/common/modules/LauncherCommon.gmk Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/unix/native/libdt_filesocket/fileSocketTransport_md.c Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/windows/native/libdt_filesocket/fileSocketTransport_md.c Outdated Show resolved Hide resolved
src/jdk.jdwp.agent/windows/native/libdt_filesocket/fileSocketTransport_md.c Outdated Show resolved Hide resolved
test/jdk/com/sun/jdi/FileSocketTransportTest.java Outdated Show resolved Hide resolved
@SapMachine
Copy link
Member

Hello @schmelter-sap, this pull request fulfills all formal requirements.

RealCLanger
RealCLanger approved these changes Mar 6, 2024
View reviewed changes
Copy link
Member

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

LGTM.

MBaesken
MBaesken approved these changes Mar 6, 2024
View reviewed changes
Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

Thanks for doing the changes, LGTM now.

@RealCLanger RealCLanger merged commit bf71a26 into SAP:sapmachine17 Mar 13, 2024
81 of 83 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MBaesken MBaesken MBaesken approved these changes

@RealCLanger RealCLanger RealCLanger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@schmelter-sap @SapMachine @MBaesken @RealCLanger