hle: kernel: Rename ReadableEvent to KReadableEvent.

This commit is contained in:
bunnei 2021-01-29 22:48:06 -08:00
parent b0727c90c5
commit e86a7e3691
42 changed files with 82 additions and 81 deletions

View file

@ -17,13 +17,13 @@
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_scheduler.h"
#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
#include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/object.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/kernel/time_manager.h"
#include "core/hle/kernel/writable_event.h"

View file

@ -41,7 +41,7 @@ class KernelCore;
class Process;
class ServerSession;
class KThread;
class ReadableEvent;
class KReadableEvent;
class WritableEvent;
enum class ThreadWakeupReason;

View file

@ -6,18 +6,18 @@
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_scheduler.h"
#include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/object.h"
#include "core/hle/kernel/readable_event.h"
namespace Kernel {
ReadableEvent::ReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {}
ReadableEvent::~ReadableEvent() = default;
KReadableEvent::KReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {}
KReadableEvent::~KReadableEvent() = default;
void ReadableEvent::Signal() {
void KReadableEvent::Signal() {
if (is_signaled) {
return;
}
@ -26,17 +26,17 @@ void ReadableEvent::Signal() {
NotifyAvailable();
}
bool ReadableEvent::IsSignaled() const {
bool KReadableEvent::IsSignaled() const {
ASSERT(kernel.GlobalSchedulerContext().IsLocked());
return is_signaled;
}
void ReadableEvent::Clear() {
void KReadableEvent::Clear() {
is_signaled = false;
}
ResultCode ReadableEvent::Reset() {
ResultCode KReadableEvent::Reset() {
KScopedSchedulerLock lock(kernel);
if (!is_signaled) {
LOG_TRACE(Kernel, "Handle is not signaled! object_id={}, object_type={}, object_name={}",

View file

@ -14,11 +14,11 @@ namespace Kernel {
class KernelCore;
class WritableEvent;
class ReadableEvent final : public KSynchronizationObject {
class KReadableEvent final : public KSynchronizationObject {
friend class WritableEvent;
public:
~ReadableEvent() override;
~KReadableEvent() override;
std::string GetTypeName() const override {
return "ReadableEvent";
@ -50,7 +50,7 @@ public:
void Finalize() override {}
private:
explicit ReadableEvent(KernelCore& kernel);
explicit KReadableEvent(KernelCore& kernel);
bool is_signaled{};
std::string name; ///< Name of event (optional)

View file

@ -26,6 +26,7 @@
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/k_address_arbiter.h"
#include "core/hle/kernel/k_condition_variable.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_resource_limit.h"
#include "core/hle/kernel/k_scheduler.h"
#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
@ -37,7 +38,6 @@
#include "core/hle/kernel/memory/page_table.h"
#include "core/hle/kernel/physical_core.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/svc.h"
#include "core/hle/kernel/svc_results.h"
@ -1727,7 +1727,7 @@ static ResultCode ResetSignal(Core::System& system, Handle handle) {
const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
auto event = handle_table.Get<ReadableEvent>(handle);
auto event = handle_table.Get<KReadableEvent>(handle);
if (event) {
return event->Reset();
}
@ -1909,7 +1909,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) {
return RESULT_SUCCESS;
}
auto readable_event = handle_table.Get<ReadableEvent>(handle);
auto readable_event = handle_table.Get<KReadableEvent>(handle);
if (readable_event) {
readable_event->Clear();
return RESULT_SUCCESS;

View file

@ -4,10 +4,10 @@
#include <algorithm>
#include "common/assert.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/object.h"
#include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/writable_event.h"
namespace Kernel {
@ -17,7 +17,7 @@ WritableEvent::~WritableEvent() = default;
EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel));
std::shared_ptr<ReadableEvent> readable_event(new ReadableEvent(kernel));
std::shared_ptr<KReadableEvent> readable_event(new KReadableEvent(kernel));
writable_event->name = name + ":Writable";
writable_event->readable = readable_event;
@ -26,7 +26,7 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
return {std::move(readable_event), std::move(writable_event)};
}
std::shared_ptr<ReadableEvent> WritableEvent::GetReadableEvent() const {
std::shared_ptr<KReadableEvent> WritableEvent::GetReadableEvent() const {
return readable;
}

View file

@ -1,4 +1,4 @@
// Copyright 2014 Citra Emulator Project
// Copyright 2021 yuzu Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@ -11,11 +11,11 @@
namespace Kernel {
class KernelCore;
class ReadableEvent;
class KReadableEvent;
class WritableEvent;
struct EventPair {
std::shared_ptr<ReadableEvent> readable;
std::shared_ptr<KReadableEvent> readable;
std::shared_ptr<WritableEvent> writable;
};
@ -42,7 +42,7 @@ public:
return HANDLE_TYPE;
}
std::shared_ptr<ReadableEvent> GetReadableEvent() const;
std::shared_ptr<KReadableEvent> GetReadableEvent() const;
void Signal();
void Clear();
@ -52,7 +52,7 @@ public:
private:
explicit WritableEvent(KernelCore& kernel);
std::shared_ptr<ReadableEvent> readable;
std::shared_ptr<KReadableEvent> readable;
std::string name; ///< Name of event (optional)
};