search

Mikolaj / ghc

Mirror of ghc repository. DO NOT SUBMIT PULL REQUESTS HERE
http://www.haskell.org/ghc/
Other
1 stars 0 forks source link

Rebase the new GHC events for simulation of +RTS -s on the current master #1

Closed Mikolaj closed 12 years ago

Mikolaj commented 12 years ago

There is a conflict of libraries/base/GHC/Stats.hsc with the 'par_avg_bytes_copied' and other field renames in our GHC commits. Here's one of the offending lines: https://github.com/Mikolaj/packages-base/blob/master/GHC/Stats.hsc#L102.

Edit: 16:02 @Igloo Well, you have to use http://www.haskell.org/haskellwiki/Library_submissions if appropriate (in particular, if changing public APIs) 16:03 @mikolaj oh, that API is public, I didn't think about it :( 16:05 @mikolaj @dcoutts: so, actually, I wait for your decision about that (keep our rename/revert it/keep rename in GHC, translate only in Stats.hsc)

Edit: 16:11 @dcoutts I think having a consistent name is a good thing here 16:12 @mikolaj k, will do, should I go through http://www.haskell.org/haskellwiki/Library_submissions process? 16:13 @dcoutts mikolaj: no, it's GHC. module 16:13 @dcoutts just mention it when sending in the patches 16:13 @dcoutts Igloo and Simon can decide if they're happy

Mikolaj commented 12 years ago

The 'par_avg_bytes_copied' conflict fixed in

https://github.com/Mikolaj/packages-base/commit/78843d46bfac136be828977997becbce705e2d39