From d701e5d8bad42d509c7258e6ac984a4b933cb42c Mon Sep 17 00:00:00 2001 From: Damian Kurek Date: Fri, 3 Dec 2021 17:55:35 +0000 Subject: [PATCH 3/4] increase thread stack size for musl --- intern/cycles/util/thread.cpp | 4 ++-- intern/cycles/util/thread.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp index 24a0600..e70fc4d 100644 --- a/intern/cycles/util/thread.cpp +++ b/intern/cycles/util/thread.cpp @@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN thread::thread(function run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node) { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__MUSL__) /* Set the stack size to 2MB to match Linux. The default 512KB on macOS is * too small for Embree, and consistent stack size also makes things more * predictable in general. */ @@ -56,7 +56,7 @@ void *thread::run(void *arg) bool thread::join() { joined_ = true; -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__MUSL__) return pthread_join(pthread_id, NULL) == 0; #else try { diff --git a/intern/cycles/util/thread.h b/intern/cycles/util/thread.h index 09686e4..b585fde 100644 --- a/intern/cycles/util/thread.h +++ b/intern/cycles/util/thread.h @@ -56,7 +56,7 @@ class thread { protected: function run_cb_; -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__MUSL__) pthread_t pthread_id; #else std::thread std_thread; -- 2.34.1