Skip to content

Commit a2e118b

Browse files
authored
remove sync(Weave) before exit and allow failure on OSX) (#52)
* remove sync(Weave) before exit and allow failure on OSX) * Disable tlsEmulation
1 parent 6b7b8c3 commit a2e118b

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ matrix:
3939
- ARCH=amd64
4040
- CHANNEL=devel
4141
compiler: clang
42+
allow_failures:
43+
# Also ignore OSX, due to very long build time
44+
# and strange issues: https://github.com/mratsim/weave/issues/51
45+
- os: osx
4246
fast_finish: true
4347

4448
before_install:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Weave, a state-of-the-art multithreading runtime
2-
[![Build Status: Travis](https://img.shields.io/travis/com/mratsim/weave?label=Travis%20%28Linux%2FMac%20-%20x86_64%2FARM64%29)](https://travis-ci.com/mratsim/weave)
2+
[![Build Status: Travis](https://img.shields.io/travis/com/mratsim/weave?label=Travis%20%28Linux%20x86_64%2FARM64%20-%20OSX%20optional%29)](https://travis-ci.com/mratsim/weave)
33
[![Build Status: Azure](https://img.shields.io/azure-devops/build/numforge/69bc2700-4fa7-4292-a0b3-331ddb721640/2?label=Azure%20%28C%2FC%2B%2B%20Linux%2032-bit%2F64-bit%29)](https://dev.azure.com/numforge/Weave/_build?definitionId=2&branchName=master)
44
[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
55
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

weave.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Nim has tlsEmulation enabled on OSX
2+
# instead of using the C compiler TLS.
3+
# This was due to old iOS versions requiring it.
4+
--tlsEmulation:off

weave/config.nim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77

88
import strutils
99

10-
# With C++ we need C++11
10+
# Platform support
1111
# ----------------------------------------------------------------------------------
1212

1313
when defined(cpp):
1414
{.passC:"-std=c++11".}
1515

16+
when defined(tlsEmulation):
17+
{.warning: "TLS Emulation (default on MacOS due to old iOS requiring it) is not supported. Please run Weave tests to ensure some degree of correctness.".}
18+
1619
# Static configuration & compile-time options
1720
# ----------------------------------------------------------------------------------
1821

weave/parallel_tasks.nim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ when isMainModule:
167167
echo "Sanity check 1: Printing 123456 654321 in parallel"
168168

169169
init(Weave)
170-
171170
spawn display_int(123456)
172171
spawn display_int(654321)
173-
174-
sync(Weave)
175172
exit(Weave)
176173

177174
main()
@@ -192,10 +189,7 @@ when isMainModule:
192189
echo "Sanity check 2: fib(20)"
193190

194191
init(Weave)
195-
196192
let f = async_fib(20)
197-
198-
sync(Weave)
199193
exit(Weave)
200194

201195
echo f

0 commit comments

Comments
 (0)