← Back to branch summary

~ubuntu-branches/debian/sid/boinc/sid

« back to all changes in this revision

Viewing changes to client/cpu_sched.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Steffen Moeller
  • Date: 2011-06-10 13:56:34 UTC
  • mfrom: (1.3.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110610135634-ya6h4pxygydy0civ
Tags: 6.12.32+dfsg-1
http://bugs.debian.org/562431
https://launchpad.net/bugs/560143
* New upstream version.
  - finally contains MAXPATHLEN fixes for building on HURD
  - fewer warnings while compiling (some Debian patches
    accepted)
* Initial preparations for merging with developments
  for Debian and beyond at SZTAKI, Budapest.
* amd64 package now explicitly presents itself also
  as i686 savvy as an alternative platform name and such such it now
  not only recommends but depends with its -client on ia32-lib
  (Closes: #562431) (lp: #560143).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/cpu_sched.cpp
414
414
        RESULT* rp = gstate.results[i];
415
415
        if (rp->resource_type() != rsc_type) continue;
416
416
        if (!rp->runnable()) continue;
417
 
        if (rp->project->non_cpu_intensive) continue;
 
417
        if (rp->non_cpu_intensive()) continue;
418
418
        if (rp->already_selected) continue;
419
419
#ifdef USE_REC
420
420
        double std = project_priority(rp->project);
475
475
        if (rp->resource_type() != rsc_type) continue;
476
476
        if (rp->already_selected) continue;
477
477
        if (!rp->runnable()) continue;
 
478
        if (rp->non_cpu_intensive()) continue;
478
479
        PROJECT* p = rp->project;
479
 
        if (p->non_cpu_intensive) continue;
480
480
 
481
481
        bool only_deadline_misses = true;
482
482
 
1094
1094
        atp->overdue_checkpoint = false;
1095
1095
        if (!atp->result->runnable()) continue;
1096
1096
        if (atp->result->uses_coprocs() && gpu_suspend_reason) continue;
1097
 
        if (atp->result->project->non_cpu_intensive) continue;
 
1097
        if (atp->result->non_cpu_intensive()) continue;
1098
1098
        if (atp->scheduler_state != CPU_SCHED_SCHEDULED) continue;
1099
1099
        if (finished_time_slice(atp)) continue;
1100
1100
        atp->result->unfinished_time_slice = true;
1591
1591
    //
1592
1592
    for (i=0; i<results.size(); i++) {
1593
1593
        RESULT* rp = results[i];
1594
 
        if (rp->project->non_cpu_intensive && rp->runnable()) {
 
1594
        if (rp->non_cpu_intensive() && rp->runnable()) {
1595
1595
            atp = get_task(rp);
1596
1596
            atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
1597
1597
            ram_left -= atp->procinfo.working_set_size_smoothed;
2033
2033
 
2034
2034
    if (config.ncpus>0) {
2035
2035
        ncpus = config.ncpus;
 
2036
        host_info.p_ncpus = ncpus;
2036
2037
    } else if (host_info.p_ncpus>0) {
2037
2038
        ncpus = host_info.p_ncpus;
2038
2039
    } else {