aboutsummaryrefslogtreecommitdiffstats
path: root/testing/blender/0003-increase-thread-stack-size-for-musl.patch
blob: 5f3ddbf38ba81799983543fda3d70dfb5ef2dd2d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From aa586696787091ee851c2dc00f76d2b159683c84 Mon Sep 17 00:00:00 2001
From: Damian Kurek <starfire24680@gmail.com>
Date: Sun, 22 Nov 2020 02:03:11 +0100
Subject: [PATCH 3/3] increase thread stack size for musl

---
 intern/cycles/util/util_thread.cpp | 4 ++--
 intern/cycles/util/util_thread.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp
index cccde5a..4bf62d5 100644
--- a/intern/cycles/util/util_thread.cpp
+++ b/intern/cycles/util/util_thread.cpp
@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
 
 thread::thread(function<void()> 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/util_thread.h b/intern/cycles/util/util_thread.h
index 29f9bec..58a63ce 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -56,7 +56,7 @@ class thread {
 
  protected:
   function<void()> run_cb_;
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__MUSL__)
   pthread_t pthread_id;
 #else
   std::thread std_thread;
-- 
2.29.2