diff options
| author | Rickard Green <[email protected]> | 2016-11-23 14:24:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-11-23 14:24:11 +0100 |
| commit | 8d56324cbf72726e955946b9f774f8f1f1004467 (patch) | |
| tree | 5e764a0b2232f7d0d34e60cfd63958532ec63b84 /erts/emulator/beam/erl_process.h | |
| parent | 7c3bdf14220b500308a14f71aa91139dece2d731 (diff) | |
| parent | 8fade0888ff75fafb2abb512cfb97bcb5472fec1 (diff) | |
| download | otp-8d56324cbf72726e955946b9f774f8f1f1004467.tar.gz otp-8d56324cbf72726e955946b9f774f8f1f1004467.tar.bz2 otp-8d56324cbf72726e955946b9f774f8f1f1004467.zip | |
Merge branch 'maint'
* maint:
Update etp-commands for dirty schedulers
Fix scheduling of system tasks on processes executing dirty
Fix call time tracing with dirty schedulers
Fix send of exit signal to process executing dirty
Fix dirty scheduler process priority
Fix alloc-util hard-debug
Silence debug warning when no beam jump table is used with dirty schedulers
Fix check_process_code() when NifExport is in use
Fix GC when NifExport is in use
Fix saving of original arguments when rescheduling via NifExport
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_nif.c
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 4d0093d0d8..1c4b9f149d 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -107,6 +107,7 @@ extern int erts_eager_check_io; extern int erts_sched_compact_load; extern int erts_sched_balance_util; extern Uint erts_no_schedulers; +extern Uint erts_no_total_schedulers; #ifdef ERTS_DIRTY_SCHEDULERS extern Uint erts_no_dirty_cpu_schedulers; extern Uint erts_no_dirty_io_schedulers; @@ -1583,6 +1584,7 @@ Uint64 erts_step_proc_interval(void); int erts_setup_nif_gc(Process* proc, Eterm** objv, int* nobj); /* see erl_nif.c */ void erts_destroy_nif_export(void *); /* see erl_nif.c */ +int erts_check_nif_export_in_area(Process *p, char *start, Uint size); ErtsProcList *erts_proclist_create(Process *); ErtsProcList *erts_proclist_copy(ErtsProcList *); |