OpenJ9 fixes for OSX support [Part 1] #2858
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On OSX, linker fails to find the definition of __cxa_pure_virtual. Existing stub for __cxa_pure_virtual is enabled on OSX to satisfy the runtime linker. The stub for __cxa_pure_virtual should never be called. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
|
Reviewers:
|
babsingh
force-pushed
the
macos_port_pr
branch
from
83e08d7 to
2df4b92
Compare
| IDATA RTCfd; | ||
| #endif /* defined(LINUX) && !defined(J9ZTPF) */ |
There was a problem hiding this comment.
Would you please also add "&& !defined(J9ZTPF)" to MM_RTCAlarm::sleep() in MetronomeAlarm.cpp for consistency ?
babsingh
force-pushed
the
macos_port_pr
branch
2 times, most recently
from
6c213ca to
553d6e4
Compare
DanHeidinga
reviewed
Sep 13, 2018
runtime/vm/statistics.c
Outdated
| statistic->dataSlot = 0; | ||
| statistic->dataType = (U_32) dataType; | ||
| strcpy((char*)&(statistic->name), (char*)name); | ||
|
|
||
| statistic->name = j9mem_allocate_memory(stringSize, OMRMEM_CATEGORY_VM); |
There was a problem hiding this comment.
The statistics kept the full data in a single allocation. This doubles the allocations for a statistic. It looks like the right amount of memory has been allocated originally....
Any insight into why this is aborting? Are we missing a "no-strict-aliasing" style compile option here?
There was a problem hiding this comment.
i think the & may have been causing issues. i reverted to the old implementation. but, i changed how the size of J9Statistic is evaluated and removed the & during strcpy. now, the code works on OSX. remaining changes are done to satisfy coding standards.
babsingh
force-pushed
the
macos_port_pr
branch
from
553d6e4 to
2dad599
Compare
On OSX, "Abort trap: 6" happens while copying a name into J9Statistic->name using strcpy. Reworked memory allocation of J9Statistic in order to prevent "Abort trap: 6". Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
While compiling OpenJ9 with Clang 9.1.0 on OSX, the following error is seen: ./BarrierSynchronization.hpp:48:7: error: private field '_tokenCount' is not used [-Werror,-Wunused-private-field] private field _tokenCount is removed since it is unused. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
In MetronomeAlarm.hpp, private field 'RTCfd' is used to store real-time clock related information. On OSX, real-time clock is not supported. So, private field 'RTCfd' is unused. While compiling OpenJ9 with Clang 9.1.0 on OSX, the following error is seen: ./MetronomeAlarm.hpp:103:8: error: private field 'RTCfd' is not used [-Werror,-Wunused-private-field] The declaration of private field 'RTCfd' is surrounded by '#if defined(LINUX) && !defined(J9ZTPF)'. This resolves the compiler error on OSX. Also, fixed ifdefs related to RTCfd in MM_RTCAlarm::sleep(). Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
babsingh
force-pushed
the
macos_port_pr
branch
from
2dad599 to
6c6a0c3
Compare
|
Jenkins test sanity plinux jdk8 |
|
Related to #36. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1) Satisfy runtime linker on OSX for
__cxa_pure_virtual'sdefinitionOn OSX, linker fails to find the definition of
__cxa_pure_virtual. Existing stub for__cxa_pure_virtualis enabled on OSX to satisfy the runtime linker. The stub for__cxa_pure_virtualshould never be called.2) Fix "Abort trap: 6" on OSX
On OSX, Abort trap: 6 happens while copying a name into
J9Statistic->nameusing strcpy. Reworked memory allocation ofJ9Statisticin order to prevent Abort trap: 6.3) private field
_tokenCountunused in BarrierSynchronizationWhile compiling OpenJ9 with Clang 9.1.0 on OSX, the following error is seen:
./BarrierSynchronization.hpp:48:7: error: private field '_tokenCount' is not used [-Werror,-Wunused-private-field]private field
_tokenCountis removed since it is unused.4) Real-time clock is not supported on OSX
In MetronomeAlarm.hpp, private field
RTCfdis used to store real-time clock related information.On OSX, real-time clock is not supported. So, private field
RTCfdis unused. While compiling OpenJ9 with Clang 9.1.0 on OSX, the following error is seen:./MetronomeAlarm.hpp:103:8: error: private field 'RTCfd' is not used [-Werror,-Wunused-private-field]The declaration of private field
RTCfdis surrounded by#if defined(LINUX) && !defined(J9ZTPF). This resolves the compiler error on OSX.Also, fixed ifdefs related to
RTCfdinMM_RTCAlarm::sleep().Signed-off-by: Babneet Singh sbabneet@ca.ibm.com