| Index: runtime/platform/thread_macos.cc
|
| diff --git a/runtime/platform/thread_macos.cc b/runtime/platform/thread_macos.cc
|
| index 29e571915796fbe7072df5b38fb897d37d9bf491..f2afdebd9b12e49fb507210decb75c8969563c05 100644
|
| --- a/runtime/platform/thread_macos.cc
|
| +++ b/runtime/platform/thread_macos.cc
|
| @@ -10,7 +10,7 @@
|
|
|
| namespace dart {
|
|
|
| -#define VALIDATE_PTHREAD_RESULT(result) \
|
| +#define VALIDATE_PTHREAD_RESULT(result) \
|
| if (result != 0) { \
|
| FATAL2("pthread error: %d (%s)", result, strerror(result)); \
|
| }
|
| @@ -19,18 +19,15 @@ namespace dart {
|
| class ThreadStartData {
|
| public:
|
| ThreadStartData(Thread::ThreadStartFunction function,
|
| - uword parameter,
|
| - Thread* thread)
|
| - : function_(function), parameter_(parameter), thread_(thread) {}
|
| + uword parameter)
|
| + : function_(function), parameter_(parameter) {}
|
|
|
| Thread::ThreadStartFunction function() const { return function_; }
|
| uword parameter() const { return parameter_; }
|
| - Thread* thread() const { return thread_; }
|
|
|
| private:
|
| Thread::ThreadStartFunction function_;
|
| uword parameter_;
|
| - Thread* thread_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ThreadStartData);
|
| };
|
| @@ -44,20 +41,16 @@ static void* ThreadStart(void* data_ptr) {
|
|
|
| Thread::ThreadStartFunction function = data->function();
|
| uword parameter = data->parameter();
|
| - Thread* thread = data->thread();
|
| delete data;
|
|
|
| // Call the supplied thread start function handing it its parameters.
|
| function(parameter);
|
|
|
| - // When the function returns here, make sure that the thread is deleted.
|
| - delete thread;
|
| -
|
| return NULL;
|
| }
|
|
|
|
|
| -Thread::Thread(ThreadStartFunction function, uword parameter) {
|
| +void Thread::Start(ThreadStartFunction function, uword parameter) {
|
| pthread_attr_t attr;
|
| int result = pthread_attr_init(&attr);
|
| VALIDATE_PTHREAD_RESULT(result);
|
| @@ -68,26 +61,17 @@ Thread::Thread(ThreadStartFunction function, uword parameter) {
|
| result = pthread_attr_setstacksize(&attr, 128 * KB);
|
| VALIDATE_PTHREAD_RESULT(result);
|
|
|
| - ThreadStartData* data = new ThreadStartData(function, parameter, this);
|
| + ThreadStartData* data = new ThreadStartData(function, parameter);
|
|
|
| pthread_t tid;
|
| - result = pthread_create(&tid,
|
| - &attr,
|
| - ThreadStart,
|
| - data);
|
| + result = pthread_create(&tid, &attr, ThreadStart, data);
|
| VALIDATE_PTHREAD_RESULT(result);
|
|
|
| - data_.tid_ = tid;
|
| -
|
| result = pthread_attr_destroy(&attr);
|
| VALIDATE_PTHREAD_RESULT(result);
|
| }
|
|
|
|
|
| -Thread::~Thread() {
|
| -}
|
| -
|
| -
|
| Mutex::Mutex() {
|
| pthread_mutexattr_t attr;
|
| int result = pthread_mutexattr_init(&attr);
|
|
|