mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Henrik RydgårdandClaude Opus 5.5
9e69c1f9aa
Replaces the temporary fix that did the hidden modes' IO inside Update. The IO thread read and wrote the dialog's request, display state and save list, all shared with the emulator thread, which kept using them to draw the dialog and reload the request from the game. Now the IO thread works on its own copy of the request, its own SavedataParam and directory names resolved up front, and shares nothing else with the emulator thread but the (locked) file system, MemoryStick_FreeSpace's cached use and sceChnnlsv's scratch buffer and kirk state, the last two now under locks too. It still reads and writes the game's buffers directly, like a PSP's utility threads and sceIoReadAsync do, so a savestate waits for it before it saves or loads memory. Save bookkeeping, the save indicator and display changes happen on the emulator thread when the results are taken, and only the request fields the IO changed are copied back, so a game's own edits in the meantime survive. Hidden modes take the results at the next Update (or, with Host IO timing, the first Update that finds them done). The visible dialogs keep drawing and take them once the IO is done; save and load used to stall the emulator thread for the whole operation. Savestates keep results that haven't been taken yet. When the results land in PSP memory doesn't matter to games, so utility/savedata/filelist now only prints them once the utility has finished. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
132 lines
3.4 KiB
C++
132 lines
3.4 KiB
C++
// Copyright (c) 2012- PPSSPP Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official git repository and contact information can be found at
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
#pragma once
|
|
|
|
#include <atomic>
|
|
#include <string>
|
|
#include <thread>
|
|
#include <mutex>
|
|
|
|
#include "Core/Dialog/PSPDialog.h"
|
|
#include "Core/Dialog/SavedataParam.h"
|
|
|
|
class PSPSaveDialog : public PSPDialog {
|
|
public:
|
|
PSPSaveDialog(UtilityDialogType type);
|
|
~PSPSaveDialog();
|
|
|
|
int Init(int paramAddr);
|
|
int Update(int animSpeed) override;
|
|
int Shutdown(bool force = false) override;
|
|
void DoState(PointerWrap &p) override;
|
|
pspUtilityDialogCommon *GetCommonParam() override;
|
|
// Waits for the IO thread, if any, to be done with PSP memory. Its results are still taken as usual.
|
|
void WaitForIO();
|
|
|
|
protected:
|
|
bool UseAutoStatus() override {
|
|
return false;
|
|
}
|
|
|
|
private:
|
|
void DisplayBanner(int which);
|
|
void DisplaySaveList(bool canMove = true);
|
|
void DisplaySaveIcon(bool checkExists);
|
|
void DisplaySaveDataInfo1();
|
|
void DisplaySaveDataInfo2(bool showNewData = false);
|
|
void DisplayMessage(std::string_view text, bool hasYesNo = false);
|
|
std::string GetSelectedSaveDirName() const;
|
|
|
|
void StartIOThread();
|
|
bool FinishIO(bool wait);
|
|
void ExecuteIOAction();
|
|
void ExecuteNotVisibleIOAction();
|
|
|
|
enum DisplayState {
|
|
DS_NONE,
|
|
|
|
DS_SAVE_LIST_CHOICE,
|
|
DS_SAVE_CONFIRM,
|
|
DS_SAVE_CONFIRM_OVERWRITE,
|
|
DS_SAVE_SAVING,
|
|
DS_SAVE_DONE,
|
|
|
|
DS_LOAD_LIST_CHOICE,
|
|
DS_LOAD_CONFIRM,
|
|
DS_LOAD_LOADING,
|
|
DS_LOAD_DONE,
|
|
DS_LOAD_NODATA,
|
|
|
|
DS_DELETE_LIST_CHOICE,
|
|
DS_DELETE_CONFIRM,
|
|
DS_DELETE_DELETING,
|
|
DS_DELETE_DONE,
|
|
DS_DELETE_NODATA,
|
|
|
|
DS_SAVE_FAILED,
|
|
DS_LOAD_FAILED,
|
|
DS_DELETE_FAILED,
|
|
};
|
|
|
|
enum DialogBanner {
|
|
DB_NONE,
|
|
DB_SAVE,
|
|
DB_LOAD,
|
|
DB_DELETE
|
|
};
|
|
|
|
DisplayState display = DS_NONE;
|
|
|
|
SavedataParam param;
|
|
SceUtilitySavedataParam request{};
|
|
// For detecting changes made by the game.
|
|
SceUtilitySavedataParam originalRequest{};
|
|
u32 requestAddr = 0;
|
|
int currentSelectedSave = 0;
|
|
|
|
enum SaveIOStatus {
|
|
SAVEIO_NONE,
|
|
SAVEIO_PENDING,
|
|
// Finished, and the results taken.
|
|
SAVEIO_DONE,
|
|
// Finished, but the request changes and bookkeeping haven't been taken yet.
|
|
SAVEIO_READY,
|
|
};
|
|
|
|
std::thread ioThread;
|
|
std::mutex paramLock;
|
|
std::atomic<SaveIOStatus> ioThreadStatus{ SAVEIO_NONE };
|
|
|
|
// The IO thread uses these instead of the dialog's own state (it writes its results to PSP
|
|
// memory directly). StartIOThread sets them up and FinishIO takes the results back, both on the
|
|
// emulator thread.
|
|
DisplayState ioAction_ = DS_NONE;
|
|
DisplayState ioDisplay_ = DS_NONE;
|
|
SceUtilitySavedataParam ioRequest_{};
|
|
// The request when the IO started, to tell what the IO changed.
|
|
SceUtilitySavedataParam ioRequestStart_{};
|
|
SavedataParam ioParam_;
|
|
int ioSaveId_ = 0;
|
|
std::string ioSaveDirName_;
|
|
std::string ioListSaveDirName_;
|
|
std::string ioDeleteDir_;
|
|
};
|
|
|
|
void ResetSecondsSinceLastGameSave();
|
|
double SecondsSinceLastGameSave();
|