Skip to content

Commit 2b9618c

Browse files
committed
---
yaml --- r: 30899 b: refs/heads/incoming c: 6bb0399 h: refs/heads/master i: 30897: d5735b4 30895: 4bfddb9 v: v3
1 parent 52c4a78 commit 2b9618c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 42c6265a8c38bbf899b7afbb15fc6de50ab210c5
9+
refs/heads/incoming: 6bb0399df2123a2a87262b0f36ba0e56f1de787b
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/sync/rust_thread.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ rust_thread::start() {
3232
thread = CreateThread(NULL, stack_sz, rust_thread_start, this, 0, NULL);
3333
#else
3434
pthread_attr_t attr;
35-
pthread_attr_init(&attr);
36-
pthread_attr_setstacksize(&attr, stack_sz);
37-
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
38-
pthread_create(&thread, &attr, rust_thread_start, (void *) this);
35+
CHECKED(pthread_attr_init(&attr));
36+
CHECKED(pthread_attr_setstacksize(&attr, stack_sz));
37+
CHECKED(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
38+
CHECKED(pthread_create(&thread, &attr, rust_thread_start, (void *) this));
3939
#endif
4040
}
4141

@@ -46,7 +46,7 @@ rust_thread::join() {
4646
WaitForSingleObject(thread, INFINITE);
4747
#else
4848
if (thread)
49-
pthread_join(thread, NULL);
49+
CHECKED(pthread_join(thread, NULL));
5050
#endif
5151
thread = 0;
5252
}
@@ -56,6 +56,6 @@ rust_thread::detach() {
5656
#if !defined(__WIN32__)
5757
// Don't leak pthread resources.
5858
// http://crosstantine.blogspot.com/2010/01/pthreadcreate-memory-leak.html
59-
pthread_detach(thread);
59+
CHECKED(pthread_detach(thread));
6060
#endif
6161
}

0 commit comments

Comments
 (0)