- client simulator: fix cpu_sched_rr_only bug

- boinc_cmd: canonicalize URLs
- user web: fix link to Top Teams
- back end: remove code related to alternate download dir

client/
    cpu_sched.C
    sim.C
html/
    inc/
        stats_sites.inc
    user/
        stats.php
lib/
    boinc_cmd.C
sched/
    file_deleter.C
    sched_config.C,h

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

checkin_notes

@@ -5043,3 +5043,24 @@ Charlie 18 May 2007
 
     mac_installer/
         make_GridRepublic.sh
+
+David  18 May 2007
+    - client simulator: fix cpu_sched_rr_only bug
+    - boinc_cmd: canonicalize URLs
+    - user web: fix link to Top Teams
+    - back end: remove code related to alternate download dir
+
+    client/
+        cpu_sched.C
+        sim.C
+    html/
+        inc/
+            stats_sites.inc
+        user/
+            stats.php
+    lib/
+        boinc_cmd.C
+    sched/
+        file_deleter.C
+        sched_config.C,h
+

client/cpu_sched.C

@@ -484,7 +484,7 @@ void CLIENT_STATE::schedule_cpus() {
     // First choose results from projects with P.deadlines_missed>0
     //
 #ifdef SIM
-    if (cpu_sched_rr_only) {
+    if (!cpu_sched_rr_only) {
 #endif
     while ((int)ordered_scheduled_results.size() < ncpus) {
         rp = earliest_deadline_result();

client/sim.C

@@ -64,7 +64,7 @@ SIM_RESULTS sim_results;
 
 void SIM_PROJECT::update_dcf_stats(RESULT* rp) {
     double raw_ratio = rp->final_cpu_time/rp->estimated_cpu_time_uncorrected();
-    // algorithm from Donald Knuth reference Wikipedia.
+    // see http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Algorithm_III
     ++completed_task_count;
     double delta = raw_ratio - completions_ratio_mean;
     completions_ratio_mean += delta / completed_task_count;

html/inc/stats_sites.inc

@@ -35,7 +35,7 @@ $stats_sites = array(
     ),
     array("http://www.setisynergy.com/stats/index.php",
         "BOINC Statistics for the WORLD!",
-        "developed by Zain Upton (email: zain.upton at setisynergy.com)"
+        "developed by Zain Upton (email: zain.upton at boincsynergy.com)"
     ),
     array("http://boinc.netsoft-online.com/",
         "BOINC Combined Statistics",

html/user/stats.php

@@ -9,7 +9,7 @@ Statistics for ".PROJECT.":
 <ul>
 <li><a href=top_users.php>Top participants</a>
 <li><a href=top_hosts.php>Top computers</a>
-<li><a href=team.php>Top teams</a>
+<li><a href=top_teams.php>Top teams</a>
 </ul>
 
 <p>

lib/boinc_cmd.C

@@ -276,6 +276,7 @@ int main(int argc, char** argv) {
     } else if (!strcmp(cmd, "--project")) {
         PROJECT project;
         project.master_url =  next_arg(argc, argv, i);
+        canonicalize_master_url(project.master_url);
         char* op = next_arg(argc, argv, i);
         if (!strcmp(op, "reset")) {
             retval = rpc.project_op(project, "reset");
@@ -299,7 +300,9 @@ int main(int argc, char** argv) {
             fprintf(stderr, "Unknown op %s\n", op);
         }
     } else if (!strcmp(cmd, "--project_attach")) {
-        char* url = next_arg(argc, argv, i);
+        char url[256];
+        strcpy(url, next_arg(argc, argv, i));
+        canonicalize_master_url(url);
         char* auth = next_arg(argc, argv, i);
         retval = rpc.project_attach(url, auth, "");
     } else if (!strcmp(cmd, "--file_transfer")) {

sched/file_deleter.C

@@ -159,10 +159,6 @@ int wu_delete_files(WORKUNIT& wu) {
                         "[WU#%d] deleting %s\n", wu.id, filename
                     );
                     retval = unlink(pathname);
-                    if (retval && strlen(config.download_dir_alt)) {
-                        sprintf(pathname, "%s/%s", config.download_dir_alt, filename);
-                        retval = unlink(pathname);
-                    }
                     if (retval) {
                         log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
                             "[WU#%d] unlink %s failed: %d\n",

sched/sched_config.C

@@ -75,7 +75,6 @@ int SCHED_CONFIG::parse(FILE* f) {
         else if (xp.parse_str(tag, "key_dir", key_dir, sizeof(key_dir))) continue;
         else if (xp.parse_str(tag, "download_url", download_url, sizeof(download_url))) continue;
         else if (xp.parse_str(tag, "download_dir", download_dir, sizeof(download_dir))) continue;
-        else if (xp.parse_str(tag, "download_dir_alt", download_dir_alt, sizeof(download_dir_alt))) continue;
         else if (xp.parse_str(tag, "upload_url", upload_url, sizeof(upload_url))) continue;
         else if (xp.parse_str(tag, "upload_dir", upload_dir, sizeof(upload_dir))) continue;
         else if (xp.parse_str(tag, "sched_lockfile_dir", sched_lockfile_dir, sizeof(sched_lockfile_dir))) continue;

sched/sched_config.h

@@ -34,9 +34,6 @@ public:
     char key_dir[256];
     char download_url[256];
     char download_dir[256];
-    char download_dir_alt[256];
-        // old download dir, assumed to be flat
-        // (file deleter looks here if not in main dir)
     char upload_url[256];
     char upload_dir[256];
     char sched_lockfile_dir[256];