Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

windows fix 

svn path=/trunk/boinc/; revision=874
This commit is contained in:
Eric Heien 2003-02-06 19:08:18 +00:00
parent d92791ca94
commit a7cdd98126
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/cs_apps.C
View File

@ -167,9 +167,6 @@ bool CLIENT_STATE::start_apps() {
//
open_slot = active_tasks.get_free_slot(nslots);
if (open_slot < 0) {
if (log_flags.task_debug) {
printf("start_apps(): all slots full\n");
}
return action;
}
rp = results[i];
@ -196,8 +193,7 @@ bool CLIENT_STATE::start_apps() {
atp->result->active_task_state = PROCESS_COULDNT_START;
report_project_error(
*(atp->result),retval,
"Couldn't start the app for this result.\n"
);
"Couldn't start the app for this result.\n" );
}
action = true;
set_client_state_dirty("start_apps");

6
client/http.C
View File

@ -545,12 +545,12 @@ bool HTTP_OP_SET::poll() {
}
break;
case HTTP_STATE_REPLY_BODY:
if (htp->error) {
action = true;
if (htp->error) {
action = true;
if (log_flags.http_debug) printf("net_xfer returned error %d\n", htp->error);
htp->http_op_state = HTTP_STATE_DONE;
htp->http_op_retval = htp->error;
}
}
else if (htp->io_done) {
action = true;
switch(htp->http_op_type) {

12
client/net_xfer.C
View File

@ -122,7 +122,7 @@ int NET_XFER::open_server() {
errno = WSAGetLastError();
if (errno != WSAEINPROGRESS && errno != WSAEWOULDBLOCK) {
closesocket(fd);
NetClose();
NetClose();
return -1;
}
#else
@ -201,10 +201,12 @@ int NET_XFER_SET::poll(int max_bytes, int& bytes_transferred) {
bytes_transferred = 0;
while (1) {
timeout.tv_usec = 0;
timeout.tv_sec = 1;
timeout.tv_sec = timeout.tv_usec = 0;
#ifndef _WIN32
timeout.tv_sec = 1;
#endif
retval = do_select(max_bytes, n, timeout);
if (retval) return retval;
if (retval) return retval;
if (n == 0) break;
max_bytes -= n;
bytes_transferred += n;
@ -216,7 +218,6 @@ int NET_XFER_SET::poll(int max_bytes, int& bytes_transferred) {
// do a select and do I/O on as many sockets as possible.
//
int NET_XFER_SET::do_select(int max_bytes, int& bytes_transferred, struct timeval timeout) {
int n, fd, retval;
socklen_t i;
NET_XFER *nxp;
@ -233,7 +234,6 @@ int NET_XFER_SET::do_select(int max_bytes, int& bytes_transferred, struct timeva
fd_set read_fds, write_fds, error_fds;
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
FD_ZERO(&error_fds);