mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-27 06:48:49 +00:00
8d0b4657e7
Thread::quit was created before the pthread_create_helper in pthread.cpp that automagically calls pthread_exit from all pthreads after the user's thread function exits. It is unused, and unecessary now. Cleanup some logging, and make join return a Result<T, ThreadError>. This also adds a new type, LibThread::ThreadError as an AK::DistinctNumeric. Hopefully, this will make it possible to have a Result<int, ThreadError> and have it compile? It also makes it clear that the int there is an error at the call site. By default, the T on join is void, meaning the caller doesn't care about the return value from the thread. As Result is a [[nodiscard]] type, also change the current caller of join to explicitly ignore it. Move the logging out of join as well, as it's the user's responsibility whether to log or not.
68 lines
2.5 KiB
C++
68 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <LibThread/Thread.h>
|
|
#include <pthread.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
LibThread::Thread::Thread(Function<int()> action, StringView thread_name)
|
|
: Core::Object(nullptr)
|
|
, m_action(move(action))
|
|
, m_thread_name(thread_name.is_null() ? "" : thread_name)
|
|
{
|
|
register_property("thread_name", [&] { return JsonValue { m_thread_name }; });
|
|
register_property("tid", [&] { return JsonValue { m_tid }; });
|
|
}
|
|
|
|
LibThread::Thread::~Thread()
|
|
{
|
|
if (m_tid) {
|
|
dbgln("Destroying thread \"{}\"({}) while it is still running!", m_thread_name, m_tid);
|
|
[[maybe_unused]] auto res = join();
|
|
}
|
|
}
|
|
|
|
void LibThread::Thread::start()
|
|
{
|
|
int rc = pthread_create(
|
|
&m_tid,
|
|
nullptr,
|
|
[](void* arg) -> void* {
|
|
Thread* self = static_cast<Thread*>(arg);
|
|
int exit_code = self->m_action();
|
|
self->m_tid = 0;
|
|
return (void*)exit_code;
|
|
},
|
|
static_cast<void*>(this));
|
|
|
|
ASSERT(rc == 0);
|
|
if (!m_thread_name.is_empty()) {
|
|
rc = pthread_setname_np(m_tid, m_thread_name.characters());
|
|
ASSERT(rc == 0);
|
|
}
|
|
dbgln("Started thread \"{}\", tid = {}", m_thread_name, m_tid);
|
|
}
|