add threads name and cleaning log output

This commit is contained in:
Igor Korsukov 2020-08-26 16:09:18 +02:00
parent 049a540865
commit e19eb8519a
8 changed files with 27 additions and 19 deletions

View file

@ -10,6 +10,7 @@
#include <pthread.h>
#include "log.h"
#include "runtime.h"
using namespace mu::audio;
@ -30,6 +31,7 @@ static ALSAData* _alsaData{ nullptr };
static void* alsaThread(void* aParam)
{
mu::runtime::setThreadName("audio_driver");
ALSAData* data = static_cast<ALSAData*>(aParam);
int ret = snd_pcm_wait(data->alsaDeviceHandle, 1000);

View file

@ -19,6 +19,7 @@
#include "audiothreadstreamworker.h"
#include "log.h"
#include "runtime.h"
#include "rpcstreamcontroller.h"
@ -56,6 +57,8 @@ void AudioThreadStreamWorker::AudioStreamProcess(AudioThreadStreamWorker* self)
void AudioThreadStreamWorker::doAudioStreamProcess()
{
mu::runtime::setThreadName("audio_worker");
IF_ASSERT_FAILED(m_channel) {
return;
}

View file

@ -42,7 +42,4 @@ void GlobalModule::registerExports()
void GlobalModule::onInit()
{
Invoker::setup();
runtime::mainThreadId(); //! NOTE Needs only call
runtime::setThreadName("main");
}

View file

@ -98,12 +98,12 @@ void Sequencer::requestData(tick_t tick)
m_streamState.requested = true;
m_midiStream->request.send(tick);
LOGI() << "request.send tick: " << tick;
LOGD() << "request tick: " << tick;
}
void Sequencer::onChunkReceived(const Chunk& chunk)
{
LOGI() << "chunk.beginTick: " << chunk.beginTick;
LOGD() << "chunk beginTick: " << chunk.beginTick;
std::lock_guard<std::mutex> lock(m_dataMutex);
m_midiData.chunks.insert({ chunk.beginTick, chunk });
m_streamState.requested = false;

View file

@ -19,6 +19,7 @@
#include "modulessetup.h"
#include "config.h"
#include "runtime.h"
#include "framework/global/globalmodule.h"
#include "framework/ui/uimodule.h"
@ -108,6 +109,9 @@ ModulesSetup::ModulesSetup()
void ModulesSetup::setup()
{
mu::runtime::mainThreadId(); //! NOTE Needs only call
mu::runtime::setThreadName("main");
for (mu::framework::IModuleSetup* m : m_modulesSetupList) {
m->registerExports();
}

View file

@ -36,8 +36,6 @@ AppShell::AppShell()
int AppShell::run(int argc, char** argv, std::function<void()> moduleSetup)
{
LOGI() << "start run";
qputenv("QT_STYLE_OVERRIDE", "Fusion");
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

View file

@ -52,18 +52,7 @@ NotationPlayback::NotationPlayback(IGetScore* getScore)
{
m_midiStream = std::make_shared<MidiStream>();
m_midiStream->isStreamingAllowed = true;
m_midiStream->request.onReceive(this, [this](tick_t tick) {
LOGI() << "request.onReceive tick: " << tick;
if (tick >= m_midiStream->lastTick) {
m_midiStream->stream.send(midi::Chunk());
return;
}
midi::Chunk chunk;
makeChunk(chunk, tick);
m_midiStream->stream.send(chunk);
});
m_midiStream->request.onReceive(this, [this](tick_t tick) { onChunkRequest(tick); });
}
void NotationPlayback::init()
@ -203,6 +192,20 @@ void NotationPlayback::makeTempoMap(TempoMap& tempos, const Ms::Score* score) co
}
}
void NotationPlayback::onChunkRequest(tick_t tick)
{
LOGD() << "tick: " << tick;
if (tick >= m_midiStream->lastTick) {
m_midiStream->stream.send(midi::Chunk());
return;
}
midi::Chunk chunk;
makeChunk(chunk, tick);
m_midiStream->stream.send(chunk);
}
void NotationPlayback::makeChunk(midi::Chunk& chunk, tick_t fromTick) const
{
Ms::EventMap msevents;

View file

@ -60,6 +60,7 @@ private:
void makeTempoMap(midi::TempoMap& tempos, const Ms::Score* score) const;
void makeSynthMap(midi::SynthMap& synthMap, const Ms::Score* score) const;
void onChunkRequest(midi::tick_t tick);
void makeChunk(midi::Chunk& chunk, midi::tick_t fromTick) const;
int instrumentBank(const Ms::Instrument* inst) const;