diff options
| author | Rickard Green <[email protected]> | 2016-08-31 14:29:56 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-31 14:29:56 +0200 |
| commit | 74fecb1c89c9f3149dc0e42b2a4a19827a28370f (patch) | |
| tree | 878cc36923f6fd7cee7d5cc8475021610a5617e3 /erts/include/internal/erl_misc_utils.h | |
| parent | bfe6427fa5ec615e73fc0aad2c5760370d786b19 (diff) | |
| parent | 451eb69edbe6c1b2ed53bcac18babda57e5f964c (diff) | |
| download | otp-74fecb1c89c9f3149dc0e42b2a4a19827a28370f.tar.gz otp-74fecb1c89c9f3149dc0e42b2a4a19827a28370f.tar.bz2 otp-74fecb1c89c9f3149dc0e42b2a4a19827a28370f.zip | |
Merge branch 'maint'
* maint:
Improve accuracy of timeouts using premature timeouts
Diffstat (limited to 'erts/include/internal/erl_misc_utils.h')
| -rw-r--r-- | erts/include/internal/erl_misc_utils.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/erts/include/internal/erl_misc_utils.h b/erts/include/internal/erl_misc_utils.h index a4a5d1d510..55566ddf74 100644 --- a/erts/include/internal/erl_misc_utils.h +++ b/erts/include/internal/erl_misc_utils.h @@ -56,4 +56,33 @@ int erts_map_win_error_to_errno(DWORD win_error); int erts_get_last_win_errno(void); #endif +#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__) +#define __DARWIN__ 1 +#endif + +/* + * ERTS_PREMATURE_TIMEOUT() expects time units + * 1000 (millisec), 1000000 (microsec), or + * 1000000000 (nanosec). Might not work properly + * otherwise. + */ +#undef ERTS_USE_PREMATURE_TIMEOUT +#undef ERTS_PREMATURE_TIMEOUT + +#if defined(__DARWIN__) +#define ERTS_USE_PREMATURE_TIMEOUT 1 +#define ERTS_PREMATURE_TIMEOUT(TMO, TU) \ + ((TMO) >= 1 * ((TU) / 1000) \ + ? ((TMO) >= 20 * ((TU) / 1000) \ + ? 15 * ((TU) / 1000) \ + : ((TMO) >= 5 * ((TU) / 1000) \ + ? 3 * ((TU) / 1000) \ + : 5 * ((TU) / 10000))) \ + : 0) + +#else +#define ERTS_USE_PREMATURE_TIMEOUT 0 +#define ERTS_PREMATURE_TIMEOUT(TMO, TU) (0) +#endif + #endif /* #ifndef ERL_MISC_UTILS_H_ */ |