*** empty log message ***

svn path=/trunk/boinc/; revision=4093

checkin_notes

@@ -16600,3 +16600,10 @@ David  21 Aug 2004
         feeder.C
         sched_send.C
         sched_shmem.h
+
+David  21 Aug 2004
+    - removed old commented-out code
+
+    client/
+        client_types.C,h
+        cs_apps.C

client/client_types.C

@@ -74,8 +74,6 @@ void PROJECT::init() {
     min_rpc_time = 0;
     min_report_min_rpc_time = 0;
     master_fetch_failures = 0;
-    resource_debt = 0;
-    debt_order = 0;
     master_url_fetch_pending = false;
     sched_rpc_pending = false;
     tentative = false;
@@ -88,7 +86,6 @@ void PROJECT::init() {
     send_file_list = false;
     deletion_policy_priority = false;
     deletion_policy_expire = false;
-    checked = false;
 }
 
 PROJECT::~PROJECT() {

client/client_types.h

@@ -194,6 +194,7 @@ public:
     
     // the following fields used by CPU scheduler
     double debt;                // how much CPU time we owe this project (secs)
+
     // the following items are transient; not saved in state file
     double anticipated_debt;    // expected debt by the end of the preemption period
     double work_done_this_period; // how much CPU time has been devoted to this
@@ -202,11 +203,9 @@ public:
     
     // the following used by work-fetch algorithm
     double work_request;        // how much work a project needs (secs)
-    // the following soon to be deprecated
-    double resource_debt;       // How much CPU time we owe this project
-                                // (arbitrary scale)
-    int debt_order;             // 0 == largest debt
-    bool checked;                // used for flagging
+
+    // the following used in disk-space management
+    bool checked;
 
     PROJECT();
     ~PROJECT();

client/cs_apps.C

@@ -232,8 +232,10 @@ bool CLIENT_STATE::have_free_cpu() {
 //
 void CLIENT_STATE::assign_results_to_projects() {
 
-    // Before assigning a result to an active task, check if that result is a file xfer
-    // this will be appearent by the lack of files associated with the workunit's app
+    // Before assigning a result to an active task,
+    // check if that result is a file xfer;
+    // this will be appearent by the lack of files
+    // associated with the workunit's app
     // Running this function will find these results and mark them as completed.
     //
     handle_file_xfer_apps();
@@ -246,9 +248,12 @@ void CLIENT_STATE::assign_results_to_projects() {
             p->next_runnable_result = atp->result;
             continue;
         }
+
         // any next_runnable_result assigned so far should have an active task
+        //
         ACTIVE_TASK *next_atp = lookup_active_task_by_result(p->next_runnable_result);
         //assert(next_atp != NULL);
+
         if ((next_atp->state == PROCESS_UNINITIALIZED
             && atp->state == PROCESS_RUNNING) ||
             (next_atp->scheduler_state == CPU_SCHED_PREEMPTED
@@ -284,8 +289,8 @@ void CLIENT_STATE::assign_results_to_projects() {
 }
 
 // Schedule an active task for the project with the largest anticipated debt
-// among those that have a runnable result. Return true iff a task was
-// scheduled.
+// among those that have a runnable result.
+// Return true iff a task was scheduled.
 //
 bool CLIENT_STATE::schedule_largest_debt_project(double expected_pay_off) {
     PROJECT *best_project = NULL;
@@ -327,9 +332,9 @@ bool CLIENT_STATE::schedule_largest_debt_project(double expected_pay_off) {
 
 // Schedule active tasks to be run and preempted.
 //
-// This is called in the do_something() loop
+// This is called every second in the do_something() loop
 // (with must_reschedule=false)
-// and whenever all the files for a result finish downloading
+// and whenever all the input files for a result finish downloading
 // (with must_reschedule=true)
 //
 bool CLIENT_STATE::schedule_cpus(bool must_reschedule) {
@@ -344,7 +349,9 @@ bool CLIENT_STATE::schedule_cpus(bool must_reschedule) {
     double vm_limit;
     unsigned int i;
 
-    elapsed_time = time(NULL) - cpu_sched_last_time;
+    // Reschedule every cpu_sched_period seconds or as needed
+    //
+    elapsed_time = time(0) - cpu_sched_last_time;
     if ((elapsed_time < cpu_sched_period
          && !have_free_cpu()
          && !must_reschedule)
@@ -355,9 +362,12 @@ bool CLIENT_STATE::schedule_cpus(bool must_reschedule) {
     }
 
     // tell app doing screensaver (fullscreen) graphics to stop
+    // TODO: this interrupts the graphics, even if it's
+    // the only app running.  DO THIS A DIFFERENT WAY
+    //
     ss_logic.reset();
 
-    // finish work accounting for active tasks, reset temporary fields
+    // do work accounting for active tasks, reset temporary fields
     //
     for (i=0; i < active_tasks.active_tasks.size(); ++i) {
         atp = active_tasks.active_tasks[i];