Merge branch 'sverk/threadsafe-code-loading'

* sverk/threadsafe-code-loading: (59 commits)
  erts: Fix assert failure when code_server exits "during" commit
  erts: Fix memory leak in code loading
  erts: Adapt gdb etp-command for new beam_ranges
  erts: Set correct default tracing when loading code
  erts: Fix faulty assert in non-smp debug vm
  erts: Use correct macro for "yield-return"
  erts: Refactor code loading with renaming
  erts: Seize code_ix lock when updating trace settings
  erts: Switch order between code_ix lock and thread blocking
  erts: Fix race bug in finish_after_on_load
  erts: Refactor export staging lock
  erts: Activate staged code in a thread safe way
  erts: Suspend processes waiting for code_ix lock
  erts: Fix compiler warning in inet_drv
  erts: Fix single threaded fallback in new BIF finish_loading_1
  erts: Fix type bug
  Break apart erlang:load_module/2 into two separate BIFs
  Use magic binaries in erts_prepare_loading() and erts_finish_loading()
  erts: Cleanup non-blocking load
  erts: Fix memory query for non-blocking module table
  ...

OTP-9974

1 files changed, 54 insertions, 10 deletions

diff --git a/erts/emulator/beam/module.h b/erts/emulator/beam/module.h
index 694e4ab72f..6e123a0ffe 100644
--- a/erts/emulator/beam/module.h
+++ b/erts/emulator/beam/module.h
@@ -24,28 +24,72 @@
 #include "index.h"
 #endif
 
+struct erl_module_instance {
+    BeamInstr* code;
+    int code_length;		/* Length of loaded code in bytes. */
+    unsigned catches;
+    struct erl_module_nif* nif;
+    int num_breakpoints;
+    int num_traced_exports;
+};
 
 typedef struct erl_module {
     IndexSlot slot;		/* Must be located at top of struct! */
     int module;			/* Atom index for module (not tagged). */
 
-    BeamInstr* code;
-    BeamInstr* old_code;
-    int code_length;		/* Length of loaded code in bytes. */
-    int old_code_length;	/* Length of old loaded code in bytes */
-    unsigned catches, old_catches;
-    struct erl_module_nif* nif;
-    struct erl_module_nif* old_nif;
+    struct erl_module_instance curr;
+    struct erl_module_instance old; /* protected by "old_code" rwlock */
 } Module; 
 
-Module* erts_get_module(Eterm mod);
+Module* erts_get_module(Eterm mod, ErtsCodeIndex code_ix);
 Module* erts_put_module(Eterm mod);
 
 void init_module_table(void);
+void module_start_staging(void);
+void module_end_staging(int commit);
 void module_info(int, void *);
 
-Module *module_code(int);
-int module_code_size(void);
+Module *module_code(int, ErtsCodeIndex);
+int module_code_size(ErtsCodeIndex);
 int module_table_sz(void);
 
+ERTS_GLB_INLINE void erts_rwlock_old_code(ErtsCodeIndex);
+ERTS_GLB_INLINE void erts_rwunlock_old_code(ErtsCodeIndex);
+ERTS_GLB_INLINE void erts_rlock_old_code(ErtsCodeIndex);
+ERTS_GLB_INLINE void erts_runlock_old_code(ErtsCodeIndex);
+#ifdef ERTS_ENABLE_LOCK_CHECK
+int erts_is_old_code_rlocked(ErtsCodeIndex);
+#endif
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+extern erts_smp_rwmtx_t the_old_code_rwlocks[ERTS_NUM_CODE_IX];
+
+ERTS_GLB_INLINE void erts_rwlock_old_code(ErtsCodeIndex code_ix)
+{
+    erts_smp_rwmtx_rwlock(&the_old_code_rwlocks[code_ix]);
+}
+ERTS_GLB_INLINE void erts_rwunlock_old_code(ErtsCodeIndex code_ix)
+{
+    erts_smp_rwmtx_rwunlock(&the_old_code_rwlocks[code_ix]);
+}
+ERTS_GLB_INLINE void erts_rlock_old_code(ErtsCodeIndex code_ix)
+{
+    erts_smp_rwmtx_rlock(&the_old_code_rwlocks[code_ix]);
+}
+ERTS_GLB_INLINE void erts_runlock_old_code(ErtsCodeIndex code_ix)
+{
+    erts_smp_rwmtx_runlock(&the_old_code_rwlocks[code_ix]);
+}
+
+#ifdef ERTS_ENABLE_LOCK_CHECK
+ERTS_GLB_INLINE int erts_is_old_code_rlocked(ErtsCodeIndex code_ix)
+{
+    return erts_smp_lc_rwmtx_is_rlocked(&the_old_code_rwlocks[code_ix]);
+}
 #endif
+
+#endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+
+#endif /* !__MODULE_H__ */