Commit 6a75b78d authored by David Anderson's avatar David Anderson

- client: don't ignore jobs with fraction_done=1 (but still running)

    in RR simulation; we may need to mark them as deadline miss.
- web: replace & with & various places


svn path=/trunk/boinc/; revision=17278
parent 15e9a873
......@@ -1637,3 +1637,28 @@ David 16 Feb 2009
sched/
sched_send.cpp
sched_plan.cpp,h
David 17 Feb 2009
- client: don't ignore jobs with fraction_done=1 (but still running)
in RR simulation; we may need to mark them as deadline miss.
- web: replace & with & various places
client/
rr_sim.cpp
html/
inc/
prefs.inc
results.inc
stats_sites.inc
ops/
update_profile_pages.php
user/
edit_forum_preferences.php
edit_passwd_form.php
hosts_user.php
pm.php
prefs_remove.php
profile_menu.php
top_hosts.php
top_teams.php
top_users.php
......@@ -223,7 +223,9 @@ void CLIENT_STATE::rr_simulation() {
if (rp->some_download_stalled()) continue;
if (rp->project->non_cpu_intensive) continue;
rp->rrsim_flops_left = rp->estimated_flops_remaining();
if (rp->rrsim_flops_left <= 0) continue;
//if (rp->rrsim_flops_left <= 0) continue;
// job may have fraction_done=1 but not be done;
// if it's past its deadline, we need to mark it as such
p = rp->project;
if (rp->uses_cuda()) {
p->cuda_pwf.has_runnable_jobs = true;
......
......@@ -629,10 +629,10 @@ function row_links($subset, $prefs) {
$pre_add = "<a href=add_venue.php?venue=";
$pre_edit = "<a href=prefs_edit.php?venue=";
$pre_remove = "<a href=prefs_remove.php?venue=";
$post_add = "&subset=$subset&cols=1$tokens>Add</a>";
$post_edit = "&subset=$subset&cols=1$tokens>Edit</a>";
$post_remove = "&subset=$subset&cols=1$tokens>Remove</a>";
$gen = "<a href=prefs_edit.php?subset=$subset&cols=1$tokens>Edit</a>";
$post_add = "&amp;subset=$subset&cols=1$tokens>Add</a>";
$post_edit = "&amp;subset=$subset&cols=1$tokens>Edit</a>";
$post_remove = "&amp;subset=$subset&cols=1$tokens>Remove</a>";
$gen = "<a href=prefs_edit.php?subset=$subset&amp;cols=1$tokens>Edit</a>";
$hom = isset($prefs->home) ? $pre_edit."home".$post_edit : $pre_add."home".$post_add;
$schl = isset($prefs->school) ? $pre_edit."school".$post_edit : $pre_add."school".$post_add;
......@@ -833,12 +833,11 @@ function prefs_display_venue($prefs, $venue, $subset) {
if ($project_has_beta) prefs_show_beta($x);
prefs_show_project($x);
}
row2("<br>", "<a href=prefs_edit.php?venue=$venue&subset=$subset$tokens>Edit preferences</a> | <a href=prefs_remove.php?venue=$venue&subset=$subset$tokens>Remove</a>");
row2("<br>", "<a href=prefs_edit.php?venue=$venue&amp;subset=$subset$tokens>Edit preferences</a> | <a href=prefs_remove.php?venue=$venue&amp;subset=$subset$tokens>Remove</a>");
end_table();
echo "</td></tr>\n";
} else {
//$x = subset_name($subset);
row1("<a href=add_venue.php?venue=$venue&subset=$subset$tokens>Add separate preferences for $venue</a>", 2, "heading");
row1("<a href=add_venue.php?venue=$venue&amp;subset=$subset$tokens>Add separate preferences for $venue</a>", 2, "heading");
}
}
......
......@@ -286,14 +286,14 @@ function show_result_navigation(
echo "<br><center>";
if ($offset >= $results_per_page) {
$offset_p = $offset-$results_per_page;
echo "<a href=results.php?$clause&offset=$offset_p>Previous $results_per_page</a>";
echo "<a href=results.php?$clause&amp;offset=$offset_p>Previous $results_per_page</a>";
}
if (($offset >= $results_per_page) && ($number_of_results > $results_per_page)) {
echo "&nbsp;|&nbsp;";
}
if ($number_of_results > $results_per_page) {
$offset_n = $offset+$results_per_page;
echo "<a href=results.php?$clause&offset=$offset_n>Next $results_per_page</a></center><br>";
echo "<a href=results.php?$clause&amp;offset=$offset_n>Next $results_per_page</a></center><br>";
} else {
echo "</center><br><br>";
}
......
......@@ -20,7 +20,7 @@
//
$cpid_stats_sites = array(
array("Free-DC",
"http://stats.free-dc.org/stats.php?page=userbycpid&cpid=%s"
"http://stats.free-dc.org/stats.php?page=userbycpid&amp;cpid=%s"
),
array("BOINC all Project Stats",
"http://www.allprojectstats.com/showuser.php?id=%s"
......
......@@ -184,7 +184,7 @@ function build_picture_pages($width, $height) {
Only user profiles with pictures are listed here.";
echo "<table class=bordered border=1 cellpadding=5\n";
echo "<table class=bordered border=1 cellpadding=5>\n";
for ($row = 0; $row < $height; $row++) {
echo "<tr>";
......
......@@ -40,8 +40,8 @@ echo "<script type=\"text/javascript\">
</script>
";
start_table();
echo "<form method=\"post\" action=\"edit_forum_preferences_action.php\" enctype=\"multipart/form-data\">";
start_table();
// ------------ Notification -----------
......@@ -198,12 +198,12 @@ row2("Filtered users".
row1("Update");
row2("Click here to update message board preferences", "<input type=submit value=\"Update\">");
echo "</form>\n";
row1("Reset");
row2("Or click here to reset preferences to the defaults",
"<form method=\"post\" action=\"edit_forum_preferences_action.php\"><input type=\"submit\" value=\"Reset\"><input type=\"hidden\" name=\"action\" value=\"reset_confirm\"></form>"
);
end_table();
echo "</form>\n";
page_tail();
$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
......
......@@ -29,13 +29,14 @@ echo "
<form method=post action=edit_passwd_action.php>
";
start_table();
if ($user) {
echo "
<input type=hidden name=auth value=$user->authenticator>
";
start_table();
} else {
start_table();
row1("You can identify yourself using either
<ul>
<li> your email address and old password
......
......@@ -125,7 +125,7 @@ if ($userid) {
// At this point, we know that $userid, $show_all and $sort all have
// valid values.
//
$cache_args="userid=$userid&show_all=$show_all&sort=$sort&rev=$rev";
$cache_args="userid=$userid&amp;show_all=$show_all&amp;sort=$sort&amp;rev=$rev";
start_cache(USER_PAGE_TTL, $cache_args);
if ($user->show_hosts) {
page_head("Computers belonging to $user->name");
......
......@@ -23,7 +23,7 @@ require_once("../inc/forum.inc");
require_once("../inc/akismet.inc");
function show_block_link($userid) {
echo " <a href=\"pm.php?action=block&id=$userid\">";
echo " <a href=\"pm.php?action=block&amp;id=$userid\">";
show_image(REPORT_POST_IMAGE, "Block messages from this user", "Block user", REPORT_POST_IMAGE_HEIGHT);
echo "</a>";
}
......@@ -42,7 +42,7 @@ BoincForumPrefs::lookup($logged_in_user);
function make_script() {
echo "
<script>
<script type=\"text/javascript\">
function set_all(val) {
f = document.msg_list;
n = f.elements.length;
......@@ -99,8 +99,8 @@ function do_inbox($logged_in_user) {
echo "<td valign=top>".output_transform($msg->content, $options)."<p>";
$tokens = url_tokens($logged_in_user->authenticator);
echo "<ul class=\"actionlist\">";
show_actionlist_button("pm.php?action=delete&id=$msg->id&$tokens", tra("Delete"), "Delete this message");
show_actionlist_button("pm.php?action=new&replyto=$msg->id", tra("Reply"), "Reply to this message");
show_actionlist_button("pm.php?action=delete&amp;id=$msg->id&amp;$tokens", tra("Delete"), "Delete this message");
show_actionlist_button("pm.php?action=new&amp;replyto=$msg->id", tra("Reply"), "Reply to this message");
echo "</ul></td></tr>\n";
}
echo "
......
......@@ -29,7 +29,7 @@ $subset = get_str("subset");
$venue = get_str("venue");
$confirmed = get_str("confirmed", true);
$columns = get_int("cols", true);
$c = $columns?"&cols=$columns":"";
$c = $columns?"&amp;cols=$columns":"";
if ($confirmed) {
if ($subset == "global") {
......@@ -50,7 +50,7 @@ if ($confirmed) {
Are you sure you want to delete your separate ", subset_name($subset),
" preferences for $venue?
<br><br>
<a href=prefs_remove.php?subset=$subset&venue=$venue&confirmed=yes$c$tokens>Yes</a>
<a href=prefs_remove.php?subset=$subset&amp;venue=$venue&amp;confirmed=yes$c$tokens>Yes</a>
| <a href=prefs.php?subset=$subset$c>Cancel</a>
";
page_tail();
......
......@@ -58,8 +58,8 @@ echo "<tr><td>
<ul>
<li>".tra("View the %1User Picture Gallery%2.", "<a href=\"" . URL_BASE . "user_profile/user_gallery_1.html\">", "</a>")."</li>
<li>".tra("Browse profiles %1by country%2.", "<a href=\"" . URL_BASE . "user_profile/profile_country.html\">", "</a>")."</li>
<li>".tra("Browse profiles %1at random%2, %3at random with pictures%2, or %4at random without pictures%2.", "<a href=\"?cmd=rand&pic=-1\">", "</a>",
"<a href=\"?cmd=rand&pic=1\">", "<a href=\"?cmd=rand&pic=0\">")."</li>
<li>".tra("Browse profiles %1at random%2, %3at random with pictures%2, or %4at random without pictures%2.", "<a href=\"?cmd=rand&amp;pic=-1\">", "</a>",
"<a href=\"?cmd=rand&amp;pic=1\">", "<a href=\"?cmd=rand&amp;pic=0\">")."</li>
";
if (file_exists(PROFILE_PATH . "profile_alpha.html")) {
echo "<li>".tra("Alphabetical profile listings:")."<br>";
......
......@@ -88,12 +88,12 @@ foreach($data as $host) {
echo "</table>\n<p>";
if ($offset > 0) {
$new_offset = $offset - $hosts_per_page;
echo "<a href=top_hosts.php?sort_by=$sort_by&offset=$new_offset>Previous ".$hosts_per_page."</a> | ";
echo "<a href=top_hosts.php?sort_by=$sort_by&amp;offset=$new_offset>Previous ".$hosts_per_page."</a> | ";
}
if ($n==$hosts_per_page){ //If we aren't on the last page
$new_offset = $offset + $hosts_per_page;
echo "<a href=top_hosts.php?sort_by=$sort_by&offset=$new_offset>Next ".$hosts_per_page."</a>";
echo "<a href=top_hosts.php?sort_by=$sort_by&amp;offset=$new_offset>Next ".$hosts_per_page."</a>";
}
page_tail();
......
......@@ -117,12 +117,12 @@ if (count($data) == 0) {
echo "</table>\n<p>";
if ($offset > 0) {
$new_offset = $offset - $teams_per_page;
echo "<a href=top_teams.php?sort_by=$sort_by&offset=$new_offset".$type_url.">Previous ".$teams_per_page."</a> | ";
echo "<a href=top_teams.php?sort_by=$sort_by&amp;offset=$new_offset".$type_url.">Previous ".$teams_per_page."</a> | ";
}
if ($n==$teams_per_page){ //If we aren't on the last page
$new_offset = $offset + $teams_per_page;
echo "<a href=top_teams.php?sort_by=$sort_by&offset=$new_offset".$type_url.">Next ".$teams_per_page."</a>";
echo "<a href=top_teams.php?sort_by=$sort_by&amp;offset=$new_offset".$type_url.">Next ".$teams_per_page."</a>";
}
}
page_tail();
......
......@@ -123,12 +123,12 @@ foreach ($data as $user) {
echo "</table>\n<p>";
if ($offset > 0) {
$new_offset = $offset - $users_per_page;
echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Previous ".$users_per_page."</a> | ";
echo "<a href=top_users.php?sort_by=$sort_by&amp;offset=$new_offset>Previous ".$users_per_page."</a> | ";
}
if ($n==$users_per_page){ //If we aren't on the last page
$new_offset = $offset + $users_per_page;
echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Next ".$users_per_page."</a>";
echo "<a href=top_users.php?sort_by=$sort_by&amp;offset=$new_offset>Next ".$users_per_page."</a>";
}
page_tail();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment