Skip to content

[mono] More domain cleanup #50771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vargaz merged 5 commits into from
Apr 7, 2021
Merged

[mono] More domain cleanup #50771

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13bea2c
[mono] Remove appdomains_list variable, it shouldn't be needed.
vargaz Apr 6, 2021
4635bb8
Remove some GC domain code.
vargaz Apr 6, 2021
b3ffc13
Remove domains from sre.c.
vargaz Apr 6, 2021
8c1ea09
Remove domains from the jit info code.
vargaz Apr 6, 2021
ecdfcb1
Remove more domain usage from the JIT code.
vargaz Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[mono] Remove appdomains_list variable, it shouldn't be needed.
  • Loading branch information
@vargaz
vargaz committed Apr 7, 2021
commit 13bea2c57b33d8c4ffac0edaddfdfdccc59eedb3
24 changes: 0 additions & 24 deletions src/mono/mono/metadata/domain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
mono_thread_info_tls_set (info, TLS_KEY_DOMAIN, (x)); \
} while (FALSE)

static MonoDomain **appdomains_list;
static MonoImage *exe_image;
static MonoDomain *mono_root_domain;

Expand Down Expand Up @@ -107,25 +106,6 @@ get_runtimes_from_exe (const char *exe_file, MonoImage **exe_image);
static const MonoRuntimeInfo*
get_runtime_by_version (const char *version);

//g_malloc on sgen and mono_gc_alloc_fixed on boehm
static void*
gc_alloc_fixed_non_heap_list (size_t size)
{
if (mono_gc_is_moving ())
return g_malloc0 (size);
else
return mono_gc_alloc_fixed (size, MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, NULL, "Domain List");
}

static void
gc_free_fixed_non_heap_list (void *ptr)
{
if (mono_gc_is_moving ())
g_free (ptr);
else
mono_gc_free_fixed (ptr);
}

static MonoDomain *
create_root_domain (void)
{
Expand All @@ -148,10 +128,6 @@ create_root_domain (void)

MONO_PROFILER_RAISE (domain_loading, (domain));

// FIXME: why is this needed ?
appdomains_list = (MonoDomain **)gc_alloc_fixed_non_heap_list (sizeof (void*));
appdomains_list [0] = domain;

#ifndef DISABLE_PERFCOUNTERS
mono_atomic_inc_i32 (&mono_perfcounters->loader_appdomains);
mono_atomic_inc_i32 (&mono_perfcounters->loader_total_appdomains);
Expand Down