- ThreadData* data = new ThreadData(*this, i);
- this->workers[i] = xbt_os_thread_create(worker_main, data);
- xbt_os_thread_bind(this->workers[i], core_bind);
+ this->workers[i] = new std::thread(worker_main, new ThreadData(*this, i));
+
+ /* Bind the worker to a core if possible */
+#if HAVE_PTHREAD_SETAFFINITY
+#if HAVE_PTHREAD_NP_H /* FreeBSD ? */
+ cpuset_t cpuset;
+ size_t size = sizeof(cpuset_t);
+#else /* Linux ? */
+ cpu_set_t cpuset;
+ size_t size = sizeof(cpu_set_t);
+#endif
+ pthread_t pthread = this->workers[i]->native_handle();
+ CPU_ZERO(&cpuset);
+ CPU_SET(core_bind, &cpuset);
+ pthread_setaffinity_np(pthread, size, &cpuset);