Skip to content

Commit 4cf267b

Browse files
committed
Match mono code conventions
1 parent 633d4e7 commit 4cf267b

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

mono/metadata/boehm-gc.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ mono_gc_base_init (void)
239239

240240
opt = strchr (opt, '=') + 1;
241241
if (*opt && mono_gc_parse_environment_string_extract_number (opt, &time_limit)) {
242-
GC_enable_incremental();
242+
GC_enable_incremental ();
243243
#if HAVE_BDWGC_GC
244244
if (time_limit != 0)
245245
// value is in milliseconds
246-
GC_set_time_limit(time_limit);
246+
GC_set_time_limit (time_limit);
247247
#endif
248248
}
249249
continue;
@@ -647,7 +647,7 @@ mono_gc_weak_link_add (void **link_addr, MonoObject *obj, gboolean track)
647647
{
648648
/* libgc requires that we use HIDE_POINTER... */
649649
*link_addr = (void*)HIDE_POINTER (obj);
650-
GC_dirty(link_addr);
650+
GC_dirty (link_addr);
651651
if (track)
652652
GC_REGISTER_LONG_LINK (link_addr, obj);
653653
else
@@ -892,48 +892,48 @@ void
892892
mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
893893
{
894894
*(void**)field_ptr = value;
895-
GC_dirty(field_ptr);
895+
GC_dirty (field_ptr);
896896
}
897897

898898
void
899899
mono_gc_wbarrier_set_arrayref (MonoArray *arr, gpointer slot_ptr, MonoObject* value)
900900
{
901901
*(void**)slot_ptr = value;
902-
GC_dirty(slot_ptr);
902+
GC_dirty (slot_ptr);
903903
}
904904

905905
void
906906
mono_gc_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count)
907907
{
908908
mono_gc_memmove_aligned (dest_ptr, src_ptr, count * sizeof (gpointer));
909-
GC_dirty(dest_ptr);
909+
GC_dirty (dest_ptr);
910910
}
911911

912912
void
913913
mono_gc_wbarrier_generic_store (gpointer ptr, MonoObject* value)
914914
{
915915
*(void**)ptr = value;
916-
GC_dirty(ptr);
916+
GC_dirty (ptr);
917917
}
918918

919919
void
920920
mono_gc_wbarrier_generic_store_atomic (gpointer ptr, MonoObject *value)
921921
{
922922
mono_atomic_store_ptr ((volatile gpointer *)ptr, value);
923-
GC_dirty(ptr);
923+
GC_dirty (ptr);
924924
}
925925

926926
void
927927
mono_gc_wbarrier_generic_nostore (gpointer ptr)
928928
{
929-
GC_dirty(ptr);
929+
GC_dirty (ptr);
930930
}
931931

932932
void
933933
mono_gc_wbarrier_value_copy (gpointer dest, gpointer src, int count, MonoClass *klass)
934934
{
935935
mono_gc_memmove_atomic (dest, src, count * mono_class_value_size (klass, NULL));
936-
GC_dirty(dest);
936+
GC_dirty (dest);
937937
}
938938

939939
void
@@ -942,7 +942,7 @@ mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src)
942942
/* do not copy the sync state */
943943
mono_gc_memmove_aligned ((char*)obj + sizeof (MonoObject), (char*)src + sizeof (MonoObject),
944944
mono_object_class (obj)->instance_size - sizeof (MonoObject));
945-
GC_dirty(obj);
945+
GC_dirty (obj);
946946
}
947947

948948
void
@@ -1495,7 +1495,7 @@ gboolean
14951495
mono_gc_is_moving (void)
14961496
{
14971497
#if HAVE_BDWGC_GC
1498-
return GC_is_incremental_mode();
1498+
return GC_is_incremental_mode ();
14991499
#else
15001500
return FALSE;
15011501
#endif
@@ -1513,8 +1513,8 @@ mono_gc_is_disabled (void)
15131513
void
15141514
mono_gc_wbarrier_range_copy (gpointer _dest, gpointer _src, int size)
15151515
{
1516-
memcpy(_dest, _src, size);
1517-
GC_dirty(_dest);
1516+
memcpy (_dest, _src, size);
1517+
GC_dirty (_dest);
15181518
}
15191519

15201520
void*
@@ -1875,7 +1875,7 @@ handle_data_grow (HandleData *handles, gboolean track)
18751875
gpointer *entries;
18761876
entries = (void **)mono_gc_alloc_fixed (sizeof (*handles->entries) * new_size, NULL, MONO_ROOT_SOURCE_GC_HANDLE, NULL, "GC Handle Table (Boehm)");
18771877
mono_gc_memmove_aligned (entries, handles->entries, sizeof (*handles->entries) * handles->size);
1878-
GC_dirty(entries);
1878+
GC_dirty (entries);
18791879
mono_gc_free_fixed (handles->entries);
18801880
handles->entries = entries;
18811881
}
@@ -1908,7 +1908,7 @@ alloc_handle (HandleData *handles, MonoObject *obj, gboolean track)
19081908
mono_gc_weak_link_add (&(handles->entries [slot]), obj, track);
19091909
} else {
19101910
handles->entries [slot] = obj;
1911-
GC_dirty(handles->entries + slot);
1911+
GC_dirty (handles->entries + slot);
19121912
}
19131913

19141914
#ifndef DISABLE_PERFCOUNTERS
@@ -2026,7 +2026,7 @@ mono_gchandle_set_target (guint32 gchandle, MonoObject *obj)
20262026
handles->domain_ids [slot] = (obj ? mono_object_get_domain (obj) : mono_domain_get ())->domain_id;
20272027
} else {
20282028
handles->entries [slot] = obj;
2029-
GC_dirty(handles->entries + slot);
2029+
GC_dirty (handles->entries + slot);
20302030
}
20312031
} else {
20322032
/* print a warning? */
@@ -2105,7 +2105,7 @@ mono_gchandle_free (guint32 gchandle)
21052105
mono_gc_weak_link_remove (&handles->entries [slot], handles->type == HANDLE_WEAK_TRACK);
21062106
} else {
21072107
handles->entries [slot] = NULL;
2108-
GC_dirty(handles->entries + slot);
2108+
GC_dirty (handles->entries + slot);
21092109
}
21102110
vacate_slot (handles, slot);
21112111
} else {
@@ -2148,7 +2148,7 @@ mono_gchandle_free_domain (MonoDomain *domain)
21482148
if (handles->entries [slot] && mono_object_domain (handles->entries [slot]) == domain) {
21492149
vacate_slot (handles, slot);
21502150
handles->entries [slot] = NULL;
2151-
GC_dirty(handles->entries + slot);
2151+
GC_dirty (handles->entries + slot);
21522152
}
21532153
}
21542154
}

mono/metadata/object.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,7 +2087,7 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *klass, MonoErro
20872087
/* This is not needed by sgen, as it does not seem
20882088
+ to need write barriers for uncollectable objects (like the vtables storing static
20892089
+ fields), but it is needed for incremental boehm. */
2090-
mono_gc_wbarrier_generic_nostore(t);
2090+
mono_gc_wbarrier_generic_nostore (t);
20912091
}
20922092
continue;
20932093
}
@@ -3302,7 +3302,7 @@ mono_field_static_set_value (MonoVTable *vt, MonoClassField *field, void *value)
33023302
to need write barriers for uncollectable objects (like the vtables storing static
33033303
+ fields), but it is needed for incremental boehm. */
33043304
if (field->offset == -1)
3305-
mono_gc_wbarrier_generic_nostore(dest);
3305+
mono_gc_wbarrier_generic_nostore (dest);
33063306
}
33073307

33083308
/**

0 commit comments

Comments
 (0)