Skip to content

Harden star view visualization #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkt01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harden star view visualization #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/icecreammonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,20 @@ void IcecreamMonitor::handle_local_done(Msg *_m)
(*it).state = Job::Finished;
emit jobUpdated(*it);

if (m_rememberedJobs.size() > 3000) { // now remove 1000
if (m_rememberedJobs.size() > 3000) { // now remove 1000 completed jobs
uint count = 1000;

while (--count)
m_rememberedJobs.erase(m_rememberedJobs.begin());
JobList::iterator it = m_rememberedJobs.begin();
while (count > 0 && it != m_rememberedJobs.end()) {
if (it.value().isDone()) {
JobList::iterator next = it;
++next;
m_rememberedJobs.erase(it);
it = next;
--count;
} else {
++it;
}
}
}
}

Expand Down
59 changes: 34 additions & 25 deletions src/views/starview.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,37 +389,46 @@ void StarView::update(const Job &job)
}

unsigned int hostid = processor(job);
if (!hostid) {
return;
}

HostItem *hostItem = findHostItem(hostid);
if (!hostItem) {
return;
}

hostItem->update(job);
HostItem *hostItem = hostid ? findHostItem(hostid) : nullptr;

bool finished = job.state == Job::Finished || job.state == Job::Failed;

QMap<unsigned int, HostItem *>::Iterator it;
it = mJobMap.find(job.id);
QMap<unsigned int, HostItem *>::Iterator it = mJobMap.find(job.id);
if (it != mJobMap.end()) {
(*it)->update(job);
if (finished) {
mJobMap.erase(it);
unsigned int clientid = job.client;
HostItem *clientItem = findHostItem(clientid);
if (clientItem) {
clientItem->setIsActiveClient(false);
HostItem *oldHostItem = *it;

if (oldHostItem != hostItem) {
Job finishedJob = job;
finishedJob.state = Job::Finished;
oldHostItem->update(finishedJob);

if (hostItem && !finished) {
hostItem->update(job);
*it = hostItem;
} else {
mJobMap.erase(it);
unsigned int clientid = job.client;
HostItem *clientItem = findHostItem(clientid);
if (clientItem) {
clientItem->setIsActiveClient(false);
}
}
} else {
hostItem->update(job);
if (finished) {
mJobMap.erase(it);
unsigned int clientid = job.client;
HostItem *clientItem = findHostItem(clientid);
if (clientItem) {
clientItem->setIsActiveClient(false);
}
}
}
m_widget->drawNodeStatus();
return;
}

if (!finished) {
mJobMap.insert(job.id, hostItem);
} else {
if (hostItem && !finished) {
hostItem->update(job);
mJobMap.insert(job.id, hostItem);
}
}

if (job.state == Job::Compiling) {
Expand Down