Skip to content

Add mapping for EnumProcesses to Psapi#1214

Closed
T-Svensson wants to merge 12 commits intojava-native-access:masterfrom
T-Svensson:Psapi.EnumProcesses
Closed

Add mapping for EnumProcesses to Psapi#1214
T-Svensson wants to merge 12 commits intojava-native-access:masterfrom
T-Svensson:Psapi.EnumProcesses

Conversation

@T-Svensson
Copy link
Copy Markdown
Contributor

@T-Svensson T-Svensson commented Jun 26, 2020

No description provided.

dbwiddis and others added 11 commits May 17, 2020 21:47
@dbwiddis
Add structures and methods to enumerate sessions
9c24002
@dbwiddis
Type mapping and enum fixes
cb2a1ba
@matthiasblaesing
Merge pull request java-native-access#1199 from odidev/jna_arm64
c585df7 
Added arm64 support to .travis.yml file
@matthiasblaesing
Merge pull request java-native-access#1198 from dbwiddis/wts
1586e6f 
Add structures and methods to enumerate sessions
@dbwiddis @matthiasblaesing
Add mappings for Udev Library and ddd object oriented wrapper methods
72f8ea2
@matthiasblaesing
Merge branch 'pr-1200'
433821d 
Closes: java-native-access#1200
@dbwiddis
Remove too-strict filestore available size test
17ba5a8
@matthiasblaesing
Merge pull request java-native-access#1203 from dbwiddis/fsavailfix
1e86b54 
Remove too-strict filestore available size test
@dbwiddis
Add mappings for Thread32First and Thread32Next to Kernel32
9892e49
@matthiasblaesing
Merge pull request java-native-access#1209 from dbwiddis/thread32
43c4e67 
Add mappings for Thread32First and Thread32Next to Kernel32
@dbwiddis @matthiasblaesing
Add mappings for size_t, ssize_t, shared memory and libc file functions
d471b15
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch 2 times, most recently from eadcb25 to 9c27512 Compare June 26, 2020 20:04
dbwiddis
dbwiddis reviewed Jun 26, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis 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 your submission! I've left a few comments inline.

Comment thread contrib/platform/src/com/sun/jna/platform/win32/Psapi.java
Comment thread contrib/platform/src/com/sun/jna/platform/win32/Psapi.java
Comment thread contrib/platform/src/com/sun/jna/platform/win32/Psapi.java Outdated
Comment thread contrib/platform/src/com/sun/jna/platform/win32/Psapi.java
Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiTest.java Outdated
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch from 9c27512 to 104889d Compare June 28, 2020 10:28
@T-Svensson
Copy link
Copy Markdown
Contributor Author

T-Svensson commented Jun 28, 2020

Please review again @dbwiddis, I think I covered all your comments.

dbwiddis
dbwiddis reviewed Jun 28, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Looking good. A few more comments.

Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java Outdated
Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java
Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java
Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiTest.java Outdated
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch from 104889d to 3c0dc33 Compare June 28, 2020 19:18
@T-Svensson
Copy link
Copy Markdown
Contributor Author

T-Svensson commented Jun 28, 2020

Since there was no additional comment on my questions above, I've uploaded a new changeset that addresses the other topics.

@dbwiddis
Copy link
Copy Markdown
Contributor

dbwiddis commented Jun 28, 2020

It looks generally good to me. I don't seem to have the powers (yet) to merge this so I'll let @matthiasblaesing take it from here, if he has any other changes.

@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch 2 times, most recently from 758a829 to 8895113 Compare June 29, 2020 18:53
@T-Svensson
Copy link
Copy Markdown
Contributor Author

T-Svensson commented Jun 29, 2020

I decided to add 2 more functions to the utility to extract the name of the process.
Looking forward to your feedback!

dbwiddis
dbwiddis reviewed Jun 30, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis 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 your patience. A few more comments.

Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiUtilTest.java Outdated
Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java Outdated
Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiTest.java Outdated
Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java Outdated
Comment thread contrib/platform/src/com/sun/jna/platform/win32/PsapiUtil.java Outdated
Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiUtilTest.java Outdated
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch from 8895113 to 49c276a Compare June 30, 2020 08:03
T-Svensson
T-Svensson commented Jun 30, 2020
View reviewed changes
Comment thread contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java Outdated
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch from 49c276a to 3ccc9d1 Compare June 30, 2020 19:58
@T-Svensson
Copy link
Copy Markdown
Contributor Author

T-Svensson commented Jun 30, 2020

Unless there are any obvious errors in the last push, I'll consider this PR ready for merge.

dbwiddis
dbwiddis reviewed Jun 30, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Just a few last changes.

Comment thread contrib/platform/test/com/sun/jna/platform/win32/PsapiUtilTest.java Outdated
int[] pids = PsapiUtil.enumProcesses();

assertNotNull("List should not be null", pids);
assertTrue("List should contain my pid", Arrays.stream(pids).anyMatch(pid -> pid == myPid));
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis Jun 30, 2020

Choose a reason for hiding this comment

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

We retain compatibility with Java 1.6, so as neat as streams and lambdas are, you have to do it the old fashioned way.

Copy link
Copy Markdown
Contributor Author

@T-Svensson T-Svensson Jul 1, 2020

Choose a reason for hiding this comment

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

If you aim to also have the test classes in Java6, I suggest that the Eclipse project is set to have Java6 as the target and the build.xml should also check ./test-classes, not just ./classes.
Anyway, I'll push a fix for this.

Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis Jul 1, 2020

Choose a reason for hiding this comment

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

There are one or two exceptions in the test classes that require Java 8, which is why the project includes a higher compatibility level in the config files, but we otherwise maintain the standard.

Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis Jul 1, 2020

Choose a reason for hiding this comment

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

(I know this because I did the same thing not too long ago!)

Comment thread contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java Outdated
int size = 0;
IntByReference lpdwSize = new IntByReference();
do {
size = size + 1024;
Copy link
Copy Markdown
Contributor

@dbwiddis dbwiddis Jun 30, 2020

Choose a reason for hiding this comment

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

Since WinDef.MAX_PATH should work in most cases, let's use that as the initial size. You can initialize on line 914 and increment (I'm ok with += 1024) after the query conditional.

@T-Svensson
Add mapping for EnumProcesses to Psapi
6579864 
Added utility method QueryFullProcessImageName that takes a PID.
Fixed QueryFullProcessImageName to properly handle paths longer than 260
characters that can happen on Win10 / paths with UNC.
@T-Svensson T-Svensson force-pushed the Psapi.EnumProcesses branch from 3ccc9d1 to 6579864 Compare July 1, 2020 06:37
@dbwiddis
Copy link
Copy Markdown
Contributor

dbwiddis commented Jul 1, 2020

Thanks for the updates. I'll commit this later today.

@dbwiddis
Copy link
Copy Markdown
Contributor

dbwiddis commented Jul 1, 2020

Merged in 22dc037

@dbwiddis dbwiddis closed this Jul 1, 2020
@T-Svensson T-Svensson deleted the Psapi.EnumProcesses branch July 11, 2020 01:28
@dbwiddis dbwiddis mentioned this pull request Dec 1, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dbwiddis dbwiddis dbwiddis left review comments

@matthiasblaesing matthiasblaesing Awaiting requested review from matthiasblaesing

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@T-Svensson @dbwiddis @matthiasblaesing