diff options
| author | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
| commit | 4f100fff5844f7af08b1d9be23e990e4a48b27de (patch) | |
| tree | cc3ce0245cfb7d57bc68ec648631ddf3c2329faf /erts/include/internal/erl_misc_utils.h | |
| parent | c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (diff) | |
| parent | d389ff6f96cbd855e95a7455407b6140f1601d0f (diff) | |
| download | otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.gz otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.bz2 otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.zip | |
Merge branch 'rickard/cpu-info/OTP-8765' into dev
* rickard/cpu-info/OTP-8765:
Initialize environment functionality after thread lib
Fix faulty assertions
Implement automatic detection of CPU topology on Windows
Make it possible to reread and update detected CPU information
Diffstat (limited to 'erts/include/internal/erl_misc_utils.h')
| -rw-r--r-- | erts/include/internal/erl_misc_utils.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/include/internal/erl_misc_utils.h b/erts/include/internal/erl_misc_utils.h index 6b875ff824..507e1726f4 100644 --- a/erts/include/internal/erl_misc_utils.h +++ b/erts/include/internal/erl_misc_utils.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2006-2009. All Rights Reserved. + * Copyright Ericsson AB 2006-2010. 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 @@ -34,7 +34,7 @@ typedef struct { erts_cpu_info_t *erts_cpu_info_create(void); void erts_cpu_info_destroy(erts_cpu_info_t *cpuinfo); -void erts_cpu_info_update(erts_cpu_info_t *cpuinfo); +int erts_cpu_info_update(erts_cpu_info_t *cpuinfo); int erts_get_cpu_configured(erts_cpu_info_t *cpuinfo); int erts_get_cpu_online(erts_cpu_info_t *cpuinfo); int erts_get_cpu_available(erts_cpu_info_t *cpuinfo); @@ -51,6 +51,7 @@ int erts_unbind_from_cpu_str(char *str); int erts_milli_sleep(long); #ifdef __WIN32__ +int erts_map_win_error_to_errno(DWORD win_error); int erts_get_last_win_errno(void); #endif |