Skip to content
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

Heap size limits for module loading + Memory improvements. #964

Merged
merged 36 commits into from
Feb 17, 2022

Conversation

jmcardon
Copy link
Member

@jmcardon jmcardon commented Feb 7, 2022

No description provided.

@jmcardon jmcardon marked this pull request as draft February 7, 2022 18:29
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Show resolved Hide resolved
src/Pact/Eval.hs Show resolved Hide resolved
@jmcardon jmcardon marked this pull request as ready for review February 11, 2022 21:59
Copy link
Contributor

@sirlensalot sirlensalot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some add on concerns:

  • need to retain info for the REPL (in initReplState' probably)
  • need to run all the pact repl tests for BOTH stripped and not

pact.cabal Outdated Show resolved Hide resolved
pact.cabal Show resolved Hide resolved
src/Pact/Gas/Table.hs Outdated Show resolved Hide resolved
src/Pact/Gas/Table.hs Outdated Show resolved Hide resolved
src/Pact/Runtime/Utils.hs Show resolved Hide resolved
src/Pact/Types/SizeOf.hs Outdated Show resolved Hide resolved
src/Pact/Types/SizeOf.hs Outdated Show resolved Hide resolved
src/Pact/Types/SizeOf.hs Show resolved Hide resolved
tests/GasModelSpec.hs Show resolved Hide resolved
tests/pact/simple.repl Outdated Show resolved Hide resolved
Copy link
Member

@emilypi emilypi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great @jmcardon

src/Pact/Gas.hs Outdated
throwErr GasError info $ "Gas limit (" <> pretty _geGasLimit <> ") exceeded: " <> pretty gUsed
else return gUsed

logGas :: Text -> GasArgs -> Gas -> Eval e ()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If these refactors aren't needed then remove them -- looks like you switched to computeGas so we shouldn't be exporting internal ops anymore or making them toplevel

Copy link
Contributor

@LindaOrtega LindaOrtega left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good!

I added a couple of nits that aren't deal breakers.

I do have some questions regarding the tests. I saw that in memory cost was disabled in the gas tests and the golden tests. Is this because the expected gas differed?

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved
src/Pact/Gas.hs Outdated Show resolved Hide resolved
tests/GoldenSpec.hs Show resolved Hide resolved
tests/GasModelSpec.hs Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
src/Pact/Eval.hs Outdated Show resolved Hide resolved
@sirlensalot sirlensalot dismissed their stale review February 16, 2022 20:01

changes from this addressed

@jmcardon jmcardon merged commit d00953b into master Feb 17, 2022
@jmcardon jmcardon deleted the jose/explore-strict branch June 17, 2022 20:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants