Fix Issue #548 #547
Merged
Fix Issue #548 #547
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
- These macros have same names as defined in tardis/montecarlo/src/status.h
| @@ -22,7 +21,7 @@ class RPacket(Structure): | |||
| ('d_boundary', c_double), | |||
| ('d_cont', c_double), | |||
| ('next_shell_id', c_int64), | |||
| ('status', RPacketStatus), | |||
| ('status', c_int), | |||
There was a problem hiding this comment.
Use c_status_t here and define it as c_status_t = c_int above.
Or c_packet_status_t. Whatever sounds best.
kdexd
changed the title
kdexd
force-pushed
the
enums-for-cmontecarlo
branch
from
e4a9580 to
fd7a862
Compare
| @@ -1,5 +1,8 @@ | |||
| from ctypes import Structure, POINTER, c_int, c_int64, c_double, c_ulong | |||
|
|
|||
| c_rpacket_status_t = c_int | |||
| c_cont_status_t = c_int | |||
|
|
|||
There was a problem hiding this comment.
It isn't used in structs right now, though declaration would be helpful.
- C enums can be treated as ints (signed or unsigned) so, RPacket.status is mapped as c_rpacket_status_t and this, is declared as c_int before. - Similar workaround for StorageModel.cont_status. - c_tardis_error_t also defined alongwith these two.
kdexd
force-pushed
the
enums-for-cmontecarlo
branch
from
fd7a862 to
5d15f05
Compare
|
@tardis-sn/tardis-core Can someone please sign this off? This resolves issue #548. |
20 tasks
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.
This PR is a fix of issue #548 as well as a simplification of PR #540. Previous implementation caused ocassional segfaults in subsequent test runs. Here, the complete file enum.py has been removed and corresponding variables from C enums have been defined as macros in struct.py. This ensures that the code is still readable as before.