Give each scan function an unique name to help some profilers finding the right symbol.

diff --git a/mono/metadata/sgen-minor-scan-object.h b/mono/metadata/sgen-minor-scan-object.h
index 24306734c1c6fe2cd15c0c5a05c6c367b8173e69..89841202a0eca96757e4d9a0b2bd52aaeb5a10af 100644 (file)
--- a/mono/metadata/sgen-minor-scan-object.h
+++ b/mono/metadata/sgen-minor-scan-object.h
@@ -23,6 +23,22 @@
  */
 extern long long stat_scan_object_called_nursery;
 
+#if defined(SGEN_SIMPLE_NURSERY)
+#define serial_scan_object simple_nursery_serial_scan_object
+#define serial_scan_vtype simple_nursery_serial_scan_vtype
+#define parallel_scan_object simple_nursery_parallel_scan_object
+#define parallel_scan_vtype simple_nursery_parallel_scan_vtype
+
+#elif defined (SGEN_SPLIT_NURSERY)
+#define serial_scan_object split_nursery_serial_scan_object
+#define serial_scan_vtype split_nursery_serial_scan_vtype
+#define parallel_scan_object split_nursery_parallel_scan_object
+#define parallel_scan_vtype split_nursery_parallel_scan_vtype
+
+#else
+#error "Please define GC_CONF_NAME"
+#endif
+
 #undef HANDLE_PTR
 #define HANDLE_PTR(ptr,obj)    do {    \
                void *__old = *(ptr);   \

diff --git a/mono/metadata/sgen-simple-nursery.c b/mono/metadata/sgen-simple-nursery.c
index 0bfa81eba63fea150fb8997420cc22bbf2465553..3c4ec7cd8fc9eadb586a7ff07496c1ea81d62858 100644 (file)
--- a/mono/metadata/sgen-simple-nursery.c
+++ b/mono/metadata/sgen-simple-nursery.c
@@ -83,6 +83,8 @@ init_nursery (SgenFragmentAllocator *allocator, char *start, char *end)
 
 /******************************************Copy/Scan functins ************************************************/
 
+#define SGEN_SIMPLE_NURSERY
+
 #include "sgen-minor-copy-object.h"
 #include "sgen-minor-scan-object.h"
 

diff --git a/mono/metadata/sgen-split-nursery.c b/mono/metadata/sgen-split-nursery.c
index 01384714bc8ac93c9aa9938d08abf238c8e3ea21..60e4621330de173b38df1e4c58eb9f021531f8aa 100644 (file)
--- a/mono/metadata/sgen-split-nursery.c
+++ b/mono/metadata/sgen-split-nursery.c
@@ -521,6 +521,8 @@ print_gc_param_usage (void)
 
 /******************************************Copy/Scan functins ************************************************/
 
+#define SGEN_SPLIT_NURSERY
+
 #include "sgen-minor-copy-object.h"
 #include "sgen-minor-scan-object.h"