diff --git a/checkin_notes b/checkin_notes index d4e9e01adc..a95eaead5c 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4013,3 +4013,17 @@ David 10 July 2011 client_types.cpp clientgui/ DlgItemProperties.cpp + +David 10 July 2011 + - client: fix scheduler bug that treated all CPU jobs + as non-high-priority + - client: don't print spurious "domino prevention" + and "thrashing prevention" msgs + - manager: show project descriptions in same size font + as the rest of the dialog + + client/ + cpu_sched.cpp + work_fetch.h + clientgui/ + ProjectInfoPage.cpp diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp index c5b794b38b..fac5b0700f 100644 --- a/client/cpu_sched.cpp +++ b/client/cpu_sched.cpp @@ -766,6 +766,7 @@ static bool schedule_if_possible( static void promote_once_ran_edf() { for (unsigned int i=0; iresult->rr_sim_misses_deadline) continue; if (atp->once_ran_edf) { RESULT* rp = atp->result; PROJECT* p = rp->project; diff --git a/client/work_fetch.h b/client/work_fetch.h index fdf6216ee6..9866e9929e 100644 --- a/client/work_fetch.h +++ b/client/work_fetch.h @@ -29,8 +29,8 @@ extern double rec_half_life; extern bool use_hyst_fetch; -#define RSC_TYPE_ANY 0 -#define RSC_TYPE_CPU 1 +#define RSC_TYPE_ANY -1 +#define RSC_TYPE_CPU 0 struct PROJECT; struct RESULT; diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp index 240adb8472..eb90b26018 100644 --- a/clientgui/ProjectInfoPage.cpp +++ b/clientgui/ProjectInfoPage.cpp @@ -488,7 +488,8 @@ void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) { EllipseStringIfNeeded(strURL, m_pProjectDetailsURLCtrl); // Populate the project details area - m_pProjectDetailsDescriptionCtrl->SetPage(pProjectInfo->m_strDescription); + wxString desc = wxString("", wxConvUTF8)+pProjectInfo->m_strDescription+wxString("", wxConvUTF8); + m_pProjectDetailsDescriptionCtrl->SetPage(desc); m_pProjectDetailsURLCtrl->SetLabel(strURL); m_pProjectDetailsURLCtrl->SetURL(pProjectInfo->m_strURL); // Set tooltip to full text in case ellipsed