Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2024-11-26 21:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Failed USB installs timeout properly

Browse source
This commit is contained in:
Huntereb 2019-12-12 20:50:40 -05:00
parent e57442b927
commit 643c65777b
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/install/usb_nsp.cpp
View file

@ -16,6 +16,9 @@
namespace tin::install::nsp namespace tin::install::nsp
{ {
bool stopThreads;
std::string errorMessage;
USBNSP::USBNSP(std::string nspName) : USBNSP::USBNSP(std::string nspName) :
m_nspName(nspName) m_nspName(nspName)
{ {
@ -41,7 +44,7 @@ namespace tin::install::nsp
try try
{ {
while (sizeRemaining) while (sizeRemaining && !tin::install::nsp::stopThreads)
{ {
tmpSizeRead = awoo_usbCommsRead(buf, std::min(sizeRemaining, (u64)0x800000)); tmpSizeRead = awoo_usbCommsRead(buf, std::min(sizeRemaining, (u64)0x800000));
if (tmpSizeRead == 0) THROW_FORMAT("USB transfer timed out or failed"); if (tmpSizeRead == 0) THROW_FORMAT("USB transfer timed out or failed");
@ -58,8 +61,8 @@ namespace tin::install::nsp
} }
catch (std::exception& e) catch (std::exception& e)
{ {
free(buf); tin::install::nsp::stopThreads = true;
THROW_FORMAT(e.what()); tin::install::nsp::errorMessage = e.what();
} }
free(buf); free(buf);
@ -81,7 +84,7 @@ namespace tin::install::nsp
try try
{ {
while (sizeRemaining) while (sizeRemaining && !tin::install::nsp::stopThreads)
{ {
if (!curRequestLeft) { if (!curRequestLeft) {
reqSize = std::min(sizeRemaining, (u64)0x800000); reqSize = std::min(sizeRemaining, (u64)0x800000);
@ -106,8 +109,8 @@ namespace tin::install::nsp
} }
catch (std::exception& e) catch (std::exception& e)
{ {
free(buf); tin::install::nsp::stopThreads = true;
THROW_FORMAT(e.what()); tin::install::nsp::errorMessage = e.what();
} }
free(buf); free(buf);
@ -119,7 +122,7 @@ namespace tin::install::nsp
{ {
USBFuncArgs* args = reinterpret_cast<USBFuncArgs*>(in); USBFuncArgs* args = reinterpret_cast<USBFuncArgs*>(in);
while (!args->bufferedPlaceholderWriter->IsPlaceholderComplete()) while (!args->bufferedPlaceholderWriter->IsPlaceholderComplete() && !tin::install::nsp::stopThreads)
{ {
if (args->bufferedPlaceholderWriter->CanWriteSegmentToPlaceholder()) if (args->bufferedPlaceholderWriter->CanWriteSegmentToPlaceholder())
args->bufferedPlaceholderWriter->WriteSegmentToPlaceholder(); args->bufferedPlaceholderWriter->WriteSegmentToPlaceholder();
@ -145,6 +148,7 @@ namespace tin::install::nsp
thrd_t usbThread; thrd_t usbThread;
thrd_t writeThread; thrd_t writeThread;
tin::install::nsp::stopThreads = false;
if (m_nspName.substr(m_nspName.size() - 1, 1) == "z") thrd_create(&usbThread, USBThreadFuncNcz, &args); if (m_nspName.substr(m_nspName.size() - 1, 1) == "z") thrd_create(&usbThread, USBThreadFuncNcz, &args);
else thrd_create(&usbThread, USBThreadFunc, &args); else thrd_create(&usbThread, USBThreadFunc, &args);
thrd_create(&writeThread, USBPlaceholderWriteFunc, &args); thrd_create(&writeThread, USBPlaceholderWriteFunc, &args);
@ -155,7 +159,7 @@ namespace tin::install::nsp
double speed = 0.0; double speed = 0.0;
inst::ui::setInstBarPerc(0); inst::ui::setInstBarPerc(0);
while (!bufferedPlaceholderWriter.IsBufferDataComplete()) while (!bufferedPlaceholderWriter.IsBufferDataComplete() && !tin::install::nsp::stopThreads)
{ {
u64 newTime = armGetSystemTick(); u64 newTime = armGetSystemTick();
@ -187,7 +191,7 @@ namespace tin::install::nsp
inst::ui::setInstInfoText("Installing " + ncaFileName + "..."); inst::ui::setInstInfoText("Installing " + ncaFileName + "...");
inst::ui::setInstBarPerc(0); inst::ui::setInstBarPerc(0);
while (!bufferedPlaceholderWriter.IsPlaceholderComplete()) while (!bufferedPlaceholderWriter.IsPlaceholderComplete() && !tin::install::nsp::stopThreads)
{ {
int installProgress = (int)(((double)bufferedPlaceholderWriter.GetSizeWrittenToPlaceholder() / (double)bufferedPlaceholderWriter.GetTotalDataSize()) * 100.0); int installProgress = (int)(((double)bufferedPlaceholderWriter.GetSizeWrittenToPlaceholder() / (double)bufferedPlaceholderWriter.GetTotalDataSize()) * 100.0);
#ifdef NXLINK_DEBUG #ifdef NXLINK_DEBUG
@ -200,6 +204,7 @@ namespace tin::install::nsp
thrd_join(usbThread, NULL); thrd_join(usbThread, NULL);
thrd_join(writeThread, NULL); thrd_join(writeThread, NULL);
if (tin::install::nsp::stopThreads) throw std::runtime_error(tin::install::nsp::errorMessage.c_str());
} }
void USBNSP::BufferData(void* buf, off_t offset, size_t size) void USBNSP::BufferData(void* buf, off_t offset, size_t size)

23
source/install/usb_xci.cpp
View file

@ -16,6 +16,9 @@
namespace tin::install::xci namespace tin::install::xci
{ {
bool stopThreads;
std::string errorMessage;
USBXCI::USBXCI(std::string xciName) : USBXCI::USBXCI(std::string xciName) :
m_xciName(xciName) m_xciName(xciName)
{ {
@ -41,7 +44,7 @@ namespace tin::install::xci
try try
{ {
while (sizeRemaining) while (sizeRemaining && !tin::install::xci::stopThreads)
{ {
tmpSizeRead = awoo_usbCommsRead(buf, std::min(sizeRemaining, (u64)0x800000)); tmpSizeRead = awoo_usbCommsRead(buf, std::min(sizeRemaining, (u64)0x800000));
if (tmpSizeRead == 0) THROW_FORMAT("USB transfer timed out or failed"); if (tmpSizeRead == 0) THROW_FORMAT("USB transfer timed out or failed");
@ -58,8 +61,8 @@ namespace tin::install::xci
} }
catch (std::exception& e) catch (std::exception& e)
{ {
free(buf); tin::install::xci::stopThreads = true;
THROW_FORMAT(e.what()); tin::install::xci::errorMessage = e.what();
} }
free(buf); free(buf);
@ -81,7 +84,7 @@ namespace tin::install::xci
try try
{ {
while (sizeRemaining) while (sizeRemaining && !tin::install::xci::stopThreads)
{ {
if (!curRequestLeft) { if (!curRequestLeft) {
reqSize = std::min(sizeRemaining, (u64)0x800000); reqSize = std::min(sizeRemaining, (u64)0x800000);
@ -106,8 +109,8 @@ namespace tin::install::xci
} }
catch (std::exception& e) catch (std::exception& e)
{ {
free(buf); tin::install::xci::stopThreads = true;
THROW_FORMAT(e.what()); tin::install::xci::errorMessage = e.what();
} }
free(buf); free(buf);
@ -119,7 +122,7 @@ namespace tin::install::xci
{ {
USBFuncArgs* args = reinterpret_cast<USBFuncArgs*>(in); USBFuncArgs* args = reinterpret_cast<USBFuncArgs*>(in);
while (!args->bufferedPlaceholderWriter->IsPlaceholderComplete()) while (!args->bufferedPlaceholderWriter->IsPlaceholderComplete() && !tin::install::xci::stopThreads)
{ {
if (args->bufferedPlaceholderWriter->CanWriteSegmentToPlaceholder()) if (args->bufferedPlaceholderWriter->CanWriteSegmentToPlaceholder())
args->bufferedPlaceholderWriter->WriteSegmentToPlaceholder(); args->bufferedPlaceholderWriter->WriteSegmentToPlaceholder();
@ -145,6 +148,7 @@ namespace tin::install::xci
thrd_t usbThread; thrd_t usbThread;
thrd_t writeThread; thrd_t writeThread;
tin::install::xci::stopThreads = false;
if (m_xciName.substr(m_xciName.size() - 1, 1) == "z") thrd_create(&usbThread, USBThreadFuncNcz, &args); if (m_xciName.substr(m_xciName.size() - 1, 1) == "z") thrd_create(&usbThread, USBThreadFuncNcz, &args);
else thrd_create(&usbThread, USBThreadFunc, &args); else thrd_create(&usbThread, USBThreadFunc, &args);
thrd_create(&writeThread, USBPlaceholderWriteFunc, &args); thrd_create(&writeThread, USBPlaceholderWriteFunc, &args);
@ -155,7 +159,7 @@ namespace tin::install::xci
double speed = 0.0; double speed = 0.0;
inst::ui::setInstBarPerc(0); inst::ui::setInstBarPerc(0);
while (!bufferedPlaceholderWriter.IsBufferDataComplete()) while (!bufferedPlaceholderWriter.IsBufferDataComplete() && !tin::install::xci::stopThreads)
{ {
u64 newTime = armGetSystemTick(); u64 newTime = armGetSystemTick();
@ -187,7 +191,7 @@ namespace tin::install::xci
inst::ui::setInstInfoText("Installing " + ncaFileName + "..."); inst::ui::setInstInfoText("Installing " + ncaFileName + "...");
inst::ui::setInstBarPerc(0); inst::ui::setInstBarPerc(0);
while (!bufferedPlaceholderWriter.IsPlaceholderComplete()) while (!bufferedPlaceholderWriter.IsPlaceholderComplete() && !tin::install::xci::stopThreads)
{ {
int installProgress = (int)(((double)bufferedPlaceholderWriter.GetSizeWrittenToPlaceholder() / (double)bufferedPlaceholderWriter.GetTotalDataSize()) * 100.0); int installProgress = (int)(((double)bufferedPlaceholderWriter.GetSizeWrittenToPlaceholder() / (double)bufferedPlaceholderWriter.GetTotalDataSize()) * 100.0);
#ifdef NXLINK_DEBUG #ifdef NXLINK_DEBUG
@ -200,6 +204,7 @@ namespace tin::install::xci
thrd_join(usbThread, NULL); thrd_join(usbThread, NULL);
thrd_join(writeThread, NULL); thrd_join(writeThread, NULL);
if (tin::install::xci::stopThreads) throw std::runtime_error(tin::install::xci::errorMessage.c_str());
} }
void USBXCI::BufferData(void* buf, off_t offset, size_t size) void USBXCI::BufferData(void* buf, off_t offset, size_t size)