Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/da102b36bfee605d4849ab74908886b5270d37ad >--------------------------------------------------------------- commit da102b36bfee605d4849ab74908886b5270d37ad Author: Manuel M T Chakravarty <[email protected]> Date: Tue Apr 10 14:13:40 2012 +1000 Fix RTS build on OS X * The following commits made validate fail on OS X (Lion): 65aaa9b2715c5245838123f3a0fa5d92e0a66bce and c294d95dc04950ab4c5380bf6ce8651f621f8591 * I just commented out all offending code until it validated again. The original authors need to clean this up. >--------------------------------------------------------------- rts/RtsProbes.d | 3 ++- rts/Trace.h | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/rts/RtsProbes.d b/rts/RtsProbes.d index f5470df..40665ac 100644 --- a/rts/RtsProbes.d +++ b/rts/RtsProbes.d @@ -56,12 +56,13 @@ provider HaskellEvent { probe gc__work (EventCapNo); probe gc__done (EventCapNo); probe gc__sync (EventCapNo); +/* FIXME: leads to a validate failure on OS X (Lion) probe gc__stats (CapsetID, StgWord, StgWord, StgWord, StgWord, StgWord, StgWord, StgWord); probe heap__info (CapsetID, StgWord, StgWord, StgWord, StgWord, StgWord); probe heap__allocated (EventCapNo, CapsetID, StgWord64); probe heap__size (CapsetID, StgWord); probe heap__live (CapsetID, StgWord); - + */ /* capability events */ probe startup (EventCapNo); probe cap__create (EventCapNo); diff --git a/rts/Trace.h b/rts/Trace.h index c4c4e41..58ce43d 100644 --- a/rts/Trace.h +++ b/rts/Trace.h @@ -352,6 +352,7 @@ INLINE_HEADER void dtraceStartup (int num_caps) { HASKELLEVENT_GC_DONE(cap) #define dtraceGcGlobalSync(cap) \ HASKELLEVENT_GC_GLOBAL_SYNC(cap) +/* FIXME: leads to a validate failure on OS X (Lion) #define dtraceEventGcStats(heap_capset, gens, \ copies, slop, fragmentation, \ par_n_threads, \ @@ -373,9 +374,22 @@ INLINE_HEADER void dtraceStartup (int num_caps) { HASKELLEVENT_HEAP_ALLOCATED(cap, heap_capset, \ allocated) #define dtraceEventHeapSize(heap_capset, size) \ - HASKELLEVENT_HEAP_LIVE(heap_capset, size) + HASKELLEVENT_HEAP_SIZE(heap_capset, size) #define dtraceEventHeapLive(heap_capset, live) \ HASKELLEVENT_HEAP_LIVE(heap_capset, live) + */ +#define dtraceEventGcStats(heap_capset, gens, \ + copies, slop, fragmentation, \ + par_n_threads, \ + par_max_copied, \ + par_tot_copied) +#define dtraceHeapInfo(heap_capset, gens, \ + maxHeapSize, allocAreaSize, \ + mblockSize, blockSize) +#define dtraceEventHeapAllocated(cap, heap_capset, \ + allocated) +#define dtraceEventHeapSize(heap_capset, size) +#define dtraceEventHeapLive(heap_capset, live) #define dtraceCapsetCreate(capset, capset_type) \ HASKELLEVENT_CAPSET_CREATE(capset, capset_type) @@ -517,7 +531,9 @@ INLINE_HEADER void traceEventMigrateThread(Capability *cap STG_UNUSED, INLINE_HEADER void traceCapCreate(Capability *cap STG_UNUSED) { traceCapEvent(cap, EVENT_CAP_CREATE); +/* FIXME: leads to a validate failure on OS X (Lion) dtraceCapCreate((EventCapNo)cap->no); + */ } INLINE_HEADER void traceCapDelete(Capability *cap STG_UNUSED) @@ -616,7 +632,9 @@ INLINE_HEADER void traceEventGcDone(Capability *cap STG_UNUSED) INLINE_HEADER void traceEventGcGlobalSync(Capability *cap STG_UNUSED) { traceGcEvent(cap, EVENT_GC_GLOBAL_SYNC); +/* FIXME: leads to a validate failure on OS X (Lion) dtraceGcGlobalSync((EventCapNo)cap->no); + */ } INLINE_HEADER void traceEventGcStats(Capability *cap STG_UNUSED, _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
