From fe7d8b34f349c3ae0b14d93f58acd08ec6e321ea Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 20 Jan 2010 06:35:57 +0000 Subject: [PATCH] - client simulator: done for now svn path=/trunk/boinc/; revision=20204 --- checkin_notes | 7 ++ client/rr_sim.cpp | 3 +- client/sim.cpp | 6 ++ doc/index.php | 26 +++++--- locale/templates/BOINC-Web.pot | 116 +++++++++++++++++++-------------- 5 files changed, 97 insertions(+), 61 deletions(-) diff --git a/checkin_notes b/checkin_notes index c9da1a78c0..1ddd523581 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 250a351b14..9b3804132d 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 c0f21c8051..9c12243516 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; itask_state() == PROCESS_EXECUTING) { + atp->elapsed_time += delta; + } + } html_rec(); if (now > duration) break; } diff --git a/doc/index.php b/doc/index.php index b4ab739207..ed352115bc 100644 --- a/doc/index.php +++ b/doc/index.php @@ -121,15 +121,21 @@ function show_create() { +
  • + ", + tra("%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs.", + "", "", "", "" + ), + "
  • ", + tra("%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4.", + "", "", + "", "" + ), + "
  • ", + tra("%1Companies%2: use BOINC for %3desktop Grid computing%4.", + "", "", "", "" + ), + " "; } @@ -151,7 +157,7 @@ function show_other() {
  • ".tra("Papers and talks")."
  • ".tra("Research projects")."
  • ".tra("Logos and graphics")." -
  • Bolt and Bossa +
  • Bolt ",tra("and"), Bossa
      diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot index e16ecd4d73..0841faf3f8 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 \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 -msgid "Conferences" -msgstr "" - -#: index.php:166 +#: index.php:157 msgid "Papers and talks" msgstr "" -#: index.php:167 -msgid "Logos and graphics" -msgstr "" - -#: index.php:168 +#: index.php:158 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 ""