feat(stdlib): Marshal #1352
Merged
feat(stdlib): Marshal #1352
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
ospencer
force-pushed
the
oscar/marshall
branch
3 times, most recently
from
ba032c7
to
8223491
Compare
marcusroberts
approved these changes
Jul 15, 2022
phated
requested changes
Aug 4, 2022
There was a problem hiding this comment.
This is sweet! I didn't validate the low-level memory offsets and stuff but I trust they are working from the tests. Most of my comments center around Map.contains followed by Map.get which is doubling the cost of lookup. I also wondered why we don't use Set data types where they would work.
stdlib/marshal.gr
Outdated
| if (isHeapPtr(value)) { | ||
| let asInt32 = toGrain(newInt32(value)): Int32 | ||
| if (Map.contains(asInt32, valuesSeen)) { | ||
| // We've detected a cycle, and we'll refer the existing instance |
There was a problem hiding this comment.
Suggested change
| // We've detected a cycle, and we'll refer the existing instance | |
| // We've detected a cycle, and we'll refer to the existing instance |
stdlib/marshal.gr
Outdated
Comment on lines
188
to
197
| // if (Map.contains(asInt32, valuesSeen)) { | ||
| // // Mark that there's a cycle | ||
| // store(buf, _CYCLE_MARKER, offset) | ||
| // store( | ||
| // buf, | ||
| // load(fromGrain(Option.unwrap(Map.get(asInt32, valuesSeen))), 8n), | ||
| // offset + 4n | ||
| // ) | ||
| // offset + 8n | ||
| // } else { |
There was a problem hiding this comment.
Are you keeping this for something?
stdlib/marshal.gr
Outdated
| // We've detected a cycle, and we'll refer the existing instance | ||
| acc | ||
| } else { | ||
| Map.set(asInt32, void, valuesSeen) |
There was a problem hiding this comment.
Why are you setting void here? Should this be a Set?
There was a problem hiding this comment.
Just to avoid depending on another library since we've already got maps imported. I was worried about having the unnecessary module size increase, but I checked and the difference is only 6k.
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(value)): Int32 | ||
| if (Map.contains(asInt32, valuesSeen)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesSeen))), |
There was a problem hiding this comment.
It would be a lot cheaper to Map.get then pattern match on the option, right?
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(value)): Int32 | ||
| if (Map.contains(asInt32, valuesSeen)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesSeen))), |
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(subvalue)): Int32 | ||
| if (Map.contains(asInt32, valuesUnmarshaled)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesUnmarshaled))), |
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(subvalue)): Int32 | ||
| if (Map.contains(asInt32, valuesUnmarshaled)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesUnmarshaled))), |
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(subvalue)): Int32 | ||
| if (Map.contains(asInt32, valuesUnmarshaled)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesUnmarshaled))), |
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(subvalue)): Int32 | ||
| if (Map.contains(asInt32, valuesUnmarshaled)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesUnmarshaled))), |
stdlib/marshal.gr
Outdated
| let asInt32 = toGrain(newInt32(subvalue)): Int32 | ||
| if (Map.contains(asInt32, valuesUnmarshaled)) { | ||
| let ptr = load( | ||
| fromGrain(Option.unwrap(Map.get(asInt32, valuesUnmarshaled))), |
Merged
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 implements serialization and deserialization of Grain values, useful for a variety of purposes like transmission across a network or storing values on disk to use later.