mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=3490
This commit is contained in:
parent
e1929337bc
commit
f29caba049
|
@ -12942,3 +12942,15 @@ David June 1 2004
|
|||
forum_thread.php
|
||||
py/Boinc/
|
||||
setup_project.py
|
||||
|
||||
David June 1 2004
|
||||
- client: SCHEDULER_OP::poll(): if a RPC or master fetch fails for
|
||||
a tentative project, set the RPC state to IDLE
|
||||
before calling project_add_failed().
|
||||
Otherwise that function will attempt to remove the
|
||||
NET_XFER and HTTP_OP, which have alread been removed
|
||||
- client: clean_out_dir(): return 0 if directory doesn't exist
|
||||
client/
|
||||
scheduler_op.C
|
||||
lib/
|
||||
filesys.C
|
||||
|
|
|
@ -92,7 +92,7 @@ int SCHEDULER_OP::init_get_work() {
|
|||
project = gstate.next_project(0);
|
||||
if (project) {
|
||||
msg_printf(project, MSG_INFO,
|
||||
"Requesting %f seconds of work", ns
|
||||
"Requesting %.0f seconds of work", ns
|
||||
);
|
||||
retval = init_op_project(ns);
|
||||
if (retval) {
|
||||
|
@ -367,6 +367,7 @@ bool SCHEDULER_OP::poll() {
|
|||
if (project->tentative) {
|
||||
PROJECT* project_temp = project;
|
||||
project = 0; // keep detach(0) from removing HTTP OP
|
||||
state = SCHEDULER_OP_STATE_IDLE; // avoid double remove
|
||||
project_add_failed(project_temp);
|
||||
err = true;
|
||||
} else {
|
||||
|
@ -397,6 +398,7 @@ bool SCHEDULER_OP::poll() {
|
|||
//
|
||||
if (!err && project->scheduler_urls.size() == 0) {
|
||||
if (project->tentative) {
|
||||
state = SCHEDULER_OP_STATE_IDLE; // avoid double remove
|
||||
project_add_failed(project);
|
||||
} else {
|
||||
sprintf(err_msg,
|
||||
|
@ -468,6 +470,7 @@ bool SCHEDULER_OP::poll() {
|
|||
//
|
||||
if (project->tentative) {
|
||||
if (retval || strlen(project->user_name)==0) {
|
||||
state = SCHEDULER_OP_STATE_IDLE; // avoid double remove
|
||||
project_add_failed(project);
|
||||
} else {
|
||||
project->tentative = false;
|
||||
|
|
|
@ -290,7 +290,7 @@ int clean_out_dir(const char* dirpath) {
|
|||
DIRREF dirp;
|
||||
|
||||
dirp = dir_open(dirpath);
|
||||
if (!dirp) return ERR_OPENDIR;
|
||||
if (!dirp) return 0; // if dir doesn't exist, it's empty
|
||||
while (1) {
|
||||
strcpy(filename, "");
|
||||
retval = dir_scan(filename, dirp, sizeof(filename));
|
||||
|
|
Loading…
Reference in New Issue