[sgen] Use consistent include paths.

diff --git a/mono/metadata/gc-memfuncs.c b/mono/metadata/gc-memfuncs.c
index 375c51aa645e8a09beb8b8b0070ff3cef830b88a..c8acd5ec84791e6d15487f0b6b680fc4831fea4c 100644 (file)
--- a/mono/metadata/gc-memfuncs.c
+++ b/mono/metadata/gc-memfuncs.c
@@ -38,7 +38,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "metadata/gc-internal-agnostic.h"
+#include "mono/metadata/gc-internal-agnostic.h"
 
 #define ptr_mask ((sizeof (void*) - 1))
 #define _toi(ptr) ((size_t)ptr)

diff --git a/mono/metadata/gc-parse.c b/mono/metadata/gc-parse.c
index d030a9cb79fb44b0aaff701be449c5b8fbc9d7e9..1585baef1c135ef6b25bb707725f621c8dc73fd5 100644 (file)
--- a/mono/metadata/gc-parse.c
+++ b/mono/metadata/gc-parse.c
@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "metadata/gc-internal-agnostic.h"
+#include "mono/metadata/gc-internal-agnostic.h"
 
 /**
  * mono_gc_parse_environment_string_extract_number:

diff --git a/mono/metadata/sgen-alloc.c b/mono/metadata/sgen-alloc.c
index 2f15bd85b90c3cbace8a669f7689541458894b56..d1955b68dbd7a5d986136e95417ad57debad4169 100644 (file)
--- a/mono/metadata/sgen-alloc.c
+++ b/mono/metadata/sgen-alloc.c
@@ -39,13 +39,13 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-client.h"
-#include "utils/mono-memory-model.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/utils/mono-memory-model.h"
 
 #define ALIGN_UP               SGEN_ALIGN_UP
 #define ALLOC_ALIGN            SGEN_ALLOC_ALIGN

diff --git a/mono/metadata/sgen-bridge-internal.h b/mono/metadata/sgen-bridge-internal.h
index 119183be928da4fb45734e695f893cfbceaacf93..5facf711886c5a3f7a95df789e7c200fe40f6e05 100644 (file)
--- a/mono/metadata/sgen-bridge-internal.h
+++ b/mono/metadata/sgen-bridge-internal.h
@@ -24,10 +24,10 @@
 
 #ifdef HAVE_SGEN_GC
 
-#include "utils/mono-compiler.h"
+#include "mono/utils/mono-compiler.h"
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-bridge.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-bridge.h"
 
 extern gboolean bridge_processing_in_progress;
 extern MonoGCBridgeCallbacks bridge_callbacks;

diff --git a/mono/metadata/sgen-cardtable.c b/mono/metadata/sgen-cardtable.c
index 40e0f4cad102b0c9377687152b242d7307100b17..3039718cdd250645a99536ab0857b0c50e39ad2b 100644 (file)
--- a/mono/metadata/sgen-cardtable.c
+++ b/mono/metadata/sgen-cardtable.c
@@ -26,16 +26,16 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-cardtable.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-layout-stats.h"
-#include "metadata/sgen-client.h"
-#include "metadata/gc-internal-agnostic.h"
-#include "utils/mono-memory-model.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-cardtable.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-layout-stats.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/metadata/gc-internal-agnostic.h"
+#include "mono/utils/mono-memory-model.h"
 
 //#define CARDTABLE_STATS
 

diff --git a/mono/metadata/sgen-client.h b/mono/metadata/sgen-client.h
index d5bb48f81681043a1e0ccab003e76a7738465cf0..52ab281fb18fd9c0cac92aae299eb38e783952bc 100644 (file)
--- a/mono/metadata/sgen-client.h
+++ b/mono/metadata/sgen-client.h
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <metadata/sgen-pointer-queue.h>
+#include "mono/metadata/sgen-pointer-queue.h"
 
 void sgen_client_init (void);
 

diff --git a/mono/metadata/sgen-debug.c b/mono/metadata/sgen-debug.c
index 6f1e78a037de77404f51b3073149776ed2a07359..58cedbc253bed085b57496c815c698f58747d593 100644 (file)
--- a/mono/metadata/sgen-debug.c
+++ b/mono/metadata/sgen-debug.c
@@ -27,16 +27,16 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-cardtable.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-pinning.h"
-#include "metadata/sgen-client.h"
-#include "metadata/sgen-bridge-internal.h"
-#include "metadata/threadpool-internals.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-cardtable.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-pinning.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/metadata/sgen-bridge-internal.h"
+#include "mono/metadata/threadpool-internals.h"
 
 #define LOAD_VTABLE    SGEN_LOAD_VTABLE
 

diff --git a/mono/metadata/sgen-descriptor.c b/mono/metadata/sgen-descriptor.c
index 0991462a1d6362b1737249d8b9c120edc75b7485..ce94a6c30529d04f83feec03d861ffae2d63b1b8 100644 (file)
--- a/mono/metadata/sgen-descriptor.c
+++ b/mono/metadata/sgen-descriptor.c
@@ -42,8 +42,8 @@
 #define _XOPEN_SOURCE
 #endif
 
-#include "metadata/sgen-gc.h"
-#include "metadata/gc-internal-agnostic.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/gc-internal-agnostic.h"
 
 #define MAX_USER_DESCRIPTORS 16
 

diff --git a/mono/metadata/sgen-fin-weak-hash.c b/mono/metadata/sgen-fin-weak-hash.c
index a0dc57d2e37752426d869f5585fc724337de5b36..5506513de345364a05365f37c79e8c03c6ed119e 100644 (file)
--- a/mono/metadata/sgen-fin-weak-hash.c
+++ b/mono/metadata/sgen-fin-weak-hash.c
@@ -27,11 +27,12 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-gray.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-pointer-queue.h"
-#include "metadata/sgen-client.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-gray.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-pointer-queue.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/utils/mono-membar.h"
 
 #define ptr_in_nursery sgen_ptr_in_nursery
 

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index e8ce0e6f11fcda153ffa8f11cd9c5165a0e65e01..50db67e3ef15ab09bfae4e69d28afe4322d7362f 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -201,6 +201,7 @@
 #include "mono/metadata/gc-internal-agnostic.h"
 #include "mono/utils/mono-proclib.h"
 #include "mono/utils/mono-memory-model.h"
+#include "mono/utils/hazard-pointer.h"
 
 #include <mono/utils/memcheck.h>
 

diff --git a/mono/metadata/sgen-gray.c b/mono/metadata/sgen-gray.c
index 679c051efd4d81776ad296094dfaa8b2527db534..fd9f39dc66e0e7e2f572dadbbc4079c9ac812ab8 100644 (file)
--- a/mono/metadata/sgen-gray.c
+++ b/mono/metadata/sgen-gray.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "sgen-protocol.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
 
 #ifdef HEAVY_STATISTICS
 guint64 stat_gray_queue_section_alloc;

diff --git a/mono/metadata/sgen-internal.c b/mono/metadata/sgen-internal.c
index 81a59d6bbaab0f6cb39c7ad03dcb8f6d3907d6bc..ffb4d547005274530ab6e638f5e0201789c0cc42 100644 (file)
--- a/mono/metadata/sgen-internal.c
+++ b/mono/metadata/sgen-internal.c
@@ -21,12 +21,12 @@
 
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "utils/lock-free-alloc.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-client.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/utils/lock-free-alloc.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-client.h"
 
 /* keep each size a multiple of ALLOC_ALIGN */
 #if SIZEOF_VOID_P == 4

diff --git a/mono/metadata/sgen-los.c b/mono/metadata/sgen-los.c
index 974c3a6d881d947a060a462446c080f8481e616b..97997acefb2b25228652e8ebcdd7d49c18cfd3e6 100644 (file)
--- a/mono/metadata/sgen-los.c
+++ b/mono/metadata/sgen-los.c
@@ -33,13 +33,13 @@
 
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-cardtable.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-client.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-cardtable.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-client.h"
 
 #define LOS_SECTION_SIZE       (1024 * 1024)
 

diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c
index 8470071fa2e848b0db0c106f94d9a1094d6b76d2..ebb01daecc546d5799c6db3da5d712d37a879469 100644 (file)
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@ -28,19 +28,16 @@
 #include <math.h>
 #include <errno.h>
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-cardtable.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-layout-stats.h"
-#include "metadata/sgen-pointer-queue.h"
-#include "metadata/sgen-pinning.h"
-#include "metadata/sgen-workers.h"
-#include "metadata/sgen-thread-pool.h"
-#include "metadata/sgen-client.h"
-#include <string.h>
-#include <stdlib.h>
-
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-cardtable.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-layout-stats.h"
+#include "mono/metadata/sgen-pointer-queue.h"
+#include "mono/metadata/sgen-pinning.h"
+#include "mono/metadata/sgen-workers.h"
+#include "mono/metadata/sgen-thread-pool.h"
+#include "mono/metadata/sgen-client.h"
 
 #if defined(ARCH_MIN_MS_BLOCK_SIZE) && defined(ARCH_MIN_MS_BLOCK_SIZE_SHIFT)
 #define MS_BLOCK_SIZE  ARCH_MIN_MS_BLOCK_SIZE

diff --git a/mono/metadata/sgen-memory-governor.c b/mono/metadata/sgen-memory-governor.c
index d6c55b6eb735be1f4b7530f1476e40e6cc585517..479e02c1ff0b1b0ea948fa3674cae08fe1d9de89 100644 (file)
--- a/mono/metadata/sgen-memory-governor.c
+++ b/mono/metadata/sgen-memory-governor.c
@@ -27,12 +27,10 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-thread-pool.h"
-#include "metadata/sgen-client.h"
-#include <stdlib.h>
-
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-thread-pool.h"
+#include "mono/metadata/sgen-client.h"
 
 #define MIN_MINOR_COLLECTION_ALLOWANCE ((mword)(DEFAULT_NURSERY_SIZE * default_allowance_nursery_size_ratio))
 

diff --git a/mono/metadata/sgen-nursery-allocator.c b/mono/metadata/sgen-nursery-allocator.c
index d20062baeb642fa1bd7d25e73991ef41c4e60d7d..e5d75d1bbf3e447d6989d2823f942e31c927b358 100644 (file)
--- a/mono/metadata/sgen-nursery-allocator.c
+++ b/mono/metadata/sgen-nursery-allocator.c
@@ -59,12 +59,13 @@
 #define _XOPEN_SOURCE
 #endif
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-cardtable.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-pinning.h"
-#include "metadata/sgen-client.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-cardtable.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-memory-governor.h"
+#include "mono/metadata/sgen-pinning.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/utils/mono-membar.h"
 
 /* Enable it so nursery allocation diagnostic data is collected */
 //#define NALLOC_DEBUG 1

diff --git a/mono/metadata/sgen-pinning-stats.c b/mono/metadata/sgen-pinning-stats.c
index c505fc6a3c9ce382e10bb506b6d2b64610eaf824..e6ecd57c5b00fcb6e72eadcc563f38a862dfaf62 100644 (file)
--- a/mono/metadata/sgen-pinning-stats.c
+++ b/mono/metadata/sgen-pinning-stats.c
@@ -26,11 +26,11 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-pinning.h"
-#include "metadata/sgen-hash-table.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-pinning.h"
+#include "mono/metadata/sgen-hash-table.h"
 #include "mono/metadata/sgen-client.h"
 
 typedef struct _PinStatAddress PinStatAddress;

diff --git a/mono/metadata/sgen-pinning.c b/mono/metadata/sgen-pinning.c
index 00c197aa56f4a870e371eb5fbba44fafe0e100ca..a963c4739f2bee690ebd58cb6a14cebbb4560e69 100644 (file)
--- a/mono/metadata/sgen-pinning.c
+++ b/mono/metadata/sgen-pinning.c
@@ -22,13 +22,13 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-pinning.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-pointer-queue.h"
-#include "metadata/sgen-client.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-pinning.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-pointer-queue.h"
+#include "mono/metadata/sgen-client.h"
 
 static SgenPointerQueue pin_queue;
 static size_t last_num_pinned = 0;

diff --git a/mono/metadata/sgen-pinning.h b/mono/metadata/sgen-pinning.h
index 82e61da7c94ac64c034e4d02aac38503004aace7..2342fe490ffc9978f96e9724ca9a1f4eb45be97e 100644 (file)
--- a/mono/metadata/sgen-pinning.h
+++ b/mono/metadata/sgen-pinning.h
@@ -20,7 +20,7 @@
 #ifndef __MONO_SGEN_PINNING_H__
 #define __MONO_SGEN_PINNING_H__
 
-#include "metadata/sgen-pointer-queue.h"
+#include "mono/metadata/sgen-pointer-queue.h"
 
 enum {
        PIN_TYPE_STACK,

diff --git a/mono/metadata/sgen-pointer-queue.c b/mono/metadata/sgen-pointer-queue.c
index 6f1f5f710590c5470edecd43ff250a978df8ba57..f2de588757c1a0d0061cc1fadb1bb5d7adecbc42 100644 (file)
--- a/mono/metadata/sgen-pointer-queue.c
+++ b/mono/metadata/sgen-pointer-queue.c
@@ -17,13 +17,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-pointer-queue.h"
-
 #ifdef HAVE_SGEN_GC
 
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-pointer-queue.h"
+
 void
 sgen_pointer_queue_clear (SgenPointerQueue *queue)
 {

diff --git a/mono/metadata/sgen-protocol.c b/mono/metadata/sgen-protocol.c
index aa31b4bae629ef19e1881be67f41829e5c0f1204..1b55b8890f46692cee1dd699794ee776f03f0529 100644 (file)
--- a/mono/metadata/sgen-protocol.c
+++ b/mono/metadata/sgen-protocol.c
@@ -29,6 +29,7 @@
 #include "sgen-memory-governor.h"
 #include "sgen-thread-pool.h"
 #include "sgen-client.h"
+#include "mono/utils/mono-membar.h"
 
 #include <errno.h>
 #include <string.h>

diff --git a/mono/metadata/sgen-simple-nursery.c b/mono/metadata/sgen-simple-nursery.c
index a69e5abc6c7e5da205f85da437401b05ee0d7d0b..86ab9c389dda87d9a871ca12b9ea9e5c58939ee4 100644 (file)
--- a/mono/metadata/sgen-simple-nursery.c
+++ b/mono/metadata/sgen-simple-nursery.c
@@ -23,12 +23,12 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-layout-stats.h"
-#include "metadata/sgen-client.h"
 #include <string.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-layout-stats.h"
+#include "mono/metadata/sgen-client.h"
 
 static inline char*
 alloc_for_promotion (GCVTable *vtable, char *obj, size_t objsize, gboolean has_references)

diff --git a/mono/metadata/sgen-split-nursery.c b/mono/metadata/sgen-split-nursery.c
index 00269baa3fb8378e5990f0a722eb8df937c22108..72f935613356609d77892037ca7ff8fafe08f21a 100644 (file)
--- a/mono/metadata/sgen-split-nursery.c
+++ b/mono/metadata/sgen-split-nursery.c
@@ -26,14 +26,14 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-layout-stats.h"
-#include "metadata/sgen-client.h"
-#include "utils/mono-memory-model.h"
 #include <string.h>
 #include <stdlib.h>
 
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
+#include "mono/metadata/sgen-layout-stats.h"
+#include "mono/metadata/sgen-client.h"
+#include "mono/utils/mono-memory-model.h"
 
 /*
 The nursery is logically divided into 3 spaces: Allocator space and two Survivor spaces.

diff --git a/mono/metadata/sgen-workers.c b/mono/metadata/sgen-workers.c
index 7d1a0935141863aba4c9e9ed3c31336fd372be3a..41ee858459316b6ef3a5e7a252a0fbaf8572e247 100644 (file)
--- a/mono/metadata/sgen-workers.c
+++ b/mono/metadata/sgen-workers.c
@@ -22,13 +22,11 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-workers.h"
-#include "metadata/sgen-thread-pool.h"
-#include "utils/mono-counters.h"
-#include "metadata/sgen-client.h"
-#include <string.h>
-
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-workers.h"
+#include "mono/metadata/sgen-thread-pool.h"
+#include "mono/utils/mono-counters.h"
+#include "mono/metadata/sgen-client.h"
 
 static int workers_num;
 static WorkerData *workers_data;