[sgen] Fix race conditions in worker thread start/stop.

[mono.git] / mono / metadata / sgen-scan-object.h

diff --git a/mono/metadata/sgen-scan-object.h b/mono/metadata/sgen-scan-object.h
index 6c4b62ab30cf73c16dcf1c49221bf9c78780b6de..48490d781e227d7f58179e5b49e8521ad27923ce 100644 (file)
--- a/mono/metadata/sgen-scan-object.h
+++ b/mono/metadata/sgen-scan-object.h
@@ -1,7 +1,32 @@
 /*
+ * Copyright 2001-2003 Ximian, Inc
+ * Copyright 2003-2010 Novell, Inc.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
  * Scans one object, using the OBJ_XXX macros.  The start of the
  * object must be given in the variable "char* start".  Afterwards,
- * "start" will point to the start of the next object.
+ * "start" will point to the start of the next object, if the scanned
+ * object contained references.  If not, the value of "start" should
+ * be considered undefined after executing this code.
  *
  * Modifiers (automatically undefined):
  *
@@ -13,6 +38,9 @@
  * padding at the end) is "skip_size".  "desc" is the object's GC
  * descriptor.  The action can use the macro
  * "SCAN" to scan the object.
+ *
+ * SCAN_OBJECT_NOVTABLE - desc is provided by the includer, instead of
+ * vt.  Complex arrays cannot not be scanned.
  */
 
 #ifndef SCAN_OBJECT_ACTION
@@ -20,95 +48,72 @@
 #endif
 
 {
+#ifndef SCAN_OBJECT_NOVTABLE
        GCVTable *vt;
-       size_t skip_size;
        mword desc;
 
-       vt = (GCVTable*)LOAD_VTABLE (start);
+       vt = (GCVTable*)SGEN_LOAD_VTABLE (start);
        //type = vt->desc & 0x7;
 
        /* gcc should be smart enough to remove the bounds check, but it isn't:( */
        desc = vt->desc;
+#endif
        switch (desc & 0x7) {
-       case DESC_TYPE_STRING:
-               STRING_SIZE (skip_size, start);
-#define SCAN
-               SCAN_OBJECT_ACTION;
-#undef SCAN
-               start += skip_size;
-               break;
        case DESC_TYPE_RUN_LENGTH:
-               OBJ_RUN_LEN_SIZE (skip_size, desc, start);
-               g_assert (skip_size);
 #define SCAN OBJ_RUN_LEN_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
                break;
-       case DESC_TYPE_ARRAY:
-       case DESC_TYPE_VECTOR:
-               skip_size = safe_object_get_size ((MonoObject*)start);
-               skip_size += (ALLOC_ALIGN - 1);
-               skip_size &= ~(ALLOC_ALIGN - 1);
-#define SCAN OBJ_VECTOR_FOREACH_PTR (vt, start)
+       case DESC_TYPE_SMALL_BITMAP:
+#define SCAN OBJ_BITMAP_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
                break;
-       case DESC_TYPE_SMALL_BITMAP:
-               OBJ_BITMAP_SIZE (skip_size, desc, start);
-               g_assert (skip_size);
-#define SCAN OBJ_BITMAP_FOREACH_PTR (desc, start)
+       case DESC_TYPE_VECTOR:
+#define SCAN OBJ_VECTOR_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
                break;
        case DESC_TYPE_LARGE_BITMAP:
-               skip_size = safe_object_get_size ((MonoObject*)start);
-               skip_size += (ALLOC_ALIGN - 1);
-               skip_size &= ~(ALLOC_ALIGN - 1);
-#define SCAN OBJ_LARGE_BITMAP_FOREACH_PTR (vt,start)
+#define SCAN OBJ_LARGE_BITMAP_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
                break;
        case DESC_TYPE_COMPLEX:
                /* this is a complex object */
-               skip_size = safe_object_get_size ((MonoObject*)start);
-               skip_size += (ALLOC_ALIGN - 1);
-               skip_size &= ~(ALLOC_ALIGN - 1);
-#define SCAN OBJ_COMPLEX_FOREACH_PTR (vt, start)
+#define SCAN OBJ_COMPLEX_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
                break;
+#ifndef SCAN_OBJECT_NOVTABLE
        case DESC_TYPE_COMPLEX_ARR:
                /* this is an array of complex structs */
-               skip_size = safe_object_get_size ((MonoObject*)start);
-               skip_size += (ALLOC_ALIGN - 1);
-               skip_size &= ~(ALLOC_ALIGN - 1);
 #define SCAN OBJ_COMPLEX_ARR_FOREACH_PTR (vt, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
                SCAN_OBJECT_ACTION;
 #undef SCAN
-               start += skip_size;
+               break;
+#endif
+       case DESC_TYPE_COMPLEX_PTRFREE:
+               /*Nothing to do*/
+               SCAN_OBJECT_ACTION;
                break;
        default:
                g_assert_not_reached ();
@@ -117,3 +122,4 @@
 
 #undef SCAN_OBJECT_NOSCAN
 #undef SCAN_OBJECT_ACTION
+#undef SCAN_OBJECT_NOVTABLE