Skip to content

Commit

Permalink
- back out my last change
Browse files Browse the repository at this point in the history
svn path=/trunk/boinc/; revision=13185
  • Loading branch information
davidpanderson committed Jul 18, 2007
1 parent f9ccdeb commit 391ea79
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 14 deletions.
7 changes: 7 additions & 0 deletions checkin_notes
Original file line number Diff line number Diff line change
Expand Up @@ -7366,3 +7366,10 @@ Rytis 18 July 2007
html/user/
forum_forum.php
forum_index.php

David 18 July 2007
- back out my last change.
There are a number of situations where this is undesirable.

html/user/
team_founder_transfer_form.php
8 changes: 7 additions & 1 deletion client/sim.C
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,14 @@ void CLIENT_STATE::html_start(bool show_prev) {
}
fprintf(html_out,
"<a href=sim_log.txt>message log</a><p>"
"<table border=1>\n"
"<table border=1><tr><th>Time</th>\n"
);
for (int i=0; i<ncpus; i++) {
fprintf(html_out,
"<th>CPU %d<br><font size=-2>Job name and estimated time left<br>color denotes project<br>* means EDF mode</font></th>", i
);
}
fprintf(html_out, "<th>Notes</th></tr>\n");
}

void CLIENT_STATE::html_rec() {
Expand Down
27 changes: 19 additions & 8 deletions doc/sim_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function show_form() {
echo "
<form action=sim_form.php method=post>
sim_projects.xml:
<b>sim_projects.xml</b> (describes a set of projects)
<br>
<textarea name=projects rows=10 cols=80><projects>
<project>
Expand Down Expand Up @@ -46,7 +46,7 @@ function show_form() {
</projects></textarea>
<p>
sim_host.xml:
<b>sim_host.xml</b>: (describes the simulated host)
<br>
<textarea name=host rows=10 cols=80><host>
<p_fpops>1</p_fpops>
Expand All @@ -60,7 +60,7 @@ function show_form() {
</host></textarea>
<p>
sim_prefs.xml:
<b>sim_prefs.xml:</b> (the host's preferences)
<br>
<textarea name=prefs rows=10 cols=80><global_preferences>
<source_project>http://isaac.ssl.berkeley.edu/alpha/</source_project>
Expand All @@ -87,7 +87,7 @@ function show_form() {
</global_preferences></textarea>
<p>
cc_config.xml:
<b>cc_config.xml:</b> (the client configuration options)
<br>
<textarea name=cc_config rows=10 cols=80><cc_config>
<log_flags>
Expand All @@ -104,9 +104,19 @@ function show_form() {
</cc_config></textarea>
<p>
<b>
The following control how long the simulation runs.
Duration may not exceed TimeStep*10000.
</b>
<br>Time step: <input name=delta value=60>
<br>Duration: <input name=duration value=86400>
<br>(may not exceed TimeStep*10000)
<p>
<b>
The following controls enable various experimental policies.
The standard policy (as of 5.10.13) is no checkboxes enabled,
and the 'Normal' DCF policy.
</b>
<p>
Server does EDF simulation based on current workload? <input type=checkbox name=suw>
<p>
Expand Down Expand Up @@ -189,9 +199,10 @@ function show_form() {
page_head("BOINC client simulator");
echo "
This is a web interface to the BOINC client simulator.
Fill in the following form to specify the parameters
of your simulation.
Click <a href=trac/wiki/ClientSim>here</a> for more info.
Fill in the following form to specify the
<a href=trac/wiki/ClientSim>parameters of your simulation</a>.
The results will be shown in your browser.
<p>
";
show_form();
}
Expand Down
10 changes: 5 additions & 5 deletions html/user/team_founder_transfer_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

// don't allow requests from users with no credit
//
if ($user->total_credit == 0) {
echo "You must have credit on this project.";
page_tail();
exit;
}
//if ($user->total_credit == 0) {
// echo "You must have credit on this project.";
// page_tail();
// exit;
//}

// if founder has declined the request and the request was done more than
// two months ago, allow new request; if both founder and change initiator
Expand Down

0 comments on commit 391ea79

Please sign in to comment.