diff options
| author | Erlang/OTP <[email protected]> | 2017-01-12 15:16:02 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-01-12 15:16:02 +0100 |
| commit | 905e6ea8c21e8bcba0933a147ef70f7044e6bead (patch) | |
| tree | 341bb2f6a854b22d3c94f64a9a8c93ee9a4564cf /erts/emulator/beam/index.c | |
| parent | 3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f (diff) | |
| parent | af5169d85fcd545e3c857a219db081a62f33404d (diff) | |
| download | otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.tar.gz otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.tar.bz2 otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.zip | |
Merge branch 'sverker/make-export-fun-race/OTP-14144' into maint-19
* sverker/make-export-fun-race/OTP-14144:
erts: Fix race bug between export fun creation and code loading
Diffstat (limited to 'erts/emulator/beam/index.c')
| -rw-r--r-- | erts/emulator/beam/index.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c index c86a2122f6..cd834e2c12 100644 --- a/erts/emulator/beam/index.c +++ b/erts/emulator/beam/index.c @@ -91,9 +91,16 @@ index_put_entry(IndexTable* t, void* tmpl) t->seg_table[ix>>INDEX_PAGE_SHIFT] = erts_alloc(t->type, sz); t->size += INDEX_PAGE_SIZE; } - t->entries++; p->index = ix; t->seg_table[ix>>INDEX_PAGE_SHIFT][ix&INDEX_PAGE_MASK] = p; + + /* + * Do a write barrier here to allow readers to do lock free iteration. + * erts_index_num_entries() does matching read barrier. + */ + ERTS_SMP_WRITE_MEMORY_BARRIER; + t->entries++; + return p; } |