projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix running of tests under net 4.0.
[mono.git]
/
libgc
/
include
/
gc.h
diff --git
a/libgc/include/gc.h
b/libgc/include/gc.h
index f7f3f01d77996a3efafb70763ecadf20c24963a1..d77de303e0d5e69193214b20d8dabcba1ad847d1 100644
(file)
--- a/
libgc/include/gc.h
+++ b/
libgc/include/gc.h
@@
-61,8
+61,8
@@
/* Win64 isn't really supported yet, but this is the first step. And */
/* it might cause error messages to show up in more plausible places. */
/* This needs basetsd.h, which is included by windows.h. */
/* Win64 isn't really supported yet, but this is the first step. And */
/* it might cause error messages to show up in more plausible places. */
/* This needs basetsd.h, which is included by windows.h. */
- typedef
ULONG_PTR
GC_word;
- typedef
LONG_PTR GC
_word;
+ typedef
unsigned __int64
GC_word;
+ typedef
__int64 GC_signed
_word;
#endif
/* Public read-only variables */
#endif
/* Public read-only variables */
@@
-98,7
+98,11
@@
typedef enum {
GC_EVENT_MARK_END,
GC_EVENT_RECLAIM_START,
GC_EVENT_RECLAIM_END,
GC_EVENT_MARK_END,
GC_EVENT_RECLAIM_START,
GC_EVENT_RECLAIM_END,
- GC_EVENT_END
+ GC_EVENT_END,
+ GC_EVENT_PRE_STOP_WORLD,
+ GC_EVENT_POST_STOP_WORLD,
+ GC_EVENT_PRE_START_WORLD,
+ GC_EVENT_POST_START_WORLD
} GCEventType;
GC_API void (*GC_notify_event) GC_PROTO((GCEventType event_type));
} GCEventType;
GC_API void (*GC_notify_event) GC_PROTO((GCEventType event_type));
@@
-420,6
+424,10
@@
GC_API size_t GC_get_bytes_since_gc GC_PROTO((void));
/* Never decreases, except due to wrapping. */
GC_API size_t GC_get_total_bytes GC_PROTO((void));
/* Never decreases, except due to wrapping. */
GC_API size_t GC_get_total_bytes GC_PROTO((void));
+/* Return the signal used by the gc to suspend threads on posix platforms. */
+/* Return -1 otherwise. */
+int GC_get_suspend_signal GC_PROTO((void));
+
/* Disable garbage collection. Even GC_gcollect calls will be */
/* ineffective. */
GC_API void GC_disable GC_PROTO((void));
/* Disable garbage collection. Even GC_gcollect calls will be */
/* ineffective. */
GC_API void GC_disable GC_PROTO((void));
@@
-918,6
+926,8
@@
extern void GC_thr_init(void); /* Needed for Solaris/X86 */
#if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
# include <windows.h>
#if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
# include <windows.h>
+ BOOL WINAPI GC_DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved);
+
/*
* All threads must be created using GC_CreateThread, so that they will be
* recorded in the thread table. For backwards compatibility, this is not
/*
* All threads must be created using GC_CreateThread, so that they will be
* recorded in the thread table. For backwards compatibility, this is not