Reverting waits
Waits are still overlapping. Will discuss with Robin for advice on how he wants to manage them. My attempt stopped the over lap but broke the loading.
This commit is contained in:
+3
-3
@@ -2086,8 +2086,8 @@ public:
|
||||
virtual void UpdateServerConfiguration(const JackServerSettings &jackServerSettings,
|
||||
std::function<void(bool success, const std::string &errorMessage)> onComplete)
|
||||
{
|
||||
// Only allow one restart operation at a time.
|
||||
CleanRestartThreads(true);
|
||||
|
||||
|
||||
std::lock_guard guard(restart_mutex);
|
||||
RestartThread *pShutdown = new RestartThread(this, jackServerSettings, onComplete);
|
||||
restartThreads.push_back(pShutdown);
|
||||
@@ -2364,4 +2364,4 @@ JSON_MAP_REFERENCE(JackHostStatus, cpuFreqMin)
|
||||
JSON_MAP_REFERENCE(JackHostStatus, cpuFreqMax)
|
||||
JSON_MAP_REFERENCE(JackHostStatus, hasCpuGovernor)
|
||||
JSON_MAP_REFERENCE(JackHostStatus, governor)
|
||||
JSON_MAP_END()
|
||||
JSON_MAP_END()
|
||||
+5
-55
@@ -1377,31 +1377,6 @@ void PiPedalModel::RestartAudio(bool useDummyAudioDriver)
|
||||
jackServerSettings.UseDummyAudioDevice();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
auto jackConfiguration = this->jackConfiguration;
|
||||
jackConfiguration.AlsaInitialize(jackServerSettings);
|
||||
if (!jackConfiguration.isValid())
|
||||
@@ -2772,31 +2747,6 @@ static bool HasAlsaDevice(const std::vector<AlsaDeviceInfo> devices, const std::
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void PiPedalModel::StartHotspotMonitoring()
|
||||
{
|
||||
this->avahiService = std::make_unique<AvahiService>();
|
||||
@@ -3065,25 +3015,25 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally()
|
||||
auto now = clock::now();
|
||||
clock::duration timeSinceLastRetry = now-this->lastRestartTime;
|
||||
this->lastRestartTime = now;
|
||||
if (timeSinceLastRetry > std::chrono::duration_cast<clock::duration>(std::chrono::seconds(6))) {
|
||||
if (timeSinceLastRetry > std::chrono::duration_cast<clock::duration>(std::chrono::milliseconds(1000))) {
|
||||
audioRestartRetries = 0;
|
||||
}
|
||||
CancelAudioRetry();
|
||||
|
||||
if (audioRestartRetries == 0)
|
||||
{
|
||||
this->audioRetryPostHandle = this->PostDelayed(
|
||||
std::chrono::seconds(5),
|
||||
this->audioRetryPostHandle = this->Post(
|
||||
|
||||
// No lock to avoid deadlocks!
|
||||
[this]() {
|
||||
Lv2Log::info("Restarting audio.");
|
||||
this->RestartAudio();
|
||||
});
|
||||
++audioRestartRetries;
|
||||
} else if (audioRestartRetries < 3)
|
||||
} else if (audioRestartRetries < 3)
|
||||
{
|
||||
this->audioRetryPostHandle = this->PostDelayed(
|
||||
std::chrono::seconds(5),
|
||||
std::chrono::milliseconds(100 * audioRestartRetries),
|
||||
[this]() {
|
||||
if (closed) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user