Fix build errors after merge

This commit is contained in:
David Anderson 2018-12-28 15:01:45 -08:00
parent 726b0682d2
commit 528737479d
2 changed files with 7 additions and 2 deletions

View File

@ -62,6 +62,12 @@ using std::vector;
#include "../sched/edf_sim.h"
#endif
#define WF_EST_FETCH_TIME 180
// Figure that fetching work (possibly requesting from several projects)
// could take as long as this.
// So start work fetch this long before an instance becomes idle,
// in order to avoid idleness.
// encapsulates the global variables of the core client.
// If you add anything here, initialize it in the constructor
//
@ -589,7 +595,6 @@ extern THREAD throttle_thread;
// don't fetch work from a project if it has this many runnable jobs.
// This is a failsafe mechanism to prevent infinite fetching
//////// CPU SCHEDULING
#define CPU_SCHED_PERIOD 60

View File

@ -115,7 +115,7 @@ RSC_REASON RSC_PROJECT_WORK_FETCH::compute_rsc_project_reason(
// only fetch work if a device is idle
//
if (p->resource_share == 0 && rwf.saturated_time > WF_EST_FETCH_TIME) {
return DONT_FETCH_ZERO_SHARE;
return RSC_REASON_ZERO_SHARE;
}
// if project has excluded GPUs of this type,