X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=thread.cpp;fp=thread.cpp;h=473c71a82110821745ce176b8d4259c77375d66a;hp=72bc320b0b32359dcbbe51352b2df8ca77850a45;hb=a0fe013448d188b324c00383cfd91695d9d3d076;hpb=26fe3ab755034ea3be8321ec0af548670f8c3bd8 diff --git a/thread.cpp b/thread.cpp index 72bc320..473c71a 100644 --- a/thread.cpp +++ b/thread.cpp @@ -14,9 +14,9 @@ Thread::~Thread() {} void Thread::run() { - pthread_mutex_init(&should_stop_mutex, NULL); + pthread_mutex_init(&should_stop_mutex, nullptr); should_stop_status = false; - pthread_create(&worker_thread, NULL, &Thread::do_work_thunk, this); + pthread_create(&worker_thread, nullptr, &Thread::do_work_thunk, this); } void Thread::stop() @@ -26,7 +26,7 @@ void Thread::stop() should_stop_status = true; } wakeup(); - if (pthread_join(worker_thread, NULL) == -1) { + if (pthread_join(worker_thread, nullptr) == -1) { log_perror("pthread_join"); exit(1); } @@ -42,7 +42,7 @@ void *Thread::do_work_thunk(void *arg) sigset_t set; sigemptyset(&set); sigaddset(&set, SIGHUP); - int err = pthread_sigmask(SIG_BLOCK, &set, NULL); + int err = pthread_sigmask(SIG_BLOCK, &set, nullptr); if (err != 0) { errno = err; log_perror("pthread_sigmask"); @@ -61,7 +61,7 @@ void *Thread::do_work_thunk(void *arg) // Call the right thunk. thread->do_work(); - return NULL; + return nullptr; } bool Thread::wait_for_activity(int fd, short events, const struct timespec *timeout_ts)