- client simulator: done for now

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

checkin_notes

@@ -555,3 +555,10 @@ David  19 Jan 2010
         sim.cpp
         work_fetch.cpp
         cpu_sched.cpp
+
+David  19 Jan 2010
+    - client simulator: done for now
+
+    client/
+        sim.cpp
+        rr_sim.cpp

client/rr_sim.cpp

@@ -348,9 +348,10 @@ void CLIENT_STATE::rr_simulation() {
 
         if (log_flags.rr_simulation) {
             msg_printf(pbest, MSG_INFO,
-                "[rr_sim] %.2f: %s finishes after %.2f (%.2fG/%.2fG)",
+                "[rr_sim] %.2f: %s finishes after %.2f (%f * %.2fG/%.2fG)",
                 sim_now - now,
                 rpbest->name, rpbest->rrsim_finish_delay,
+                rpbest->avp->temp_dcf,
                 rpbest->rrsim_flops_left/1e9, rpbest->rrsim_flops/1e9
             );
         }

client/sim.cpp

@@ -621,6 +621,12 @@ void CLIENT_STATE::simulate() {
             if (!action) break;
         }
         now += delta;
+        for (unsigned int i=0; i<active_tasks.active_tasks.size(); i++) {
+            ACTIVE_TASK* atp = active_tasks.active_tasks[i];
+            if (atp->task_state() == PROCESS_EXECUTING) {
+                atp->elapsed_time += delta;
+            }
+        }
         html_rec();
         if (now > duration) break;
     }

doc/index.php

@@ -121,15 +121,21 @@ function show_create() {
         </td></tr>
         <tr><td>
         <ul>
-        <li><b>Scientists</b>: 
+        <li>
-        use BOINC to create a
+    ",
-        <a href=volunteer.php>volunteer computing project</a>,
+    tra("%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs.",
-        giving you the computing power of thousands of CPUs.
+        "<b>", "</b>", "<a href=volunteer.php>", "</a>"
-        <li><b>Universities</b>: use BOINC to create a
+    ),
-        <a href=\"trac/wiki/VirtualCampusSupercomputerCenter\">Virtual Campus Supercomputing Center</a>.
+    "<li>",
-        <li><b>Companies</b>:
+    tra("%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4.",
-        use BOINC for <a href=dg.php>desktop Grid computing</a>.
+        "<b>", "</b>",
-        </ul>
+        "<a href=\"trac/wiki/VirtualCampusSupercomputerCenter\">", "</a>"
+    ),
+    "<li>",
+    tra("%1Companies%2: use BOINC for %3desktop Grid computing%4.",
+        "<b>", "</b>", "<a href=dg.php>", "</a>"
+    ),
+    " </ul>
         </td></tr>
     ";
 }
@@ -151,7 +157,7 @@ function show_other() {
             <li> <a href=\"trac/wiki/BoincPapers\">".tra("Papers and talks")."</a>
             <li> <a href=\"trac/wiki/ResearchProjects\">".tra("Research projects")."</a>
             <li> <a href=logo.php>".tra("Logos and graphics")."</a>
-            <li> <a href=\"http://bolt.berkeley.edu/\">Bolt</a> and  <a href=\"http://bossa.berkeley.edu/\">Bossa</a>
+            <li> <a href=\"http://bolt.berkeley.edu/\">Bolt</a> ",tra("and"),  <a href=\"http://bossa.berkeley.edu/\">Bossa</a>
             </ul>
             </td><td valign=top>
             <ul>

locale/templates/BOINC-Web.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC $Id$\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2010-01-11 12:46 PST\n"
+"POT-Creation-Date: 2010-01-19 22:34 PST\n"
 "Last-Translator: Generated automatically from source files\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -177,7 +177,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:83 index.php:118 index.php:156
+#: index.php:83 index.php:118 index.php:169
 msgid "Documentation"
 msgstr ""
 
@@ -205,80 +205,96 @@ msgstr ""
 msgid "Software updates"
 msgstr ""
 
-#: index.php:146
+#: index.php:126
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+
+#: index.php:130
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+
+#: index.php:135
+msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
+msgstr ""
+
+#: index.php:147
 msgid "The BOINC project"
 msgstr ""
 
-#: index.php:151
-msgid "Help wanted!"
-msgstr ""
-
 #: index.php:153
-msgid "Programming"
-msgstr ""
-
-#: index.php:154
-msgid "Translation"
-msgstr ""
-
-#: index.php:155
-msgid "Testing"
-msgstr ""
-
-#: index.php:157
-msgid "Publicity"
-msgstr ""
-
-#: index.php:159
-msgid "Software development"
-msgstr ""
-
-#: index.php:160
-msgid "APIs for add-on software"
-msgstr ""
-
-#: index.php:161
-msgid "Personnel and contributors"
-msgstr ""
-
-#: index.php:162
 msgid "Message boards"
 msgstr ""
 
-#: index.php:163
+#: index.php:154
 msgid "Email lists"
 msgstr ""
 
-#: index.php:164
+#: index.php:155
+msgid "Personnel and contributors"
+msgstr ""
+
+#: index.php:156
 msgid "Events"
 msgstr ""
 
-#: index.php:165
+#: index.php:157
-msgid "Conferences"
-msgstr ""
-
-#: index.php:166
 msgid "Papers and talks"
 msgstr ""
 
-#: index.php:167
+#: index.php:158
-msgid "Logos and graphics"
-msgstr ""
-
-#: index.php:168
 msgid "Research projects"
 msgstr ""
 
-#: index.php:201
+#: index.php:159
+msgid "Logos and graphics"
+msgstr ""
+
+#: index.php:160
+msgid "and"
+msgstr ""
+
+#: index.php:164
+msgid "Help wanted"
+msgstr ""
+
+#: index.php:166
+msgid "Programming"
+msgstr ""
+
+#: index.php:167
+msgid "Translation"
+msgstr ""
+
+#: index.php:168
+msgid "Testing"
+msgstr ""
+
+#: index.php:170
+msgid "Publicity"
+msgstr ""
+
+#: index.php:172
+msgid "Software development"
+msgstr ""
+
+#: index.php:173
+msgid "APIs for add-on software"
+msgstr ""
+
+#: index.php:207
 msgid "Browser default"
 msgstr ""
 
-#: index.php:248
+#: index.php:254
 #, php-format
 msgid ""
 "Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
-#: index.php:261
+#: index.php:267
 msgid "BOINC is based at The University of California, Berkeley"
 msgstr ""