mirror of
https://github.com/citra-emu/citra-nightly.git
synced 2024-12-25 09:55:30 +00:00
04dd91be82
* Add ZeroMQ external submodule * ZeroMQ libzmq building on macOS * Added RPC namespace, settings and logging * Added request queue handling and new classes * Add C++ interface to ZeroMQ * Added start of ZeroMQ RPC Server implementation. * Request construction and callback request handling * Read and write memory implementation * Add ID to request format and send reply * Add RPC setting to macOS UI * Fixed initialization order bug and added exception handling * Working read-write through Python * Update CMakeLists for libzmq to resolve target name conflict on Windows * Platform-specific CMake definitions for Windows/non-Windows * Add comments * Revert "Add RPC setting to macOS UI" * Always run RPC server instead of configurable * Add Python scripting example. Updated .gitignore * Rename member variables to remove trailing underscore * Finally got libzmq external project building on macOS * Add missing dependency during libzmq build * Adding more missing dependencies [skip ci] * Only build what is required from libzmq * Extra length checks on client input * Call InvalidateCacheRange after memory write * Revert MinGW change. Fix clang-format. Improve error handling in request/reply. Allow any length of data read/write in Python. * Re-organized RPC static global state into a proper class. [skip ci] * Make sure libzmq always builds in Release mode * Renamed Request to Packet since Request and Reply are the same thing * Moved request fulfillment out of Packet and into RPCServer * Change request thread from sleep to condition variable * Remove non-blocking polling from ZMQ server code. Receive now blocks and terminates properly without sleeping. This change significantly improves script speed. * Move scripting files to dist/ instead of src/ * C++ code review changes for jroweboy [skip ci] * Python code review changes for jroweboy [skip ci] * Add docstrings and tests to citra.py [skip ci] * Add host OS check for libzmq build * Revert "Add host OS check for libzmq build" * Fixed a hang when emulation is stopped and restarted due to improper destruction order of ZMQ objects [skip ci] * Add scripting directory to archive packaging [skip ci] * Specify C/CXX compiler variables on MinGW build * Only specify compiler on Linux mingw * Use gcc and g++ on Windows mingw * Specify generator for mingw * Don't specify toolchain on windows mingw * Changed citra.py to support Python 3 instead of Python 2 * Fix bug where RPC wouldn't restart after Stop/Start emulation * Added copyright to headers and reorganized includes and forward declarations
79 lines
1.7 KiB
C++
79 lines
1.7 KiB
C++
// Copyright 2018 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <array>
|
|
#include <functional>
|
|
#include "common/common_types.h"
|
|
|
|
namespace RPC {
|
|
|
|
enum class PacketType {
|
|
Undefined = 0,
|
|
ReadMemory,
|
|
WriteMemory,
|
|
};
|
|
|
|
struct PacketHeader {
|
|
u32 version;
|
|
u32 id;
|
|
PacketType packet_type;
|
|
u32 packet_size;
|
|
};
|
|
|
|
constexpr u32 CURRENT_VERSION = 1;
|
|
constexpr u32 MIN_PACKET_SIZE = sizeof(PacketHeader);
|
|
constexpr u32 MAX_PACKET_DATA_SIZE = 32;
|
|
constexpr u32 MAX_PACKET_SIZE = MIN_PACKET_SIZE + MAX_PACKET_DATA_SIZE;
|
|
constexpr u32 MAX_READ_SIZE = MAX_PACKET_DATA_SIZE;
|
|
|
|
class Packet {
|
|
public:
|
|
Packet(const PacketHeader& header, u8* data, std::function<void(Packet&)> send_reply_callback);
|
|
|
|
u32 GetVersion() const {
|
|
return header.version;
|
|
}
|
|
|
|
u32 GetId() const {
|
|
return header.id;
|
|
}
|
|
|
|
PacketType GetPacketType() const {
|
|
return header.packet_type;
|
|
}
|
|
|
|
u32 GetPacketDataSize() const {
|
|
return header.packet_size;
|
|
}
|
|
|
|
const PacketHeader& GetHeader() const {
|
|
return header;
|
|
}
|
|
|
|
std::array<u8, MAX_PACKET_DATA_SIZE>& GetPacketData() {
|
|
return packet_data;
|
|
}
|
|
|
|
void SetPacketDataSize(u32 size) {
|
|
header.packet_size = size;
|
|
}
|
|
|
|
void SendReply() {
|
|
send_reply_callback(*this);
|
|
}
|
|
|
|
private:
|
|
void HandleReadMemory(u32 address, u32 data_size);
|
|
void HandleWriteMemory(u32 address, const u8* data, u32 data_size);
|
|
|
|
struct PacketHeader header;
|
|
std::array<u8, MAX_PACKET_DATA_SIZE> packet_data;
|
|
|
|
std::function<void(Packet&)> send_reply_callback;
|
|
};
|
|
|
|
} // namespace RPC
|