Skip to content

Make gc params work for Boehm #1013

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
merged 1 commit into from
Aug 16, 2018
Merged

Make gc params work for Boehm #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions mono/metadata/boehm-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ void
mono_gc_base_init (void)
{
char *env;
char *params_opts = NULL;
char *debug_opts = NULL;

if (gc_initialized)
return;
Expand Down Expand Up @@ -189,19 +191,21 @@ mono_gc_base_init (void)
/* If GC_no_dls is set to true, GC_find_limit is not called. This causes a seg fault on Android With Mono's Older Boehm. */
GC_no_dls = TRUE;
#endif

debug_opts = mono_gc_debug_get();
if (debug_opts)
{
if ((env = g_getenv ("MONO_GC_DEBUG"))) {
char **opts = g_strsplit (env, ",", -1);
for (char **ptr = opts; ptr && *ptr; ptr ++) {
char *opt = *ptr;
if (!strcmp (opt, "do-not-finalize")) {
mono_do_not_finalize = 1;
} else if (!strcmp (opt, "log-finalizers")) {
log_finalizers = 1;
}
char **opts = g_strsplit (debug_opts, ",", -1);
for (char **ptr = opts; ptr && *ptr; ptr ++) {
char *opt = *ptr;
if (!strcmp (opt, "do-not-finalize")) {
mono_do_not_finalize = 1;
} else if (!strcmp (opt, "log-finalizers")) {
log_finalizers = 1;
}
g_free (env);
}
g_strfreev (opts);
g_free (debug_opts);
}

GC_init ();
Expand All @@ -213,10 +217,12 @@ mono_gc_base_init (void)
GC_init_gcj_malloc (5, NULL);
GC_allow_register_threads ();

if ((env = g_getenv ("MONO_GC_PARAMS"))) {
char **ptr, **opts = g_strsplit (env, ",", -1);
params_opts = mono_gc_params_get();
if (params_opts) {
char **ptr, **opts = g_strsplit (params_opts, ",", -1);
for (ptr = opts; *ptr; ++ptr) {
char *opt = *ptr;

if (g_str_has_prefix (opt, "max-heap-size=")) {
size_t max_heap;

Expand Down Expand Up @@ -260,8 +266,8 @@ mono_gc_base_init (void)
*/
}
}
g_free (env);
g_strfreev (opts);
g_free (params_opts);
}

mono_thread_callbacks_init ();
Expand Down Expand Up @@ -763,6 +769,10 @@ mono_gc_alloc_obj (MonoVTable *vtable, size_t size)
{
MonoObject *obj;

if (strcmp(vtable->klass->name, "RuntimeTestInfo") == 0)
{
printf("hello");
}
if (!vtable->klass->has_references) {
obj = (MonoObject *)GC_MALLOC_ATOMIC (size);
if (G_UNLIKELY (!obj))
Expand Down Expand Up @@ -1579,16 +1589,6 @@ mono_gc_get_logfile (void)
return NULL;
}

void
mono_gc_params_set (const char* options)
{
}

void
mono_gc_debug_set (const char* options)
{
}

void
mono_gc_conservatively_scan_area (void *start, void *end)
{
Expand Down
48 changes: 48 additions & 0 deletions mono/metadata/gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ static MonoCoopCond pending_done_cond;
static MonoCoopMutex pending_done_mutex;
#endif

static char* gc_params_options;
static char* gc_debug_options;

#define MONO_GC_PARAMS_NAME "MONO_GC_PARAMS"
#define MONO_GC_DEBUG_NAME "MONO_GC_DEBUG"

static void object_register_finalizer (MonoObject *obj, void (*callback)(void *, void*));

static void reference_queue_proccess_all (void);
Expand Down Expand Up @@ -161,6 +167,48 @@ coop_cond_timedwait_alertable (MonoCoopCond *cond, MonoCoopMutex *mutex, guint32
return res;
}

void
mono_gc_params_set (const char* options)
{
if (gc_params_options)
g_free (gc_params_options);

gc_params_options = g_strdup (options);
}

char *
mono_gc_params_get ()
{
char *env;
if ((env = g_getenv (MONO_GC_PARAMS_NAME)) || gc_params_options) {
char *params_opts = g_strdup_printf ("%s,%s", gc_params_options ? gc_params_options : "", env ? env : "");
g_free (env);
return params_opts;
}
return NULL;
}

void
mono_gc_debug_set (const char* options)
{
if (gc_debug_options)
g_free (gc_debug_options);

gc_debug_options = g_strdup (options);
}

char *
mono_gc_debug_get ()
{
char *env;
if ((env = g_getenv (MONO_GC_DEBUG_NAME)) || gc_debug_options) {
char *debug_opts = g_strdup_printf ("%s,%s", gc_debug_options ? gc_debug_options : "", env ? env : "");
g_free (env);
return debug_opts;
}
return NULL;
}

/*
* actually, we might want to queue the finalize requests in a separate thread,
* but we need to be careful about the execution domain of the thread...
Expand Down
10 changes: 0 additions & 10 deletions mono/metadata/null-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,16 +458,6 @@ mono_gc_get_logfile (void)
return NULL;
}

void
mono_gc_params_set (const char* options)
{
}

void
mono_gc_debug_set (const char* options)
{
}

void
mono_gc_conservatively_scan_area (void *start, void *end)
{
Expand Down
2 changes: 2 additions & 0 deletions mono/sgen/gc-internal-agnostic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ FILE *mono_gc_get_logfile (void);

/* equivalent to options set via MONO_GC_PARAMS */
void mono_gc_params_set (const char* options);
char* mono_gc_params_get();
/* equivalent to options set via MONO_GC_DEBUG */
void mono_gc_debug_set (const char* options);
char *mono_gc_debug_get();

#endif
32 changes: 2 additions & 30 deletions mono/sgen/sgen-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,6 @@ static SGEN_TV_DECLARE (time_major_conc_collection_end);

int gc_debug_level = 0;
FILE* gc_debug_file;
static char* gc_params_options;
static char* gc_debug_options;

/*
void
Expand Down Expand Up @@ -1022,24 +1020,6 @@ mono_gc_get_logfile (void)
return gc_debug_file;
}

void
mono_gc_params_set (const char* options)
{
if (gc_params_options)
g_free (gc_params_options);

gc_params_options = g_strdup (options);
}

void
mono_gc_debug_set (const char* options)
{
if (gc_debug_options)
g_free (gc_debug_options);

gc_debug_options = g_strdup (options);
}

static void
scan_finalizer_entries (SgenPointerQueue *fin_queue, ScanCopyContext ctx)
{
Expand Down Expand Up @@ -3326,11 +3306,7 @@ sgen_gc_init (void)

mono_coop_mutex_init (&sgen_interruption_mutex);

if ((env = g_getenv (MONO_GC_PARAMS_NAME)) || gc_params_options) {
params_opts = g_strdup_printf ("%s,%s", gc_params_options ? gc_params_options : "", env ? env : "");
g_free (env);
}

params_opts = mono_gc_params_get();
if (params_opts) {
opts = g_strsplit (params_opts, ",", -1);
for (ptr = opts; *ptr; ++ptr) {
Expand Down Expand Up @@ -3541,11 +3517,7 @@ sgen_gc_init (void)
sgen_pinning_init ();
sgen_cement_init (cement_enabled);

if ((env = g_getenv (MONO_GC_DEBUG_NAME)) || gc_debug_options) {
debug_opts = g_strdup_printf ("%s,%s", gc_debug_options ? gc_debug_options : "", env ? env : "");
g_free (env);
}

debug_opts = mono_gc_debug_get();
if (debug_opts) {
gboolean usage_printed = FALSE;

Expand Down