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

Decode more StgTSO fields #41

Merged
merged 11 commits into from
Dec 7, 2020
Merged

Conversation

supersven
Copy link
Contributor

Stay in sync with the recent additions to wip/ghc-debug.

It now contains threadId and alloc_limit.
Keep in sync with GHC wip/ghc-debug branch.
Looks like the type of UI.mousemove changed.
Use a current artifact of wip/ghc-debug.
The extra package is not compatible to the current GHC head.
Point cabal to a patched version.
The changes are mirrored from wip/ghc-debug.
…res types

heap_view_closurePtrsAsWords is removed from GHC, so it needs to be
defined in ghc-debug.
@supersven supersven marked this pull request as ready for review August 26, 2020 15:38
@@ -1,4 +1,4 @@
packages: common, stub, client, dwarfadt, dwarf, ghc-vis, test, dyepack-test
packages: common, stub, client, dwarfadt, dwarf, ghc-vis, test, dyepack-test, test, /home/sven/src/head.hackage/packages/io-streams-1.5.1.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Getting things to build is one of my least favourite activities 😢 But I managed to figure out how to get this to build. I think you can get rid of this change and instead copy the head.hackage constraints (at least the one for io-streams) into this cabal.project file (this is described on the head.hackage page)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ups, Sorry!

/home/sven/src/head.hackage/packages/io-streams-1.5.1.0 is a left over from the time when I was waiting for my io-streams patch being merged to head.hackage. (https://gitlab.haskell.org/ghc/head.hackage/-/merge_requests/111)

Copy link
Contributor

@DavidEichmann DavidEichmann Sep 9, 2020

Choose a reason for hiding this comment

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

Ah great, so the head.hackage patch is already merged. Still though, when I did cabal new-build it selected the wrong io-streams version. Perhaps adding the constraints is not a bad idea (though maybe a separate PR).

Copy link
Contributor

Choose a reason for hiding this comment

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

See here for more build instructions #42 (comment)

@supersven
Copy link
Contributor Author

Hey @DavidEichmann ,
I'll solve the review comments/todos in the GHC branch first (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/1435) - otherwise I would get back into some "ping-pong-mode" that didn't prove to be very efficient...

As soon as we solved all open issues on the ghc-debug branch (or at least all API changes), I'll update this branch.

@mpickering mpickering merged commit ae04728 into bgamari:master Dec 7, 2020
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.

3 participants