-
Notifications
You must be signed in to change notification settings - Fork 738
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
Properly link omrsig and enable OMRPORT_OMRSIG_SUPPORT globally #2631
Properly link omrsig and enable OMRPORT_OMRSIG_SUPPORT globally #2631
Conversation
This PR depends on eclipse-omr/omr#2855 and eclipse-omr/omr#2865. |
39a6c74
to
175d842
Compare
+@dnakamura to point out if any CMake dependencies were missed? |
@babsingh I'm not sure I understand the issue here well enough yet to review the code. My naive thought is that the macros are working as designed. They expand to sigaction/signal everywhere except the lowest layer that has intercepted them. Can you clarify why you believe the usage is incorrect or problematic? |
This is true. In
Calls to
Currently, Within port library, Does it matter if we call After
We don't need to directly call |
313fe2d
to
bb00890
Compare
When building constgen and j9ddrgen, omrsig should be linked when J9VM_PORT_OMRSIG_SUPPORT is enabled. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
Currently, OMRPORT_OMRSIG_SUPPORT is only defined while building the port library. But, OMRPORT_OMRSIG_SUPPORT should be defined globally. This will allow omrsig macros such as OMRSIG_SIGNAL and OMRSIG_SIGACTION to be used consistently across OpenJ9. Removing localized definitions of OMRPORT_OMRSIG_SUPPORT before enabling it globally. This will prevent redundant definitions of OMRPORT_OMRSIG_SUPPORT when it is enabled globally. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
Currently, OMRPORT_OMRSIG_SUPPORT is only defined while building the port library. But, OMRPORT_OMRSIG_SUPPORT should be defined globally. This will allow omrsig macros such as OMRSIG_SIGNAL and OMRSIG_SIGACTION to be used consistently across OpenJ9. Thus, OMRPORT_OMRSIG_SUPPORT is enabled globally. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
Currently, omrsig is linked to port and vm unconditionally. omrsig should be linked to port and vm only if J9VM_PORT_OMRSIG_SUPPORT is enabled. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
bb00890
to
31f655c
Compare
Required OMR changes (eclipse-omr/omr#2855 and eclipse-omr/omr#2865) are available in eclipse/openj9-omr openj9 branch. These changes are ready to merge. |
@@ -26,6 +26,9 @@ TEMP_TARGET_DATASIZE := $(if $(findstring -64,$(SPEC)),64,32) | |||
CONFIGURE_ARGS += \ | |||
<#if uma.spec.flags.opt_cuda.enabled> | |||
--enable-OMR_OPT_CUDA \ | |||
</#if> | |||
<#if uma.spec.flags.port_omrsigSupport.enabled> | |||
--enable-OMRPORT_OMRSIG_SUPPORT \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this enable OMRPORT_OMRSIG_SUPPORT in OpenJ9 code? i.e. where does the flag get defined?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the flag will be defined in omrcfg.h
.
jenkins test sanity xlinux |
Properly link omrsig when building constgen and j9ddrgen
When building constgen and j9ddrgen, omrsig should be linked when
J9VM_PORT_OMRSIG_SUPPORT is enabled.
Remove OMRPORT_OMRSIG_SUPPORT definitions
Currently, OMRPORT_OMRSIG_SUPPORT is only defined while building the
port library. But, OMRPORT_OMRSIG_SUPPORT should be defined globally.
This will allow omrsig macros such as OMRSIG_SIGNAL and OMRSIG_SIGACTION
to be used consistently across OpenJ9.
Removing localized definitions of OMRPORT_OMRSIG_SUPPORT before enabling
it globally. This will prevent redundant definitions of
OMRPORT_OMRSIG_SUPPORT when it is enabled globally.
Enable OMRPORT_OMRSIG_SUPPORT globally in OpenJ9
Currently, OMRPORT_OMRSIG_SUPPORT is only defined while building the
port library. But, OMRPORT_OMRSIG_SUPPORT should be defined globally.
This will allow omrsig macros such as OMRSIG_SIGNAL and OMRSIG_SIGACTION
to be used consistently across OpenJ9. Thus, OMRPORT_OMRSIG_SUPPORT is
enabled globally.
Fix indentation in hyvm/module.xml
Link omrsig to port and vm only if J9VM_PORT_OMRSIG_SUPPORT is enabled
Currently, omrsig is linked to port and vm unconditionally. omrsig
should be linked to port and vm only if J9VM_PORT_OMRSIG_SUPPORT is
enabled.
Closes: #1889
Signed-off-by: Babneet Singh sbabneet@ca.ibm.com