mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-27 19:40:05 +00:00
623b0621ab
* common/thread: Remove unused functions Many of these functions are carried over from Dolphin (where they aren't used anymore). Given these have no use (and we really shouldn't be screwing around with OS-specific thread scheduler handling from the emulator, these can be removed. The function for setting the thread name is left, however, since it can have debugging utility usages. * input_common/sdl: Use a type alias to shorten declaration of GetPollers Just makes the definitions a little bit more tidy. * input_common/sdl: Correct return values within implementations of GetPollers() In both cases, we weren't actually returning anything, which is undefined behavior. * yuzu/debugger/graphics_surface: Fill in missing surface format listings Fills in the missing surface types that were marked as unknown. The order corresponds with the TextureFormat enum within video_core/texture.h. We also don't need to all of these strings as translatable (only the first string, as it's an English word). * yuzu/debugger/graphics_surface: Clean up connection overload deduction We can utilize qOverload with the signal connections to make the function deducing a little less ugly. * yuzu/debugger/graphics_surface: Tidy up SaveSurface - Use QStringLiteral where applicable. - Use const where applicable - Remove unnecessary precondition check (we already assert the pixbuf being non null) * yuzu/debugger/graphics_surface: Display error messages for file I/O errors * core: Add missing override specifiers where applicable Applies the override specifier where applicable. In the case of destructors that are defaulted in their definition, they can simply be removed. This also removes the unnecessary inclusions being done in audin_u and audrec_u, given their close proximity. * kernel/thread: Make parameter of GetWaitObjectIndex() const qualified The pointed to member is never actually modified, so it can be made const. * kernel/thread: Avoid sign conversion within GetCommandBufferAddress() Previously this was performing a u64 + int sign conversion. When dealing with addresses, we should generally be keeping the arithmetic in the same signedness type. This also gets rid of the static lifetime of the constant, as there's no need to make a trivial type like this potentially live for the entire duration of the program. * kernel/codeset: Make CodeSet's memory data member a regular std::vector The use of a shared_ptr is an implementation detail of the VMManager itself when mapping memory. Because of that, we shouldn't require all users of the CodeSet to have to allocate the shared_ptr ahead of time. It's intended that CodeSet simply pass in the required direct data, and that the memory manager takes care of it from that point on. This means we just do the shared pointer allocation in a single place, when loading modules, as opposed to in each loader. * kernel/wait_object: Make ShouldWait() take thread members by pointer-to-const Given this is intended as a querying function, it doesn't make sense to allow the implementer to modify the state of the given thread.
109 lines
2.7 KiB
C++
109 lines
2.7 KiB
C++
// Copyright 2015 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include "common/common_types.h"
|
|
#include "core/core_timing.h"
|
|
#include "core/hle/kernel/object.h"
|
|
#include "core/hle/kernel/wait_object.h"
|
|
|
|
namespace Core {
|
|
class Timing;
|
|
}
|
|
|
|
namespace Kernel {
|
|
|
|
class TimerManager {
|
|
public:
|
|
TimerManager(Core::Timing& timing);
|
|
|
|
private:
|
|
/// The timer callback event, called when a timer is fired
|
|
void TimerCallback(u64 callback_id, s64 cycles_late);
|
|
|
|
Core::Timing& timing;
|
|
|
|
/// The event type of the generic timer callback event
|
|
Core::TimingEventType* timer_callback_event_type = nullptr;
|
|
|
|
u64 next_timer_callback_id = 0;
|
|
std::unordered_map<u64, Timer*> timer_callback_table;
|
|
|
|
friend class Timer;
|
|
friend class KernelSystem;
|
|
};
|
|
|
|
class Timer final : public WaitObject {
|
|
public:
|
|
explicit Timer(KernelSystem& kernel);
|
|
~Timer() override;
|
|
|
|
std::string GetTypeName() const override {
|
|
return "Timer";
|
|
}
|
|
std::string GetName() const override {
|
|
return name;
|
|
}
|
|
|
|
static constexpr HandleType HANDLE_TYPE = HandleType::Timer;
|
|
HandleType GetHandleType() const override {
|
|
return HANDLE_TYPE;
|
|
}
|
|
|
|
ResetType GetResetType() const {
|
|
return reset_type;
|
|
}
|
|
|
|
u64 GetInitialDelay() const {
|
|
return initial_delay;
|
|
}
|
|
|
|
u64 GetIntervalDelay() const {
|
|
return interval_delay;
|
|
}
|
|
|
|
bool ShouldWait(const Thread* thread) const override;
|
|
void Acquire(Thread* thread) override;
|
|
|
|
void WakeupAllWaitingThreads() override;
|
|
|
|
/**
|
|
* Starts the timer, with the specified initial delay and interval.
|
|
* @param initial Delay until the timer is first fired
|
|
* @param interval Delay until the timer is fired after the first time
|
|
*/
|
|
void Set(s64 initial, s64 interval);
|
|
|
|
void Cancel();
|
|
void Clear();
|
|
|
|
/**
|
|
* Signals the timer, waking up any waiting threads and rescheduling it
|
|
* for the next interval.
|
|
* This method should not be called from outside the timer callback handler,
|
|
* lest multiple callback events get scheduled.
|
|
*/
|
|
void Signal(s64 cycles_late);
|
|
|
|
private:
|
|
ResetType reset_type; ///< The ResetType of this timer
|
|
|
|
u64 initial_delay; ///< The delay until the timer fires for the first time
|
|
u64 interval_delay; ///< The delay until the timer fires after the first time
|
|
|
|
bool signaled; ///< Whether the timer has been signaled or not
|
|
std::string name; ///< Name of timer (optional)
|
|
|
|
/// ID used as userdata to reference this object when inserting into the CoreTiming queue.
|
|
u64 callback_id;
|
|
|
|
KernelSystem& kernel;
|
|
TimerManager& timer_manager;
|
|
|
|
friend class KernelSystem;
|
|
};
|
|
|
|
} // namespace Kernel
|