Skip to content

Lock (codegen_lock) during typedef to prevent concurrency violation. #33776

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

Closed
wants to merge 3 commits into from
Closed

Lock (codegen_lock) during typedef to prevent concurrency violation. #33776

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40304b5
Lock (`codegen_lock`) during typedef to prevent concurrency violation.
NHDaly Nov 1, 2019
3c3e600
Fix my mistake: move the UNLOCK to the same scope as LOCK
NHDaly Nov 7, 2019
0830f8a
Change the interpreter locks to use "new" `toplevel_lock`, which just…
NHDaly Nov 7, 2019
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
13 changes: 13 additions & 0 deletions src/interpreter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ int jl_is_toplevel_only_expr(jl_value_t *e);

// type definition forms

// TODO: separate the codegen and toplevel locks
// currently using a coarser lock seems like
// the best way to avoid acquisition priority
// ordering violations
//static jl_mutex_t toplevel_lock;
#define toplevel_lock codegen_lock

extern int inside_typedef;

// this is a heuristic for allowing "redefining" a type to something identical
Expand Down Expand Up @@ -128,6 +135,7 @@ SECT_INTERP void jl_set_datatype_super(jl_datatype_t *tt, jl_value_t *super)
static void eval_abstracttype(jl_expr_t *ex, interpreter_state *s)
{
jl_value_t **args = jl_array_ptr_data(ex->args);
JL_LOCK(&toplevel_lock);
if (inside_typedef)
jl_error("cannot eval a new abstract type definition while defining another type");
jl_value_t *name = args[0];
Expand Down Expand Up @@ -167,11 +175,13 @@ static void eval_abstracttype(jl_expr_t *ex, interpreter_state *s)
jl_checked_assignment(b, w);
}
JL_GC_POP();
JL_UNLOCK(&toplevel_lock);
}

static void eval_primitivetype(jl_expr_t *ex, interpreter_state *s)
{
jl_value_t **args = (jl_value_t**)jl_array_ptr_data(ex->args);
JL_LOCK(&toplevel_lock);
if (inside_typedef)
jl_error("cannot eval a new primitive type definition while defining another type");
jl_value_t *name = args[0];
Expand Down Expand Up @@ -218,11 +228,13 @@ static void eval_primitivetype(jl_expr_t *ex, interpreter_state *s)
jl_checked_assignment(b, w);
}
JL_GC_POP();
JL_UNLOCK(&toplevel_lock);
}

static void eval_structtype(jl_expr_t *ex, interpreter_state *s)
{
jl_value_t **args = jl_array_ptr_data(ex->args);
JL_LOCK(&toplevel_lock);
if (inside_typedef)
jl_error("cannot eval a new struct type definition while defining another type");
jl_value_t *name = args[0];
Expand Down Expand Up @@ -282,6 +294,7 @@ static void eval_structtype(jl_expr_t *ex, interpreter_state *s)
}

JL_GC_POP();
JL_UNLOCK(&toplevel_lock);
}

// method definition form
Expand Down