RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi, A few small changes to cleanup the name and use of CHECK macros. The CHECK_NULL_* macros are more generally useful without the JNU_ prefix. The JNU_CHECK_EXCEPTION* macros apply only when there is an jni environment. Webrev: http://cr.openjdk.java.net/~rriggs/webrev-check-cleanup-8031737

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Looks fine Which releases are you think of including this in if any besides 9? Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037 Oracle Java Engineering 1 Network Drive Burlington, MA 01803 lance.ander...@oracle.com Sent from my iPad On Feb 1, 2014, at 1:03 PM, roger riggs

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

On 01/02/2014 18:03, roger riggs wrote: Hi, A few small changes to cleanup the name and use of CHECK macros. The CHECK_NULL_* macros are more generally useful without the JNU_ prefix. The JNU_CHECK_EXCEPTION* macros apply only when there is an jni environment. Webrev: http://cr.openjdk.j

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Looks good to me. Thanks Roger. -Chris. On 01/02/14 18:58, Lance @ Oracle wrote: Looks fine Which releases are you think of including this in if any besides 9? Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037 Oracle Java Engineering 1 Network Drive Burlington, MA 01803 l

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Looks good. Mandy On 2/1/2014 10:03 AM, roger riggs wrote: Hi, A few small changes to cleanup the name and use of CHECK macros. The CHECK_NULL_* macros are more generally useful without the JNU_ prefix. The JNU_CHECK_EXCEPTION* macros apply only when there is an jni environment. Webrev: ht

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

+1 Kumar On 2/3/2014 9:45 AM, Mandy Chung wrote: Looks good. Mandy On 2/1/2014 10:03 AM, roger riggs wrote: Hi, A few small changes to cleanup the name and use of CHECK macros. The CHECK_NULL_* macros are more generally useful without the JNU_ prefix. The JNU_CHECK_EXCEPTION* macros apply

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Lance, The convenience macros are only intended for JDK 9. Roger On 2/1/2014 1:58 PM, Lance @ Oracle wrote: Looks fine Which releases are you think of including this in if any besides 9? Lance Andersen| Principal Member of Technic

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Roger, Why not JDK 8u ? I've got a lot of changes that utilise these that will backport cleanly to JDK 8u only if 8u includes these macros. And since the changes are all over the place I don't fancy copy/pasting them everywhere. I suspect I am not the only one who would like these in 8u .. -phi

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, I see your point, there is nothing in the changes unique to 9. Do you want to take care of the back point? Roger On 2/11/2014 2:04 PM, Phil Race wrote: Roger, Why not JDK 8u ? I've got a lot of changes that utilise these that will backport cleanly to JDK 8u only if 8u includes thes

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Roger, Yes, I can do that. I see here http://cr.openjdk.java.net/~rriggs/webrev-check-cleanup-8031737/ that 1) There was a previous version of these macros. Looks like no need to worry about that I just need the latest version. 2) There was also a change to Version.c. I can include that if yo

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

On 11/02/2014 19:57, Phil Race wrote: Roger, Yes, I can do that. I see here http://cr.openjdk.java.net/~rriggs/webrev-check-cleanup-8031737/ that 1) There was a previous version of these macros. Looks like no need to worry about that I just need the latest version. 2) There was also a change

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, Yes, it ended up in two change sets in jdk 9, you should take both to be up to date. changeset: 9245:a09982d91fab user:rriggs date:Wed Feb 05 10:59:53 2014 -0500 files: src/share/native/common/jni_util.c description: 8030993: Check jdk/src/share/native/common/j

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

8030875 applied but 8031737 will not apply for me, presumably because Version.c had a number of changes under bug 8029007. And the version from 8031737 is the one that I want. -phil. On 2/11/14 12:04 PM, Alan Bateman wrote: On 11/02/2014 19:57, Phil Race wrote: Roger, Yes, I can do that. I

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Roger, That later one seems to be using the macros. I don't see any update to the macros. So I'm not sure why I'm need it .. since I'm not using those calls and neither are the macros. -phil. On 2/11/14 12:28 PM, roger riggs wrote: Hi Phil, Yes, it ended up in two change sets in jdk 9, you

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, The later changeset picked up the recommended style of implementing the macros but I don't think it was substantive. You can probably do without it. Version.c had some changes in a different changeset to address the omission of checking for exceptions after some JNI calls. Roger On

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Are we talking about the same changesets ? a09982d91fab/8030993 has no change to the macros fb89dc4fe8da/8031737 is the one that reimplemented the macros and is the version I'd want. Its the last 'edit' of those macros in that file. c58c6b0fbe34/8030875 is the original addition of these :- ..

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, On 2/11/2014 5:09 PM, Phil Race wrote: Are we talking about the same changesets ? a09982d91fab/8030993 has no change to the macros right (I didn't think this was topic of this conversation) fb89dc4fe8da/8031737 is the one that reimplemented the macros and is the version I'd want. It

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

So since hg export/import doesn't apply cleanly and the dependency chain seems, long and in order to have some consistency across the releases, I think I should prepare a webrev which essentially backports 8031737 including its small changes to Version.c, if only because otherwise I'd have to have

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

yes On 2/11/2014 5:28 PM, Phil Race wrote: So since hg export/import doesn't apply cleanly and the dependency chain seems, long and in order to have some consistency across the releases, I think I should prepare a webrev which essentially backports 8031737 including its small changes to Versio

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Here's a JDk8u webrev : -http://cr.openjdk.java.net/~prr/8031737.8u/ -phil. On 2/11/14 2:28 PM, Phil Race wrote: So since hg export/import doesn't apply cleanly and the dependency chain seems, long and in order to have some consistency across the releases, I think I should prepare a webrev wh

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, The changes look fine. (Not a "Reviewer"). Thanks for doing the backport, Roger On 2/11/2014 6:42 PM, Phil Race wrote: Here's a JDk8u webrev : -http://cr.openjdk.java.net/~prr/8031737.8u/ -phil. On 2/11/14 2:28 PM, Phil Race wrote: So since hg export/import doesn't apply cleanly

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

This looks fine. On Feb 11 2014, at 15:42 , Phil Race wrote: > Here's a JDk8u webrev : -http://cr.openjdk.java.net/~prr/8031737.8u/ > > -phil. > > On 2/11/14 2:28 PM, Phil Race wrote: >> So since hg export/import doesn't apply cleanly and the dependency >> chain seems, long and in order to ha

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

This looks good to me too. Mandy On 2/12/2014 10:10 AM, roger riggs wrote: Hi Phil, The changes look fine. (Not a "Reviewer"). Thanks for doing the backport, Roger On 2/11/2014 6:42 PM, Phil Race wrote: Here's a JDk8u webrev : -http://cr.openjdk.java.net/~prr/8031737.8u/ -phil. On 2/11/

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

That worked on Mac but I just found it doesn't build on Linux because a macro-redefinition warning is treated as an error there. https://bugs.openjdk.java.net/browse/JDK-8034912 The early/original fix had removed the duplicate definition in src/share/native/java/net/net_util.h So the fix is t

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Hi Phil, There was an earlier commit that updated java.net 8030875: Macros for checking and returning on exceptions Maybe it will apply as a backport too? Roger On 2/13/14 4:50 PM, Phil Race wrote: That worked on Mac but I just found it doesn't build on Linux because a macro-redefinition

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Looks good. Sorry I didn't catch this earlier and I was counting on the test build :) Mandy [1] http://hg.openjdk.java.net/jdk9/dev/jdk/rev/c58c6b0fbe34 On 2/13/2014 1:50 PM, Phil Race wrote: That worked on Mac but I just found it doesn't build on Linux because a macro-redefinition warning

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

I did look closely at that today. It has 3 parts - removing the ones in net_util - moving these macros to jni_util - however these new versions are already superseded by the ones we have, so we can' t apply that. - updating some 'pack' code to use the new macros instead of its own ones (no cla

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Yeah sorry about that. It built on Windows and Mac but not Linux as i found out today. -phil. On 2/13/14 5:36 PM, Mandy Chung wrote: Looks good. Sorry I didn't catch this earlier and I was counting on the test build :) Mandy [1] http://hg.openjdk.java.net/jdk9/dev/jdk/rev/c58c6b0fbe34 On

RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup (re-review)

Please re-review. I missed a warning that the CHECK_NULL macros was being redefined. Retaining the previous changes to java/util/jar/pack that removed the redefinition addresses the issue. The webrev now only has a few small changes to cleanup the name and use of CHECK macros. The CHECK_NUL

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup (re-review)

Looks good Roger. -Chris. On 3 Feb 2014, at 20:17, roger riggs wrote: > Please re-review. > > I missed a warning that the CHECK_NULL macros was being redefined. > > Retaining the previous changes to java/util/jar/pack that removed the > redefinition > addresses the issue. > > The webrev now

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup (re-review)

On 2/3/2014 12:17 PM, roger riggs wrote: Please re-review. I missed a warning that the CHECK_NULL macros was being redefined. Retaining the previous changes to java/util/jar/pack that removed the redefinition addresses the issue. The webrev now only has a few small changes to cleanup the nam

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup (re-review)

+1 Kumar On 2/3/2014 12:17 PM, roger riggs wrote: Please re-review. I missed a warning that the CHECK_NULL macros was being redefined. Retaining the previous changes to java/util/jar/pack that removed the redefinition addresses the issue. The webrev now only has a few small changes to clea

Re: RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup (re-review)

On 03/02/2014 20:17, roger riggs wrote: Please re-review. I missed a warning that the CHECK_NULL macros was being redefined. Retaining the previous changes to java/util/jar/pack that removed the redefinition addresses the issue. The webrev now only has a few small changes to cleanup the name

Re: (8034912) Approval request : RFR: (8031737) CHECK_NULL and CHECK_EXCEPTION macros cleanup

Approved for pushing to jdk8u-dev. regards, Sean. On 14/02/14 01:38, Phil Race wrote: Yeah sorry about that. It built on Windows and Mac but not Linux as i found out today. -phil. On 2/13/14 5:36 PM, Mandy Chung wrote: Looks good. Sorry I didn't catch this earlier and I was counting on th