projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a998343
)
Fix the symbol visibility pragmas
author
Simon Marlow
<marlowsd@gmail.com>
Thu, 17 Jun 2010 10:57:58 +0000
(10:57 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Thu, 17 Jun 2010 10:57:58 +0000
(10:57 +0000)
45 files changed:
includes/Rts.h
patch
|
blob
|
history
rts/BeginPrivate.h
[new file with mode: 0644]
patch
|
blob
rts/Capability.h
patch
|
blob
|
history
rts/EndPrivate.h
[new file with mode: 0644]
patch
|
blob
rts/FrontPanel.h
patch
|
blob
|
history
rts/GetTime.h
patch
|
blob
|
history
rts/Hash.h
patch
|
blob
|
history
rts/Messages.h
patch
|
blob
|
history
rts/Papi.h
patch
|
blob
|
history
rts/Printer.h
patch
|
blob
|
history
rts/ProfHeap.h
patch
|
blob
|
history
rts/Profiling.h
patch
|
blob
|
history
rts/Proftimer.h
patch
|
blob
|
history
rts/RaiseAsync.h
patch
|
blob
|
history
rts/RetainerProfile.h
patch
|
blob
|
history
rts/RetainerSet.h
patch
|
blob
|
history
rts/RtsSignals.h
patch
|
blob
|
history
rts/RtsUtils.h
patch
|
blob
|
history
rts/STM.h
patch
|
blob
|
history
rts/Schedule.h
patch
|
blob
|
history
rts/Sparks.h
patch
|
blob
|
history
rts/Stable.h
patch
|
blob
|
history
rts/Stats.h
patch
|
blob
|
history
rts/StgPrimFloat.h
patch
|
blob
|
history
rts/Task.h
patch
|
blob
|
history
rts/ThreadLabels.h
patch
|
blob
|
history
rts/Threads.h
patch
|
blob
|
history
rts/Ticker.h
patch
|
blob
|
history
rts/Trace.h
patch
|
blob
|
history
rts/Updates.h
patch
|
blob
|
history
rts/Weak.h
patch
|
blob
|
history
rts/eventlog/EventLog.h
patch
|
blob
|
history
rts/posix/Signals.h
patch
|
blob
|
history
rts/sm/BlockAlloc.h
patch
|
blob
|
history
rts/sm/Compact.h
patch
|
blob
|
history
rts/sm/Evac.h
patch
|
blob
|
history
rts/sm/GC.h
patch
|
blob
|
history
rts/sm/GCThread.h
patch
|
blob
|
history
rts/sm/GCUtils.h
patch
|
blob
|
history
rts/sm/MarkStack.h
patch
|
blob
|
history
rts/sm/MarkWeak.h
patch
|
blob
|
history
rts/sm/OSMem.h
patch
|
blob
|
history
rts/sm/Sanity.h
patch
|
blob
|
history
rts/sm/Scav.h
patch
|
blob
|
history
rts/sm/Storage.h
patch
|
blob
|
history
diff --git
a/includes/Rts.h
b/includes/Rts.h
index
d79e9ad
..
394eb97
100644
(file)
--- a/
includes/Rts.h
+++ b/
includes/Rts.h
@@
-57,15
+57,7
@@
extern "C" {
#define RTS_PRIVATE /* disabled: RTS_PRIVATE */
#endif
#define RTS_PRIVATE /* disabled: RTS_PRIVATE */
#endif
-#if __GNUC__ > 4
-#define BEGIN_RTS_PRIVATE #pragma GCC visibility push(hidden)
-#define END_RTS_PRIVATE #pragma GCC visibility pop
-#else
-#define BEGIN_RTS_PRIVATE /* disabled: BEGIN_RTS_PRIVATE */
-#define END_RTS_PRIVATE /* disabled: END_RTS_PRIVATE */
-#endif
-
-#if __GNUC__ > 4
+#if __GNUC__ >= 4
#define RTS_UNLIKELY(p) __builtin_expect((p),0)
#else
#define RTS_UNLIKELY(p) p
#define RTS_UNLIKELY(p) __builtin_expect((p),0)
#else
#define RTS_UNLIKELY(p) p
diff --git a/rts/BeginPrivate.h
b/rts/BeginPrivate.h
new file mode 100644
(file)
index 0000000..
3ba4b89
--- /dev/null
+++ b/
rts/BeginPrivate.h
@@ -0,0
+1,3
@@
+#if __GNUC__ >= 4
+#pragma GCC visibility push(hidden)
+#endif
diff --git
a/rts/Capability.h
b/rts/Capability.h
index
59da4a8
..
a32062a
100644
(file)
--- a/
rts/Capability.h
+++ b/
rts/Capability.h
@@
-25,7
+25,7
@@
#include "Task.h"
#include "Sparks.h"
#include "Task.h"
#include "Sparks.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
struct Capability_ {
// State required by the STG virtual machine when running Haskell
struct Capability_ {
// State required by the STG virtual machine when running Haskell
@@
-357,6
+357,6
@@
INLINE_HEADER rtsBool emptyInbox(Capability *cap)
#endif
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* CAPABILITY_H */
#endif /* CAPABILITY_H */
diff --git a/rts/EndPrivate.h
b/rts/EndPrivate.h
new file mode 100644
(file)
index 0000000..
ac9df04
--- /dev/null
+++ b/
rts/EndPrivate.h
@@ -0,0
+1,3
@@
+#if __GNUC__ >= 4
+#pragma GCC visibility pop
+#endif
diff --git
a/rts/FrontPanel.h
b/rts/FrontPanel.h
index
fba97e1
..
1669c2b
100644
(file)
--- a/
rts/FrontPanel.h
+++ b/
rts/FrontPanel.h
@@
-9,7
+9,7
@@
#ifndef FRONTPANEL_H
#define FRONTPANEL_H
#ifndef FRONTPANEL_H
#define FRONTPANEL_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#ifdef RTS_GTK_FRONTPANEL
#ifdef RTS_GTK_FRONTPANEL
@@
-33,7
+33,7
@@
extern gboolean continue_now, stop_now, quit;
#endif /* RTS_GTK_FRONTPANEL */
#endif /* RTS_GTK_FRONTPANEL */
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* FRONTPANEL_H */
#endif /* FRONTPANEL_H */
diff --git
a/rts/GetTime.h
b/rts/GetTime.h
index
03e1f17
..
7b89c05
100644
(file)
--- a/
rts/GetTime.h
+++ b/
rts/GetTime.h
@@
-9,7
+9,7
@@
#ifndef GETTIME_H
#define GETTIME_H
#ifndef GETTIME_H
#define GETTIME_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
// We'll use a fixed resolution of usec for now. The machine
// dependent implementation may have a different resolution, but we'll
// We'll use a fixed resolution of usec for now. The machine
// dependent implementation may have a different resolution, but we'll
@@
-25,6
+25,6
@@
void getProcessTimes (Ticks *user, Ticks *elapsed);
// Not strictly timing, but related
nat getPageFaults (void);
// Not strictly timing, but related
nat getPageFaults (void);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* GETTIME_H */
#endif /* GETTIME_H */
diff --git
a/rts/Hash.h
b/rts/Hash.h
index
1099b8f
..
727c042
100644
(file)
--- a/
rts/Hash.h
+++ b/
rts/Hash.h
@@
-9,7
+9,7
@@
#ifndef HASH_H
#define HASH_H
#ifndef HASH_H
#define HASH_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
typedef struct hashtable HashTable; /* abstract */
typedef struct hashtable HashTable; /* abstract */
@@
-47,7
+47,7
@@
void freeHashTable ( HashTable *table, void (*freeDataFun)(void *) );
void exitHashTable ( void );
void exitHashTable ( void );
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* HASH_H */
#endif /* HASH_H */
diff --git
a/rts/Messages.h
b/rts/Messages.h
index
15c0379
..
54650fd
100644
(file)
--- a/
rts/Messages.h
+++ b/
rts/Messages.h
@@
-6,7
+6,7
@@
*
* --------------------------------------------------------------------------*/
*
* --------------------------------------------------------------------------*/
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
nat messageBlackHole(Capability *cap, MessageBlackHole *msg);
nat messageBlackHole(Capability *cap, MessageBlackHole *msg);
@@
-15,4
+15,4
@@
void executeMessage (Capability *cap, Message *m);
void sendMessage (Capability *from_cap, Capability *to_cap, Message *msg);
#endif
void sendMessage (Capability *from_cap, Capability *to_cap, Message *msg);
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
diff --git
a/rts/Papi.h
b/rts/Papi.h
index
f8acab7
..
7e58c6f
100644
(file)
--- a/
rts/Papi.h
+++ b/
rts/Papi.h
@@
-8,7
+8,7
@@
#ifndef PAPI_H
#define PAPI_H
#ifndef PAPI_H
#define PAPI_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* Check the error value of a PAPI call, reporting an error, if needed */
extern int papi_error;
/* Check the error value of a PAPI call, reporting an error, if needed */
extern int papi_error;
@@
-31,6
+31,6
@@
void papi_stop_gc1_count(void);
void papi_thread_start_gc1_count(int event_set);
void papi_thread_stop_gc1_count(int event_set);
void papi_thread_start_gc1_count(int event_set);
void papi_thread_stop_gc1_count(int event_set);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PAPI_H */
#endif /* PAPI_H */
diff --git
a/rts/Printer.h
b/rts/Printer.h
index
ca0cadb
..
7b51ce5
100644
(file)
--- a/
rts/Printer.h
+++ b/
rts/Printer.h
@@
-9,7
+9,7
@@
#ifndef PRINTER_H
#define PRINTER_H
#ifndef PRINTER_H
#define PRINTER_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
extern void printPtr ( StgPtr p );
extern void printObj ( StgClosure *obj );
extern void printPtr ( StgPtr p );
extern void printObj ( StgClosure *obj );
@@
-34,7
+34,7
@@
extern const char *lookupGHCName( void *addr );
extern char *what_next_strs[];
#endif
extern char *what_next_strs[];
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PRINTER_H */
#endif /* PRINTER_H */
diff --git
a/rts/ProfHeap.h
b/rts/ProfHeap.h
index
cda29ad
..
48b5baf
100644
(file)
--- a/
rts/ProfHeap.h
+++ b/
rts/ProfHeap.h
@@
-9,7
+9,7
@@
#ifndef PROFHEAP_H
#define PROFHEAP_H
#ifndef PROFHEAP_H
#define PROFHEAP_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void heapCensus (void);
nat initHeapProfiling (void);
void heapCensus (void);
nat initHeapProfiling (void);
@@
-17,6
+17,6
@@
void endHeapProfiling (void);
void LDV_recordDead (StgClosure *c, nat size);
rtsBool strMatchesSelector (char* str, char* sel);
void LDV_recordDead (StgClosure *c, nat size);
rtsBool strMatchesSelector (char* str, char* sel);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PROFHEAP_H */
#endif /* PROFHEAP_H */
diff --git
a/rts/Profiling.h
b/rts/Profiling.h
index
764e467
..
3a4184f
100644
(file)
--- a/
rts/Profiling.h
+++ b/
rts/Profiling.h
@@
-11,7
+11,7
@@
#include <stdio.h>
#include <stdio.h>
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void initProfiling1 (void);
void freeProfiling1 (void);
void initProfiling1 (void);
void freeProfiling1 (void);
@@
-37,6
+37,6
@@
void debugCCS( CostCentreStack *ccs );
#endif
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PROFILING_H */
#endif /* PROFILING_H */
diff --git
a/rts/Proftimer.h
b/rts/Proftimer.h
index
a3cfc8b
..
07dffff
100644
(file)
--- a/
rts/Proftimer.h
+++ b/
rts/Proftimer.h
@@
-9,7
+9,7
@@
#ifndef PROFTIMER_H
#define PROFTIMER_H
#ifndef PROFTIMER_H
#define PROFTIMER_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void initProfTimer ( void );
void handleProfTick ( void );
void initProfTimer ( void );
void handleProfTick ( void );
@@
-24,6
+24,6
@@
void startHeapProfTimer ( void );
extern rtsBool performHeapProfile;
extern rtsBool performHeapProfile;
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PROFTIMER_H */
#endif /* PROFTIMER_H */
diff --git
a/rts/RaiseAsync.h
b/rts/RaiseAsync.h
index
5137d41
..
336ab30
100644
(file)
--- a/
rts/RaiseAsync.h
+++ b/
rts/RaiseAsync.h
@@
-14,7
+14,7
@@
#ifndef CMINUSMINUS
#ifndef CMINUSMINUS
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void throwToSingleThreaded (Capability *cap,
StgTSO *tso,
void throwToSingleThreaded (Capability *cap,
StgTSO *tso,
@@
-64,7
+64,7
@@
interruptible(StgTSO *t)
}
}
}
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* CMINUSMINUS */
#endif /* CMINUSMINUS */
diff --git
a/rts/RetainerProfile.h
b/rts/RetainerProfile.h
index
9736eeb
..
b2adf71
100644
(file)
--- a/
rts/RetainerProfile.h
+++ b/
rts/RetainerProfile.h
@@
-14,7
+14,7
@@
#include "RetainerSet.h"
#include "RetainerSet.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void initRetainerProfiling ( void );
void endRetainerProfiling ( void );
void initRetainerProfiling ( void );
void endRetainerProfiling ( void );
@@
-43,7
+43,7
@@
retainerSetOf( StgClosure *c )
extern lnat retainerStackBlocks ( void );
#endif
extern lnat retainerStackBlocks ( void );
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PROFILING */
#endif /* PROFILING */
diff --git
a/rts/RetainerSet.h
b/rts/RetainerSet.h
index
e3d3acd
..
74152b9
100644
(file)
--- a/
rts/RetainerSet.h
+++ b/
rts/RetainerSet.h
@@
-14,7
+14,7
@@
#ifdef PROFILING
#ifdef PROFILING
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/*
Type 'retainer' defines the retainer identity.
/*
Type 'retainer' defines the retainer identity.
@@
-199,7
+199,7
@@
void outputAllRetainerSet(FILE *);
// the best place to define it.
void printRetainer(FILE *, retainer);
// the best place to define it.
void printRetainer(FILE *, retainer);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* PROFILING */
#endif /* RETAINERSET_H */
#endif /* PROFILING */
#endif /* RETAINERSET_H */
diff --git
a/rts/RtsSignals.h
b/rts/RtsSignals.h
index
f31a0ac
..
be21765
100644
(file)
--- a/
rts/RtsSignals.h
+++ b/
rts/RtsSignals.h
@@
-25,7
+25,7
@@
#if RTS_USER_SIGNALS
#if RTS_USER_SIGNALS
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/*
* Function: initUserSignals()
/*
* Function: initUserSignals()
@@
-60,7
+60,7
@@
void awaitUserSignals(void);
*/
void markSignalHandlers (evac_fn evac, void *user);
*/
void markSignalHandlers (evac_fn evac, void *user);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* RTS_USER_SIGNALS */
#endif /* RTS_USER_SIGNALS */
diff --git
a/rts/RtsUtils.h
b/rts/RtsUtils.h
index
909e243
..
24033b9
100644
(file)
--- a/
rts/RtsUtils.h
+++ b/
rts/RtsUtils.h
@@
-9,7
+9,7
@@
#ifndef RTSUTILS_H
#define RTSUTILS_H
#ifndef RTSUTILS_H
#define RTSUTILS_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* -----------------------------------------------------------------------------
* (Checked) dynamic allocation
/* -----------------------------------------------------------------------------
* (Checked) dynamic allocation
@@
-48,6
+48,6
@@
int genericRaise(int sig);
int rts_isProfiled(void);
int rts_isProfiled(void);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* RTSUTILS_H */
#endif /* RTSUTILS_H */
diff --git
a/rts/STM.h
b/rts/STM.h
index
eae93b2
..
f15a681
100644
(file)
--- a/
rts/STM.h
+++ b/
rts/STM.h
@@
-40,7
+40,7
@@
#define STM_UNIPROC
#endif
#define STM_UNIPROC
#endif
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/*----------------------------------------------------------------------
/*----------------------------------------------------------------------
@@
-225,7
+225,7
@@
void stmWriteTVar(Capability *cap,
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* STM_H */
#endif /* STM_H */
diff --git
a/rts/Schedule.h
b/rts/Schedule.h
index
7760e36
..
a00d81a
100644
(file)
--- a/
rts/Schedule.h
+++ b/
rts/Schedule.h
@@
-14,7
+14,7
@@
#include "Capability.h"
#include "Trace.h"
#include "Capability.h"
#include "Trace.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* initScheduler(), exitScheduler()
* Called from STG : no
/* initScheduler(), exitScheduler()
* Called from STG : no
@@
-214,7
+214,7
@@
emptyThreadQueues(Capability *cap)
#endif /* !IN_STG_CODE */
#endif /* !IN_STG_CODE */
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SCHEDULE_H */
#endif /* SCHEDULE_H */
diff --git
a/rts/Sparks.h
b/rts/Sparks.h
index
71fac6c
..
cffe99d
100644
(file)
--- a/
rts/Sparks.h
+++ b/
rts/Sparks.h
@@
-11,7
+11,7
@@
#include "WSDeque.h"
#include "WSDeque.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* typedef for SparkPool in RtsTypes.h */
/* typedef for SparkPool in RtsTypes.h */
@@
-65,6
+65,6
@@
INLINE_HEADER void discardSparks (SparkPool *pool)
#endif // THREADED_RTS
#endif // THREADED_RTS
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SPARKS_H */
#endif /* SPARKS_H */
diff --git
a/rts/Stable.h
b/rts/Stable.h
index
ebabee7
..
d7b7f8b
100644
(file)
--- a/
rts/Stable.h
+++ b/
rts/Stable.h
@@
-17,7
+17,7
@@
#include "sm/GC.h" // for evac_fn below
#include "sm/GC.h" // for evac_fn below
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void freeStablePtr ( StgStablePtr sp );
void freeStablePtr ( StgStablePtr sp );
@@
-33,6
+33,6
@@
void updateStablePtrTable ( rtsBool full );
void stablePtrPreGC ( void );
void stablePtrPostGC ( void );
void stablePtrPreGC ( void );
void stablePtrPostGC ( void );
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* STABLE_H */
#endif /* STABLE_H */
diff --git
a/rts/Stats.h
b/rts/Stats.h
index
02adcf9
..
d751761
100644
(file)
--- a/
rts/Stats.h
+++ b/
rts/Stats.h
@@
-11,7
+11,7
@@
#include "GetTime.h"
#include "GetTime.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void stat_startInit(void);
void stat_endInit(void);
void stat_startInit(void);
void stat_endInit(void);
@@
-63,6
+63,6
@@
void statsPrintf( char *s, ... )
HsInt64 getAllocations (void);
HsInt64 getAllocations (void);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* STATS_H */
#endif /* STATS_H */
diff --git
a/rts/StgPrimFloat.h
b/rts/StgPrimFloat.h
index
3f5b3e5
..
cd5da46
100644
(file)
--- a/
rts/StgPrimFloat.h
+++ b/
rts/StgPrimFloat.h
@@
-9,7
+9,7
@@
#ifndef STGPRIMFLOAT_H
#define STGPRIMFLOAT_H
#ifndef STGPRIMFLOAT_H
#define STGPRIMFLOAT_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* grimy low-level support functions defined in StgPrimFloat.c */
void __decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl);
/* grimy low-level support functions defined in StgPrimFloat.c */
void __decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl);
@@
-21,6
+21,6
@@
StgFloat __word_encodeFloat (W_ j, I_ e);
// __int_encodeDouble and __int_encodeFloat are public, declared in
// includes/rts/PrimFloat.h.
// __int_encodeDouble and __int_encodeFloat are public, declared in
// includes/rts/PrimFloat.h.
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* STGPRIMFLOAT_H */
#endif /* STGPRIMFLOAT_H */
diff --git
a/rts/Task.h
b/rts/Task.h
index
2d406aa
..
f91872f
100644
(file)
--- a/
rts/Task.h
+++ b/
rts/Task.h
@@
-14,7
+14,7
@@
#include "GetTime.h"
#include "GetTime.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/*
Definition of a Task
/*
Definition of a Task
@@
-270,6
+270,6
@@
setMyTask (Task *task)
#endif
}
#endif
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TASK_H */
#endif /* TASK_H */
diff --git
a/rts/ThreadLabels.h
b/rts/ThreadLabels.h
index
bd516a1
..
17d6b3f
100644
(file)
--- a/
rts/ThreadLabels.h
+++ b/
rts/ThreadLabels.h
@@
-10,7
+10,7
@@
#ifndef THREADLABELS_H
#define THREADLABELS_H
#ifndef THREADLABELS_H
#define THREADLABELS_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#if defined(DEBUG)
void initThreadLabelTable (void);
#if defined(DEBUG)
void initThreadLabelTable (void);
@@
-21,6
+21,6
@@
void removeThreadLabel (StgWord key);
void labelThread (StgPtr tso, char *label);
#endif
void labelThread (StgPtr tso, char *label);
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* THREADLABELS_H */
#endif /* THREADLABELS_H */
diff --git
a/rts/Threads.h
b/rts/Threads.h
index
bf16dcd
..
776dd93
100644
(file)
--- a/
rts/Threads.h
+++ b/
rts/Threads.h
@@
-9,7
+9,7
@@
#ifndef THREADS_H
#define THREADS_H
#ifndef THREADS_H
#define THREADS_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#define END_BLOCKED_EXCEPTIONS_QUEUE ((MessageThrowTo*)END_TSO_QUEUE)
#define END_BLOCKED_EXCEPTIONS_QUEUE ((MessageThrowTo*)END_TSO_QUEUE)
@@
-48,6
+48,6
@@
void printAllThreads (void);
void printThreadQueue (StgTSO *t);
#endif
void printThreadQueue (StgTSO *t);
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* THREADS_H */
#endif /* THREADS_H */
diff --git
a/rts/Ticker.h
b/rts/Ticker.h
index
37c2696
..
5804501
100644
(file)
--- a/
rts/Ticker.h
+++ b/
rts/Ticker.h
@@
-9,7
+9,7
@@
#ifndef TICKER_H
#define TICKER_H
#ifndef TICKER_H
#define TICKER_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
typedef void (*TickProc)(int);
typedef void (*TickProc)(int);
@@
-18,6
+18,6
@@
void startTicker (void);
void stopTicker (void);
void exitTicker (rtsBool wait);
void stopTicker (void);
void exitTicker (rtsBool wait);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TICKER_H */
#endif /* TICKER_H */
diff --git
a/rts/Trace.h
b/rts/Trace.h
index
69ea3d3
..
4f3ebce
100644
(file)
--- a/
rts/Trace.h
+++ b/
rts/Trace.h
@@
-16,7
+16,7
@@
#include "RtsProbes.h"
#endif /* defined(DTRACE) */
#include "RtsProbes.h"
#endif /* defined(DTRACE) */
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
// -----------------------------------------------------------------------------
// EventLog API
// -----------------------------------------------------------------------------
// EventLog API
@@
-397,6
+397,6
@@
INLINE_HEADER void traceEventGcDone(Capability *cap STG_UNUSED)
dtraceGcDone((EventCapNo)cap->no);
}
dtraceGcDone((EventCapNo)cap->no);
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TRACE_H */
#endif /* TRACE_H */
diff --git
a/rts/Updates.h
b/rts/Updates.h
index
4872adf
..
2258c98
100644
(file)
--- a/
rts/Updates.h
+++ b/
rts/Updates.h
@@
-10,7
+10,7
@@
#define UPDATES_H
#ifndef CMINUSMINUS
#define UPDATES_H
#ifndef CMINUSMINUS
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#endif
/* -----------------------------------------------------------------------------
#endif
/* -----------------------------------------------------------------------------
@@
-173,7
+173,7
@@
INLINE_HEADER void updateWithIndirection (Capability *cap,
#endif /* CMINUSMINUS */
#ifndef CMINUSMINUS
#endif /* CMINUSMINUS */
#ifndef CMINUSMINUS
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif
#endif /* UPDATES_H */
#endif
#endif /* UPDATES_H */
diff --git
a/rts/Weak.h
b/rts/Weak.h
index
a931b05
..
9b230f9
100644
(file)
--- a/
rts/Weak.h
+++ b/
rts/Weak.h
@@
-11,7
+11,7
@@
#include "Capability.h"
#include "Capability.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
extern rtsBool running_finalizers;
extern StgWeak * weak_ptr_list;
extern rtsBool running_finalizers;
extern StgWeak * weak_ptr_list;
@@
-21,7
+21,7
@@
void runAllCFinalizers(StgWeak *w);
void scheduleFinalizers(Capability *cap, StgWeak *w);
void markWeakList(void);
void scheduleFinalizers(Capability *cap, StgWeak *w);
void markWeakList(void);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* WEAK_H */
#endif /* WEAK_H */
diff --git
a/rts/eventlog/EventLog.h
b/rts/eventlog/EventLog.h
index
6ebf33d
..
0f31509
100644
(file)
--- a/
rts/eventlog/EventLog.h
+++ b/
rts/eventlog/EventLog.h
@@
-12,7
+12,7
@@
#include "rts/EventLogFormat.h"
#include "Capability.h"
#include "rts/EventLogFormat.h"
#include "Capability.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#ifdef TRACING
#ifdef TRACING
@@
-66,6
+66,6
@@
INLINE_HEADER void postCapMsg (Capability *cap STG_UNUSED,
#endif
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TRACING_H */
#endif /* TRACING_H */
diff --git
a/rts/posix/Signals.h
b/rts/posix/Signals.h
index
b80f711
..
7235559
100644
(file)
--- a/
rts/posix/Signals.h
+++ b/
rts/posix/Signals.h
@@
-13,7
+13,7
@@
# include <signal.h>
#endif
# include <signal.h>
#endif
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
rtsBool anyUserHandlers(void);
rtsBool anyUserHandlers(void);
@@
-28,7
+28,7
@@
Capability *ioManagerStartCap (Capability *cap);
extern StgInt *signal_handlers;
extern StgInt *signal_handlers;
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* POSIX_SIGNALS_H */
#endif /* POSIX_SIGNALS_H */
diff --git
a/rts/sm/BlockAlloc.h
b/rts/sm/BlockAlloc.h
index
b6d451f
..
c195baa
100644
(file)
--- a/
rts/sm/BlockAlloc.h
+++ b/
rts/sm/BlockAlloc.h
@@
-9,7
+9,7
@@
#ifndef BLOCK_ALLOC_H
#define BLOCK_ALLOC_H
#ifndef BLOCK_ALLOC_H
#define BLOCK_ALLOC_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* Debugging -------------------------------------------------------------- */
/* Debugging -------------------------------------------------------------- */
@@
-26,6
+26,6
@@
void reportUnmarkedBlocks (void);
extern lnat n_alloc_blocks; // currently allocated blocks
extern lnat hw_alloc_blocks; // high-water allocated blocks
extern lnat n_alloc_blocks; // currently allocated blocks
extern lnat hw_alloc_blocks; // high-water allocated blocks
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* BLOCK_ALLOC_H */
#endif /* BLOCK_ALLOC_H */
diff --git
a/rts/sm/Compact.h
b/rts/sm/Compact.h
index
efd7351
..
0dce3d0
100644
(file)
--- a/
rts/sm/Compact.h
+++ b/
rts/sm/Compact.h
@@
-14,7
+14,7
@@
#ifndef SM_COMPACT_H
#define SM_COMPACT_H
#ifndef SM_COMPACT_H
#define SM_COMPACT_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
INLINE_HEADER void
mark(StgPtr p, bdescr *bd)
INLINE_HEADER void
mark(StgPtr p, bdescr *bd)
@@
-48,6
+48,6
@@
is_marked(StgPtr p, bdescr *bd)
void compact (StgClosure *static_objects);
void compact (StgClosure *static_objects);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_COMPACT_H */
#endif /* SM_COMPACT_H */
diff --git
a/rts/sm/Evac.h
b/rts/sm/Evac.h
index
52346b1
..
c95658a
100644
(file)
--- a/
rts/sm/Evac.h
+++ b/
rts/sm/Evac.h
@@
-14,7
+14,7
@@
#ifndef SM_EVAC_H
#define SM_EVAC_H
#ifndef SM_EVAC_H
#define SM_EVAC_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
// Use a register argument for evacuate, if available.
// Earlier, the regparm attribute was used whenever __GNUC__ >= 2, but this
// Use a register argument for evacuate, if available.
// Earlier, the regparm attribute was used whenever __GNUC__ >= 2, but this
@@
-37,7
+37,7
@@
REGPARM1 void evacuate1 (StgClosure **p);
extern lnat thunk_selector_depth;
extern lnat thunk_selector_depth;
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_EVAC_H */
#endif /* SM_EVAC_H */
diff --git
a/rts/sm/GC.h
b/rts/sm/GC.h
index
e871f4c
..
38fc87c
100644
(file)
--- a/
rts/sm/GC.h
+++ b/
rts/sm/GC.h
@@
-14,7
+14,7
@@
#ifndef SM_GC_H
#define SM_GC_H
#ifndef SM_GC_H
#define SM_GC_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void GarbageCollect(rtsBool force_major_gc, nat gc_type, Capability *cap);
void GarbageCollect(rtsBool force_major_gc, nat gc_type, Capability *cap);
@@
-53,6
+53,6
@@
void releaseGCThreads (Capability *cap);
#define WORK_UNIT_WORDS 128
#define WORK_UNIT_WORDS 128
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_GC_H */
#endif /* SM_GC_H */
diff --git
a/rts/sm/GCThread.h
b/rts/sm/GCThread.h
index
7d46232
..
65554c4
100644
(file)
--- a/
rts/sm/GCThread.h
+++ b/
rts/sm/GCThread.h
@@
-16,7
+16,7
@@
#include "WSDeque.h"
#include "WSDeque.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* -----------------------------------------------------------------------------
General scheme
/* -----------------------------------------------------------------------------
General scheme
@@
-276,7
+276,7
@@
extern StgWord8 the_gc_thread[];
#endif
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif // SM_GCTHREAD_H
#endif // SM_GCTHREAD_H
diff --git
a/rts/sm/GCUtils.h
b/rts/sm/GCUtils.h
index
1fbbe3c
..
070a554
100644
(file)
--- a/
rts/sm/GCUtils.h
+++ b/
rts/sm/GCUtils.h
@@
-14,7
+14,7
@@
#ifndef SM_GCUTILS_H
#define SM_GCUTILS_H
#ifndef SM_GCUTILS_H
#define SM_GCUTILS_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
bdescr *allocBlock_sync(void);
void freeChain_sync(bdescr *bd);
bdescr *allocBlock_sync(void);
void freeChain_sync(bdescr *bd);
@@
-61,6
+61,6
@@
recordMutableGen_GC (StgClosure *p, nat gen_no)
*bd->free++ = (StgWord)p;
}
*bd->free++ = (StgWord)p;
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_GCUTILS_H */
#endif /* SM_GCUTILS_H */
diff --git
a/rts/sm/MarkStack.h
b/rts/sm/MarkStack.h
index
bf445b3
..
db79ca4
100644
(file)
--- a/
rts/sm/MarkStack.h
+++ b/
rts/sm/MarkStack.h
@@
-14,7
+14,7
@@
#ifndef SM_MARKSTACK_H
#define SM_MARKSTACk_H
#ifndef SM_MARKSTACK_H
#define SM_MARKSTACk_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
INLINE_HEADER void
push_mark_stack(StgPtr p)
INLINE_HEADER void
push_mark_stack(StgPtr p)
@@
-66,6
+66,6
@@
mark_stack_empty(void)
return (((W_)mark_sp & BLOCK_MASK) == 0 && mark_stack_bd->link == NULL);
}
return (((W_)mark_sp & BLOCK_MASK) == 0 && mark_stack_bd->link == NULL);
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_MARKSTACK_H */
#endif /* SM_MARKSTACK_H */
diff --git
a/rts/sm/MarkWeak.h
b/rts/sm/MarkWeak.h
index
5c05ab2
..
64ccb0f
100644
(file)
--- a/
rts/sm/MarkWeak.h
+++ b/
rts/sm/MarkWeak.h
@@
-14,7
+14,7
@@
#ifndef SM_MARKWEAK_H
#define SM_MARKWEAK_H
#ifndef SM_MARKWEAK_H
#define SM_MARKWEAK_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
extern StgWeak *old_weak_ptr_list;
extern StgTSO *resurrected_threads;
extern StgWeak *old_weak_ptr_list;
extern StgTSO *resurrected_threads;
@@
-24,6
+24,6
@@
void initWeakForGC ( void );
rtsBool traverseWeakPtrList ( void );
void markWeakPtrList ( void );
rtsBool traverseWeakPtrList ( void );
void markWeakPtrList ( void );
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_MARKWEAK_H */
#endif /* SM_MARKWEAK_H */
diff --git
a/rts/sm/OSMem.h
b/rts/sm/OSMem.h
index
ee6b810
..
3349140
100644
(file)
--- a/
rts/sm/OSMem.h
+++ b/
rts/sm/OSMem.h
@@
-9,7
+9,7
@@
#ifndef SM_OSMEM_H
#define SM_OSMEM_H
#ifndef SM_OSMEM_H
#define SM_OSMEM_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void osMemInit(void);
void *osGetMBlocks(nat n);
void osMemInit(void);
void *osGetMBlocks(nat n);
@@
-17,6
+17,6
@@
void osFreeAllMBlocks(void);
lnat getPageSize (void);
void setExecutable (void *p, lnat len, rtsBool exec);
lnat getPageSize (void);
void setExecutable (void *p, lnat len, rtsBool exec);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_OSMEM_H */
#endif /* SM_OSMEM_H */
diff --git
a/rts/sm/Sanity.h
b/rts/sm/Sanity.h
index
5c963b4
..
602be54
100644
(file)
--- a/
rts/sm/Sanity.h
+++ b/
rts/sm/Sanity.h
@@
-11,7
+11,7
@@
#ifdef DEBUG
#ifdef DEBUG
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
# if defined(PAR)
# define PVM_PE_MASK 0xfffc0000
# if defined(PAR)
# define PVM_PE_MASK 0xfffc0000
@@
-42,7
+42,7
@@
void memInventory (rtsBool show);
void checkBQ (StgTSO *bqe, StgClosure *closure);
void checkBQ (StgTSO *bqe, StgClosure *closure);
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* DEBUG */
#endif /* DEBUG */
diff --git
a/rts/sm/Scav.h
b/rts/sm/Scav.h
index
ad466c8
..
699e48c
100644
(file)
--- a/
rts/sm/Scav.h
+++ b/
rts/sm/Scav.h
@@
-14,7
+14,7
@@
#ifndef SM_SCAV_H
#define SM_SCAV_H
#ifndef SM_SCAV_H
#define SM_SCAV_H
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
void scavenge_loop (void);
void scavenge_mutable_list (bdescr *bd, generation *gen);
void scavenge_loop (void);
void scavenge_mutable_list (bdescr *bd, generation *gen);
@@
-26,7
+26,7
@@
void scavenge_mutable_list1 (bdescr *bd, generation *gen);
void scavenge_capability_mut_Lists1 (Capability *cap);
#endif
void scavenge_capability_mut_Lists1 (Capability *cap);
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_SCAV_H */
#endif /* SM_SCAV_H */
diff --git
a/rts/sm/Storage.h
b/rts/sm/Storage.h
index
f8532e0
..
f6c50ad
100644
(file)
--- a/
rts/sm/Storage.h
+++ b/
rts/sm/Storage.h
@@
-11,7
+11,7
@@
#include "Capability.h"
#include "Capability.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* -----------------------------------------------------------------------------
Initialisation / De-initialisation
/* -----------------------------------------------------------------------------
Initialisation / De-initialisation
@@
-151,6
+151,6
@@
void move_TSO (StgTSO *src, StgTSO *dest);
extern StgClosure * caf_list;
extern StgClosure * revertible_caf_list;
extern StgClosure * caf_list;
extern StgClosure * revertible_caf_list;
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SM_STORAGE_H */
#endif /* SM_STORAGE_H */