aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-06-25 19:20:55 +0200
committerSverker Eriksson <[email protected]>2014-06-25 19:20:55 +0200
commit6b7e98ff55dbb80dd45b8e998eca096fa0a44532 (patch)
treebc9d1a2979f3a8d3184352a44c4ad757b3226a85
parent89972a3334635bbcc36ab7c4e7f2365aeef1c82e (diff)
parent6db23381adb9c580e1d03cccf2a8b67c6cc5189b (diff)
downloadotp-6b7e98ff55dbb80dd45b8e998eca096fa0a44532.tar.gz
otp-6b7e98ff55dbb80dd45b8e998eca096fa0a44532.tar.bz2
otp-6b7e98ff55dbb80dd45b8e998eca096fa0a44532.zip
Merge branch 'sverk/ets-wc-lock-alignment/OTP-11974'
* sverk/ets-wc-lock-alignment/OTP-11974: erts: Fix cache alignment for ETS write_concurrency locks
-rw-r--r--erts/emulator/beam/erl_db_hash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_hash.h b/erts/emulator/beam/erl_db_hash.h
index 908cec11d4..e68081a5b1 100644
--- a/erts/emulator/beam/erl_db_hash.h
+++ b/erts/emulator/beam/erl_db_hash.h
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2014. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -42,7 +42,7 @@ typedef struct hash_db_term {
typedef struct db_table_hash_fine_locks {
union {
erts_smp_rwmtx_t lck;
- byte _cache_line_alignment[64];
+ byte _cache_line_alignment[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(erts_smp_rwmtx_t))];
}lck_vec[DB_HASH_LOCK_CNT];
} DbTableHashFineLocks;