diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2012-04-10 14:13:40 +1000 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2012-04-10 14:13:40 +1000 |
| commit | da102b36bfee605d4849ab74908886b5270d37ad (patch) | |
| tree | c22e1d699c080a8a66ce070a987a9a4928fa2dee /rts | |
| parent | 1bfb97985881bc080956156d40c84a7d888787d1 (diff) | |
| download | haskell-da102b36bfee605d4849ab74908886b5270d37ad.tar.gz | |
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.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/RtsProbes.d | 3 | ||||
| -rw-r--r-- | rts/Trace.h | 22 |
2 files changed, 22 insertions, 3 deletions
diff --git a/rts/RtsProbes.d b/rts/RtsProbes.d index f5470dfe0b..40665acc56 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 c4c4e41608..58ce43df68 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,10 +374,23 @@ 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) #define dtraceCapsetDelete(capset) \ @@ -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, |