* @{
*/
-XBT_PUBLIC int xbt_os_get_numcores(void);
-
/** @brief Thread data type (opaque structure) */
typedef struct xbt_os_thread_ *xbt_os_thread_t;
XBT_PUBLIC xbt_os_thread_t xbt_os_thread_create(const char* name, pvoid_f_pvoid_t start_routine, void* param,
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <cerrno>
-#include <cstring>
-
-#include <utility>
-#include <string>
-
#include <xbt/config.hpp>
#include <xbt/log.h>
#include <xbt/range.hpp>
#include "xbt/log.h"
#include "xbt/xbt_os_thread.h"
+#include <cerrno>
+#include <cstring>
+#include <string>
+#include <thread>
+#include <utility>
+
#ifdef _WIN32
#include <windows.h>
#include <malloc.h>
*/
void SIMIX_context_set_nthreads(int nb_threads) {
if (nb_threads<=0) {
- nb_threads = xbt_os_get_numcores();
- XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
+ nb_threads = std::thread::hardware_concurrency();
+ XBT_INFO("Auto-setting contexts/nthreads to %d", nb_threads);
}
#if !HAVE_THREAD_CONTEXTS
xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing.");
xbt_free(sem);
}
-/** @brief Returns the amount of cores on the current host */
-int xbt_os_get_numcores(void) {
-#ifdef WIN32
- SYSTEM_INFO sysinfo;
- GetSystemInfo(&sysinfo);
- return sysinfo.dwNumberOfProcessors;
-#elif defined(__APPLE__) && defined(__MACH__)
- int nm[2];
- size_t len = 4;
- uint32_t count;
-
- nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
- sysctl(nm, 2, &count, &len, NULL, 0);
-
- if(count < 1) {
- nm[1] = HW_NCPU;
- sysctl(nm, 2, &count, &len, NULL, 0);
- if(count < 1) { count = 1; }
- }
- return count;
-#else
- return sysconf(_SC_NPROCESSORS_ONLN);
-#endif
-}
-
void xbt_os_thread_set_extra_data(void *data)
{
xbt_os_thread_self()->extra_data = data;