*** empty log message ***

svn path=/trunk/boinc/; revision=6520
This commit is contained in:
David Anderson 2005-07-05 09:02:55 +00:00
parent 06da0a6709
commit ccf355877c
11 changed files with 45 additions and 22 deletions

View File

@ -8872,3 +8872,9 @@ David 5 July 2005
scheduler_op.C,h
clientgui/
ViewResources.cpp
David 5 July 2005
- prevent infinite loop in web (from Rob Ogilvie)
html/inc
text_transform.inc

View File

@ -103,7 +103,7 @@ bool ACCT_MGR::poll() {
retval = http_op.http_op_retval;
}
if (retval) {
msg_printf(NULL, MSG_ALERT_ERROR, "Account manager update failed:\nerror %d", retval);
msg_printf(NULL, MSG_ALERT_ERROR, "Account manager update failed:\n%s", boincerror(retval));
}
state = ACCT_MGR_STATE_IDLE;
}

View File

@ -150,11 +150,11 @@ void ACTIVE_TASK::cleanup_task() {
if (app_client_shm.shm) {
retval = detach_shmem(app_client_shm.shm);
if (retval) {
msg_printf(NULL, MSG_ERROR, "detach_shmem: %d", retval);
msg_printf(NULL, MSG_ERROR, "Couldn't detach shared memory: %x", boincerror(retval));
}
retval = destroy_shmem(shmem_seg_name);
if (retval) {
msg_printf(NULL, MSG_ERROR, "destroy_shmem: %d", retval);
msg_printf(NULL, MSG_ERROR, "Couldn't destroy shared memory: %s", boincerror(retval));
}
app_client_shm.shm = NULL;
}

View File

@ -457,7 +457,7 @@ bool ACTIVE_TASK::check_max_disk_exceeded() {
//
retval = current_disk_usage(disk_usage);
if (retval) {
msg_printf(0, MSG_ERROR, "Can't get application disk usage: %d", retval);
msg_printf(0, MSG_ERROR, "Can't get application disk usage: %s", boincerror(retval));
} else {
if (disk_usage > max_disk_usage) {
msg_printf(

View File

@ -261,7 +261,7 @@ int ACTIVE_TASK::start(bool first_time) {
retval = get_shmem_seg_name();
if (retval) {
msg_printf(wup->project, MSG_ERROR,
"Can't get shared memory segment name: %d", retval
"Can't get shared memory segment name: %s", boincerror(retval)
);
return retval;
}
@ -407,7 +407,8 @@ int ACTIVE_TASK::start(bool first_time) {
);
if (retval) {
msg_printf(
wup->project, MSG_ERROR, "Can't create shared mem: %d", retval
wup->project, MSG_ERROR,
"Can't create shared memory: %d", boincerror(retval)
);
return retval;
}
@ -446,7 +447,7 @@ int ACTIVE_TASK::start(bool first_time) {
sprintf(buf, "..%s..%s%s", PATH_SEPARATOR, PATH_SEPARATOR, exec_path );
retval = execv(buf, argv);
msg_printf(wup->project, MSG_ERROR,
"execv(%s) failed: %d\n", buf, retval
"execv(%s) failed: %s\n", buf, boincerror(retval)
);
perror("execv");
_exit(errno);
@ -574,10 +575,12 @@ int ACTIVE_TASK_SET::restart_tasks(int max_tasks) {
retval = atp->start(false);
if (retval) {
msg_printf(atp->wup->project, MSG_ERROR, "ACTIVE_TASKS::restart_tasks(); restart failed: %d\n", retval);
msg_printf(atp->wup->project, MSG_ERROR,
"Task restart failed: %s\n", boincerror(retval)
);
gstate.report_result_error(
*(atp->result),
"Couldn't restart the app for this result: %d", retval
"Couldn't restart app: %d", retval
);
iter = active_tasks.erase(iter);
delete atp;

View File

@ -498,7 +498,9 @@ bool CLIENT_STATE::do_something() {
retval = write_state_file_if_needed();
if (retval) {
msg_printf(NULL, MSG_ERROR, "Couldn't write state file: %d", retval);
msg_printf(NULL, MSG_ERROR,
"Couldn't write state file: %s", boincerror(retval)
);
boinc_sleep(60.0);
// if we can't write the state file twice in a row, something's hosed;
@ -506,7 +508,9 @@ bool CLIENT_STATE::do_something() {
//
retval = write_state_file_if_needed();
if (retval) {
msg_printf(NULL, MSG_ERROR, "Couldn't write state file: %d; giving up", retval);
msg_printf(NULL, MSG_ERROR,
"Couldn't write state file: %s; giving up", boincerror(retval)
);
exit(retval);
}
}
@ -1286,7 +1290,9 @@ int CLIENT_STATE::detach_project(PROJECT* project) {
get_statistics_filename(project->master_url, path);
retval = boinc_delete_file(path);
if (retval) {
msg_printf(project, MSG_ERROR, "Can't delete statistics file: %d\n", retval);
msg_printf(project, MSG_ERROR,
"Can't delete statistics file: %s\n", boincerror(retval)
);
}
// delete account file
@ -1294,14 +1300,18 @@ int CLIENT_STATE::detach_project(PROJECT* project) {
get_account_filename(project->master_url, path);
retval = boinc_delete_file(path);
if (retval) {
msg_printf(project, MSG_ERROR, "Can't delete account file: %d\n", retval);
msg_printf(project, MSG_ERROR,
"Can't delete account file: %s\n", boincerror(retval)
);
}
// remove project directory and its contents
//
retval = remove_project_dir(*project);
if (retval) {
msg_printf(project, MSG_ERROR, "Can't delete project directory: %d\n", retval);
msg_printf(project, MSG_ERROR,
"Can't delete project directory: %s\n", boincerror(retval)
);
}
delete project;
write_state_file();

View File

@ -128,8 +128,8 @@ int PERS_FILE_XFER::start_xfer() {
(is_upload ? "upload" : "download"), fip->name
);
msg_printf(
fip->project, MSG_ERROR, "URL %s: error %d",
fip->get_current_url(is_upload), retval
fip->project, MSG_ERROR, "URL %s: %s",
fip->get_current_url(is_upload), boincerror(retval)
);
fxp->file_xfer_retval = retval;
@ -216,9 +216,9 @@ bool PERS_FILE_XFER::poll() {
} else {
if (log_flags.file_xfer) {
msg_printf(
fip->project, MSG_INFO, "Temporarily failed %s of %s: %d",
fip->project, MSG_INFO, "Temporarily failed %s of %s: %s",
is_upload?"upload":"download", fip->name,
fxp->file_xfer_retval
boincerror(fxp->file_xfer_retval)
);
}
handle_xfer_failure();

View File

@ -60,7 +60,7 @@ bool SCHEDULER_OP::check_master_fetch_start() {
retval = init_master_fetch(p);
if (retval) {
msg_printf(p, MSG_ERROR,
"Couldn't start master page download: %d", retval
"Couldn't start master page download: %s", boincerror(retval)
);
if (p->tentative) {
p->attach_failed(ATTACH_FAIL_INIT);

View File

@ -94,6 +94,9 @@ If you have an opinion, please contact
Banners for BOINC projects from Anthony Hern:
<a href=images/hern_logo3.gif>with</a> and
<a href=images/hern_logo4.gif>without</a> the BOINC logo.
Other banners:
<a href=images/boincheading.jpg>here</a> and
<a href=images/boincprojectheading.jpg>here</a>.
<p>
The 'B in a circle' icon was designed by Tim Lan.
The Mac variant was contributed by Juho Viitasalo.

View File

@ -34,7 +34,7 @@ computer resources
<tr><td>
<p>
If you own a computer (Windows, Mac, Linux or Unix)
you can help scientific research projects in many areas:
you can participate in scientific research in many areas:
<ul>
<li>
<a href=http://climateprediction.net>Climateprediction.net</a>:
@ -51,6 +51,7 @@ computer resources
<li><a href=http://setiweb.ssl.berkeley.edu/>SETI@home</a>:
Look for radio evidence of extraterrestrial life
<li><a href=http://www.cellcomputing.net/>Cell Computing</a>
biomedical research
(Japanese; requires nonstandard client software)
</ul>
To participate in a project:

View File

@ -131,8 +131,8 @@ function bb2html($text) {
// Do the actual replacing - iterations for nested items
$lasttext = "";
$i = 0;
// TODO: Speed this up a little bit
while ($text != $lasttext) {
// $i<10 to prevent DoS
while ($text != $lasttext && $i<10) {
$lasttext = $text;
$text = preg_replace($bbtags,$htmltags,$text);
$i = $i + 1;