ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc thread started/ended/aborted aligment

This commit is contained in:
raven02 2014-06-21 12:29:17 +08:00
parent 12f217aba9
commit c3960b7f43
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/GS/RSXThread.cpp
View File

@ -1863,7 +1863,7 @@ void RSXThread::End()
void RSXThread::Task() void RSXThread::Task()
{ {
u8 inc; u8 inc;
ConLog.Write("RSX thread enter"); ConLog.Write("RSX thread started");
OnInitThread(); OnInitThread();
@ -1953,7 +1953,7 @@ void RSXThread::Task()
//memset(Memory.GetMemFromAddr(p.m_ioAddress + get), 0, (count + 1) * 4); //memset(Memory.GetMemFromAddr(p.m_ioAddress + get), 0, (count + 1) * 4);
} }
ConLog.Write("RSX thread exit"); ConLog.Write("RSX thread ended");
OnExitThread(); OnExitThread();
} }

22
rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
View File

@ -36,7 +36,7 @@ next:
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("adecRawRead() aborted"); ConLog.Warning("adecRawRead(): aborted");
return 0; return 0;
} }
Sleep(1); Sleep(1);
@ -53,7 +53,7 @@ next:
{ {
if (!Memory.CopyToReal(buf, adec.reader.addr, adec.reader.size)) if (!Memory.CopyToReal(buf, adec.reader.addr, adec.reader.size))
{ {
ConLog.Error("adecRawRead: data reading failed (reader.size=0x%x)", adec.reader.size); ConLog.Error("adecRawRead(): data reading failed (reader.size=0x%x)", adec.reader.size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -89,7 +89,7 @@ next:
} }
else if (!Memory.CopyToReal(buf, adec.reader.addr, buf_size)) else if (!Memory.CopyToReal(buf, adec.reader.addr, buf_size))
{ {
ConLog.Error("adecRawRead: data reading failed (buf_size=0x%x)", buf_size); ConLog.Error("adecRawRead(): data reading failed (buf_size=0x%x)", buf_size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -111,7 +111,7 @@ int adecRead(void* opaque, u8* buf, int buf_size)
{ {
if (buf_size < (int)adec.reader.rem_size) if (buf_size < (int)adec.reader.rem_size)
{ {
ConLog.Error("adecRead: too small buf_size (rem_size = %d, buf_size = %d)", adec.reader.rem_size, buf_size); ConLog.Error("adecRead(): too small buf_size (rem_size = %d, buf_size = %d)", adec.reader.rem_size, buf_size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -131,7 +131,7 @@ int adecRead(void* opaque, u8* buf, int buf_size)
if (adecRawRead(opaque, header, 8) < 8) break; if (adecRawRead(opaque, header, 8) < 8) break;
if (header[0] != 0x0f || header[1] != 0xd0) if (header[0] != 0x0f || header[1] != 0xd0)
{ {
ConLog.Error("adecRead: 0x0FD0 header not found"); ConLog.Error("adecRead(): 0x0FD0 header not found");
Emu.Pause(); Emu.Pause();
return -1; return -1;
} }
@ -141,7 +141,7 @@ int adecRead(void* opaque, u8* buf, int buf_size)
OMAHeader oma(1 /* atrac3p id */, header[2], header[3]); OMAHeader oma(1 /* atrac3p id */, header[2], header[3]);
if (buf_size < sizeof(oma) + 8) if (buf_size < sizeof(oma) + 8)
{ {
ConLog.Error("adecRead: OMAHeader writing failed"); ConLog.Error("adecRead(): OMAHeader writing failed");
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -198,7 +198,7 @@ u32 adecOpen(AudioDecoder* data)
thread t("Audio Decoder[" + std::to_string(adec_id) + "] Thread", [&]() thread t("Audio Decoder[" + std::to_string(adec_id) + "] Thread", [&]()
{ {
ConLog.Write("Audio Decoder enter()"); ConLog.Write("Audio Decoder thread started");
AdecTask& task = adec.task; AdecTask& task = adec.task;
@ -371,7 +371,7 @@ u32 adecOpen(AudioDecoder* data)
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("adecDecodeAu aborted"); ConLog.Warning("adecDecodeAu: aborted");
return; return;
} }
@ -497,16 +497,16 @@ u32 adecOpen(AudioDecoder* data)
case adecClose: case adecClose:
{ {
adec.is_finished = true; adec.is_finished = true;
ConLog.Write("Audio Decoder exit"); ConLog.Write("Audio Decoder thread ended");
return; return;
} }
default: default:
ConLog.Error("Audio Decoder error: unknown task(%d)", task.type); ConLog.Error("Audio Decoder thread error: unknown task(%d)", task.type);
} }
} }
adec.is_finished = true; adec.is_finished = true;
ConLog.Warning("Audio Decoder aborted"); ConLog.Warning("Audio Decoder thread aborted");
}); });
t.detach(); t.detach();

16
rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
View File

@ -50,11 +50,11 @@ int cellAudioInit()
if (do_dump && !m_dump.Init()) if (do_dump && !m_dump.Init())
{ {
ConLog.Error("Audio aborted: AudioDumper::Init() failed"); ConLog.Error("cellAudioInit(): AudioDumper::Init() failed");
return; return;
} }
ConLog.Write("Audio started"); ConLog.Write("Audio thread started");
if (Ini.AudioDumpToFile.GetValue()) if (Ini.AudioDumpToFile.GetValue())
m_dump.WriteHeader(); m_dump.WriteHeader();
@ -146,7 +146,7 @@ int cellAudioInit()
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("Audio aborted"); ConLog.Warning("Audio thread aborted");
goto abort; goto abort;
} }
@ -426,7 +426,7 @@ int cellAudioInit()
{ {
if (m_dump.WriteData(&buf8ch, sizeof(buf8ch)) != sizeof(buf8ch)) // write file data if (m_dump.WriteData(&buf8ch, sizeof(buf8ch)) != sizeof(buf8ch)) // write file data
{ {
ConLog.Error("Audio aborted: AudioDumper::WriteData() failed"); ConLog.Error("cellAudioInit(): AudioDumper::WriteData() failed");
goto abort; goto abort;
} }
} }
@ -434,13 +434,13 @@ int cellAudioInit()
{ {
if (m_dump.WriteData(&buf2ch, sizeof(buf2ch)) != sizeof(buf2ch)) // write file data if (m_dump.WriteData(&buf2ch, sizeof(buf2ch)) != sizeof(buf2ch)) // write file data
{ {
ConLog.Error("Audio aborted: AudioDumper::WriteData() failed"); ConLog.Error("cellAudioInit(): AudioDumper::WriteData() failed");
goto abort; goto abort;
} }
} }
else else
{ {
ConLog.Error("Audio aborted: unknown AudioDumper::GetCh() value (%d)", m_dump.GetCh()); ConLog.Error("cellAudioInit(): unknown AudioDumper::GetCh() value (%d)", m_dump.GetCh());
goto abort; goto abort;
} }
} }
@ -448,7 +448,7 @@ int cellAudioInit()
//ConLog.Write("Audio perf: start=%d (access=%d, AddData=%d, events=%d, dump=%d)", //ConLog.Write("Audio perf: start=%d (access=%d, AddData=%d, events=%d, dump=%d)",
//stamp0 - m_config.start_time, stamp1 - stamp0, stamp2 - stamp1, stamp3 - stamp2, get_system_time() - stamp3); //stamp0 - m_config.start_time, stamp1 - stamp0, stamp2 - stamp1, stamp3 - stamp2, get_system_time() - stamp3);
} }
ConLog.Write("Audio finished"); ConLog.Write("Audio thread ended");
abort: abort:
queue.Push(nullptr); queue.Push(nullptr);
queue_float.Push(nullptr); queue_float.Push(nullptr);
@ -505,7 +505,7 @@ int cellAudioQuit()
Sleep(1); Sleep(1);
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("cellAudioQuit() aborted"); ConLog.Warning("cellAudioQuit(): aborted");
return CELL_OK; return CELL_OK;
} }
} }

8
rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
View File

@ -47,7 +47,7 @@ u32 dmuxOpen(Demuxer* data)
thread t("Demuxer[" + std::to_string(dmux_id) + "] Thread", [&]() thread t("Demuxer[" + std::to_string(dmux_id) + "] Thread", [&]()
{ {
ConLog.Write("Demuxer enter (mem=0x%x, size=0x%x, cb=0x%x, arg=0x%x)", dmux.memAddr, dmux.memSize, dmux.cbFunc, dmux.cbArg); ConLog.Write("Demuxer thread started (mem=0x%x, size=0x%x, cb=0x%x, arg=0x%x)", dmux.memAddr, dmux.memSize, dmux.cbFunc, dmux.cbArg);
DemuxerTask task; DemuxerTask task;
DemuxerStream stream; DemuxerStream stream;
@ -357,7 +357,7 @@ u32 dmuxOpen(Demuxer* data)
case dmuxClose: case dmuxClose:
{ {
dmux.is_finished = true; dmux.is_finished = true;
ConLog.Write("Demuxer exit"); ConLog.Write("Demuxer thread ended");
return; return;
} }
@ -450,11 +450,11 @@ u32 dmuxOpen(Demuxer* data)
break; break;
default: default:
ConLog.Error("Demuxer error: unknown task(%d)", task.type); ConLog.Error("Demuxer thread error: unknown task(%d)", task.type);
return; return;
} }
} }
ConLog.Warning("Demuxer aborted"); ConLog.Warning("Demuxer thread aborted");
}); });
t.detach(); t.detach();

16
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View File

@ -35,7 +35,7 @@ next:
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("vdecRead() aborted"); ConLog.Warning("vdecRead(): aborted");
return 0; return 0;
} }
Sleep(1); Sleep(1);
@ -52,7 +52,7 @@ next:
{ {
if (!Memory.CopyToReal(buf, vdec.reader.addr, vdec.reader.size)) if (!Memory.CopyToReal(buf, vdec.reader.addr, vdec.reader.size))
{ {
ConLog.Error("vdecRead: data reading failed (reader.size=0x%x)", vdec.reader.size); ConLog.Error("vdecRead(): data reading failed (reader.size=0x%x)", vdec.reader.size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -92,7 +92,7 @@ next:
} }
else if (!Memory.CopyToReal(buf, vdec.reader.addr, buf_size)) else if (!Memory.CopyToReal(buf, vdec.reader.addr, buf_size))
{ {
ConLog.Error("vdecRead: data reading failed (buf_size=0x%x)", buf_size); ConLog.Error("vdecRead(): data reading failed (buf_size=0x%x)", buf_size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -136,7 +136,7 @@ u32 vdecOpen(VideoDecoder* data)
thread t("Video Decoder[" + std::to_string(vdec_id) + "] Thread", [&]() thread t("Video Decoder[" + std::to_string(vdec_id) + "] Thread", [&]()
{ {
ConLog.Write("Video Decoder enter()"); ConLog.Write("Video Decoder thread started");
VdecTask& task = vdec.task; VdecTask& task = vdec.task;
@ -305,7 +305,7 @@ u32 vdecOpen(VideoDecoder* data)
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("vdecDecodeAu aborted"); ConLog.Warning("vdecDecodeAu: aborted");
return; return;
} }
@ -398,7 +398,7 @@ u32 vdecOpen(VideoDecoder* data)
case vdecClose: case vdecClose:
{ {
vdec.is_finished = true; vdec.is_finished = true;
ConLog.Write("Video Decoder exit"); ConLog.Write("Video Decoder thread ended");
return; return;
} }
@ -409,12 +409,12 @@ u32 vdecOpen(VideoDecoder* data)
break; break;
default: default:
ConLog.Error("Video Decoder error: unknown task(%d)", task.type); ConLog.Error("Video Decoder thread error: unknown task(%d)", task.type);
} }
} }
vdec.is_finished = true; vdec.is_finished = true;
ConLog.Warning("Video Decoder aborted"); ConLog.Warning("Video Decoder thread aborted");
}); });
t.detach(); t.detach();