diff options
| author | Rickard Green <[email protected]> | 2012-11-12 14:11:47 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-11-12 14:11:47 +0100 |
| commit | 8510507b00b51da4be335faea40116684a380f9a (patch) | |
| tree | 233194b976773b6ffceeada15cb8e95a631ceee8 /erts/emulator/beam/erl_process.h | |
| parent | a665a0fbebee3a62ba465cc94d93f06413381ae8 (diff) | |
| parent | 135fdb3b1804089c5170c5995a9dae653a28f927 (diff) | |
| download | otp-8510507b00b51da4be335faea40116684a380f9a.tar.gz otp-8510507b00b51da4be335faea40116684a380f9a.tar.bz2 otp-8510507b00b51da4be335faea40116684a380f9a.zip | |
Merge branch 'maint'
* maint:
ssl: Adopt test case to not take so long
Fix bug in erts_port_task_schedule()
Use reduction limit in order to determine when to do wakeup
Conflicts:
erts/emulator/beam/erl_port_task.c
erts/emulator/beam/erl_process.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 fa6961e8a4..e789c873fb 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -478,6 +478,7 @@ typedef struct { #endif #ifdef ERTS_SMP struct { + Uint64 next; int *sched2jix; int jix; ErtsDelayedAuxWorkWakeupJob *job; @@ -520,6 +521,7 @@ struct ErtsSchedulerData_ { ErtsSchedAllocData alloc_data; + Uint64 reductions; ErtsSchedWallTime sched_wall_time; #ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC |