Commit 057384f9 authored by Simon Peyton Jones's avatar Simon Peyton Jones

Merge branch 'master' of http://darcs.haskell.org/ghc

parents 91b44bc5 900e7d25
......@@ -27,13 +27,13 @@ struct gc_thread_;
void stat_startInit(void);
void stat_endInit(void);
void stat_startGC(Capability *cap, struct gc_thread_ *gct);
void stat_endGC (Capability *cap, struct gc_thread_ *gct,
void stat_startGC(Capability *cap, struct gc_thread_ *_gct);
void stat_endGC (Capability *cap, struct gc_thread_ *_gct,
W_ alloc, W_ live, W_ copied, W_ slop, nat gen,
nat n_gc_threads, W_ par_max_copied, W_ par_tot_copied);
void stat_gcWorkerThreadStart (struct gc_thread_ *gct);
void stat_gcWorkerThreadDone (struct gc_thread_ *gct);
void stat_gcWorkerThreadStart (struct gc_thread_ *_gct);
void stat_gcWorkerThreadDone (struct gc_thread_ *_gct);
#ifdef PROFILING
void stat_startRP(void);
......
......@@ -15,6 +15,19 @@
#include "Rts.h"
#include "HsFFI.h"
#include "GC.h"
#include "GCThread.h"
#include "GCTDecl.h" // NB. before RtsSignals.h which
// clobbers REG_R1 on arm/Linux
#include "Compact.h"
#include "Evac.h"
#include "Scav.h"
#include "GCUtils.h"
#include "MarkStack.h"
#include "MarkWeak.h"
#include "Sparks.h"
#include "Sweep.h"
#include "Storage.h"
#include "RtsUtils.h"
#include "Apply.h"
......@@ -38,18 +51,6 @@
#include "Papi.h"
#include "Stable.h"
#include "GC.h"
#include "GCThread.h"
#include "GCTDecl.h"
#include "Compact.h"
#include "Evac.h"
#include "Scav.h"
#include "GCUtils.h"
#include "MarkStack.h"
#include "MarkWeak.h"
#include "Sparks.h"
#include "Sweep.h"
#include <string.h> // for memset()
#include <unistd.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment