diff --git a/checkin_notes b/checkin_notes
index c9da1a78c0bcfebc4ca736836074ada95f5eb360..1ddd52358116c3a7ecb79ec70b4bb0b529c8b267 100644
--- a/checkin_notes
+++ b/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
diff --git a/client/rr_sim.cpp b/client/rr_sim.cpp
index 250a351b14cbb789c78cb9f3c9fdd5f28f24efc7..9b3804132dc419e9f75edb6e46a3ca6e01b813ca 100644
--- a/client/rr_sim.cpp
+++ b/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
);
}
diff --git a/client/sim.cpp b/client/sim.cpp
index c0f21c80514ee3025010ea68df9592ff70282976..9c122435162315621759418ea269179c6b553257 100644
--- a/client/sim.cpp
+++ b/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;
}
diff --git a/doc/index.php b/doc/index.php
index b4ab73920794e92f412e69d18db99083d84c36f9..ed352115bc89b75ef6fadacf532ca58ebb1a77a2 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -121,15 +121,21 @@ function show_create() {
</td></tr>
<tr><td>
<ul>
- <li><b>Scientists</b>:
- use BOINC to create a
- <a href=volunteer.php>volunteer computing project</a>,
- giving you the computing power of thousands of CPUs.
- <li><b>Universities</b>: use BOINC to create a
- <a href=\"trac/wiki/VirtualCampusSupercomputerCenter\">Virtual Campus Supercomputing Center</a>.
- <li><b>Companies</b>:
- use BOINC for <a href=dg.php>desktop Grid computing</a>.
- </ul>
+ <li>
+ ",
+ tra("%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs.",
+ "<b>", "</b>", "<a href=volunteer.php>", "</a>"
+ ),
+ "<li>",
+ tra("%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4.",
+ "<b>", "</b>",
+ "<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>
diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot
index e16ecd4d7347a13190f629805cf23f922b370054..0841faf3f83f685fdacc10fa9e2a9cfa73371117 100644
--- a/locale/templates/BOINC-Web.pot
+++ b/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
-msgid "The BOINC project"
+#: 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:151
-msgid "Help wanted!"
+#: index.php:147
+msgid "The BOINC project"
msgstr ""
#: index.php:153
-msgid "Programming"
+msgid "Message boards"
msgstr ""
#: index.php:154
-msgid "Translation"
+msgid "Email lists"
msgstr ""
#: index.php:155
-msgid "Testing"
+msgid "Personnel and contributors"
+msgstr ""
+
+#: index.php:156
+msgid "Events"
msgstr ""
#: index.php:157
-msgid "Publicity"
+msgid "Papers and talks"
msgstr ""
-#: index.php:159
-msgid "Software development"
+#: index.php:158
+msgid "Research projects"
msgstr ""
-#: index.php:160
-msgid "APIs for add-on software"
+#: index.php:159
+msgid "Logos and graphics"
msgstr ""
-#: index.php:161
-msgid "Personnel and contributors"
+#: index.php:160
+msgid "and"
msgstr ""
-#: index.php:162
-msgid "Message boards"
+#: index.php:164
+msgid "Help wanted"
msgstr ""
-#: index.php:163
-msgid "Email lists"
+#: index.php:166
+msgid "Programming"
msgstr ""
-#: index.php:164
-msgid "Events"
+#: index.php:167
+msgid "Translation"
msgstr ""
-#: index.php:165
-msgid "Conferences"
+#: index.php:168
+msgid "Testing"
msgstr ""
-#: index.php:166
-msgid "Papers and talks"
+#: index.php:170
+msgid "Publicity"
msgstr ""
-#: index.php:167
-msgid "Logos and graphics"
+#: index.php:172
+msgid "Software development"
msgstr ""
-#: index.php:168
-msgid "Research projects"
+#: index.php:173
+msgid "APIs for add-on software"
msgstr ""
-#: index.php:201
+#: 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 ""