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

*** empty log message *** 

svn path=/trunk/boinc/; revision=4072
This commit is contained in:
David Anderson 2004-08-17 10:46:37 +00:00
parent bfc9bc06a7
commit 6cc2defa20
7 changed files with 136 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
checkin_notes
View File

@ -16450,3 +16450,28 @@ Rom 16 Aug 2004
lib/
gui_rpc_client.C, .h (added)
makefile.gui_test (added)
David 17 Aug 2004
- server changes (courtesy Pietro Cicotti from Predictor@home)
to implement homogeneous redundancy more efficiently.
Instead of scanning result table,
use the workunit.workseq_next field to store an integer encoding
of the platform the WU has been sent to, if any.
- added utility program (hr_db_convert.C) to convert
existing an database to new format
sched/
sched_send.C
tools/
hr_db_convert.C (new)
David 17 Aug 2004
- removed boinc_close_socket() from util.C,
since it causes Win link error in upper_case.
TODO: would be nice to use lib/ code as library
client/
gui_rpc_server.C
net_xfer.C
lib/
util.C,h

8
client/gui_rpc_server.C
View File

@ -55,6 +55,14 @@ typedef size_t socklen_t;
#endif
#endif
static void boinc_close_socket(int sock) {
#ifdef _WIN32
closesocket(sock);
#else
close(sock);
#endif
}
GUI_RPC_CONN::GUI_RPC_CONN(int s) {
sock = s;
}

8
client/net_xfer.C
View File

@ -92,6 +92,14 @@ using std::vector;
// in this many seconds, error out
#define NET_XFER_TIMEOUT 600
static void boinc_close_socket(int sock) {
#ifdef _WIN32
closesocket(sock);
#else
close(sock);
#endif
}
int get_socket_error(int fd) {
socklen_t intsize = sizeof(int);
int n;

8
lib/util.C
View File

@ -223,14 +223,6 @@ void boinc_sleep(double seconds) {
#endif
}
void boinc_close_socket(int sock) {
#ifdef _WIN32
closesocket(sock);
#else
close(sock);
#endif
}
// take a string containing some space separated words.
// return an array of pointers to the null-terminated words.
// Modifies the string arg.

1
lib/util.h
View File

@ -40,7 +40,6 @@ extern int ndays_to_string(double x, int smallest_timescale, char *buf);
extern void nbytes_to_string(double nbytes, double total_bytes, char* str, int len);
extern double dtime();
extern void boinc_sleep(double);
extern void boinc_close_socket(int);
extern int parse_command_line( char *, char ** );
extern int lock_file(char*);
extern void c2x(char *what);

100
sched/sched_send.C
View File

@ -387,41 +387,34 @@ static bool already_in_reply(WU_RESULT& wu_result, SCHEDULER_REPLY& reply) {
// Architectures: AMD, Intel, Macintosh
// OS: Linux, Windows, Darwin, SunOS
const int nocpu = 0;
const int Intel = 1;
const int AMD = 2;
const int Macintosh = 3;
const int unspec = 0;
const int nocpu = 1;
const int Intel = 2;
const int AMD = 3;
const int Macintosh = 4;
const int noos = 10;
const int Linux = 11;
const int Windows = 12;
const int Darwin = 13;
const int SunOS = 14;
const int noos = 128;
const int Linux = 256;
const int Windows = 384;
const int Darwin = 512;
const int SunOS = 640;
bool same_platform(DB_HOST& host, SCHEDULER_REQUEST& sreq) {
int h_processor = nocpu;
int h_system = noos;
int r_processor = nocpu;
int r_system = noos;
inline
int OS(SCHEDULER_REQUEST& sreq){
if ( strstr(sreq.host.os_name, "Linux") != NULL ) return Linux;
else if( strstr(sreq.host.os_name, "Windows") != NULL ) return Windows;
else if( strstr(sreq.host.os_name, "Darwin") != NULL ) return Darwin;
else if( strstr(sreq.host.os_name, "SunOS") != NULL ) return SunOS;
else return noos;
};
if ( strstr(host.p_vendor, "Intel") != NULL ) h_processor = Intel;
else if( strstr(host.p_vendor, "AMD") != NULL ) h_processor = AMD;
else if( strstr(host.p_vendor, "Macintosh") != NULL ) h_processor = Macintosh;
if ( strstr(sreq.host.p_vendor, "Intel") != NULL ) r_processor = Intel;
else if( strstr(sreq.host.p_vendor, "AMD") != NULL ) r_processor = AMD;
else if( strstr(sreq.host.p_vendor, "Macintosh") != NULL ) r_processor = Macintosh;
if ( strstr(host.os_name, "Linux") != NULL ) h_system = Linux;
else if( strstr(host.os_name, "Windows") != NULL ) h_system = Windows;
else if( strstr(host.os_name, "Darwin") != NULL ) h_system = Darwin;
else if( strstr(host.os_name, "SunOS") != NULL ) h_system = SunOS;
if ( strstr(sreq.host.os_name, "Linux") != NULL ) r_system = Linux;
else if( strstr(sreq.host.os_name, "Windows") != NULL ) r_system = Windows;
else if( strstr(sreq.host.os_name, "Darwin") != NULL ) r_system = Darwin;
else if( strstr(sreq.host.os_name, "SunOS") != NULL ) r_system = SunOS;
return ( h_processor == r_processor && h_system == r_system );
}
inline
int CPU(SCHEDULER_REQUEST& sreq){
if ( strstr(sreq.host.p_vendor, "Intel") != NULL ) return Intel;
else if( strstr(sreq.host.p_vendor, "AMD") != NULL ) return AMD;
else if( strstr(sreq.host.p_vendor, "Macintosh") != NULL ) return Macintosh;
else return nocpu;
};
#if 0
// old version, just in case
@ -436,39 +429,19 @@ bool same_platform(DB_HOST& host, SCHEDULER_REQUEST& sreq) {
// may want to sharpen this for Unix)
//
static bool already_sent_to_different_platform(
WORK_REQ& wreq, SCHEDULER_REQUEST& sreq, WORKUNIT& workunit
SCHEDULER_REQUEST& sreq, WORKUNIT& workunit, WORK_REQ& wreq
) {
DB_RESULT result;
DB_HOST host;
char buf[256];
bool found = false;
int retval;
sprintf(buf, "where workunitid=%d", workunit.id);
while (!result.enumerate(buf)) {
if (result.hostid) {
sprintf(buf, "where id=%d", result.hostid);
retval = host.lookup(buf);
if (retval) {
log_messages.printf(
SCHED_MSG_LOG::CRITICAL,
"send_work: host lookup failed (%d)\n", retval
);
found = true;
break;
}
if (same_platform(host, sreq)) {
// already sent to same platform - don't need to keep looking
//
break;
}
if (workunit.workseq_next != unspec) {
if (OS(sreq) + CPU(sreq) != workunit.workseq_next)
wreq.homogeneous_redundancy_reject = true;
found = true;
break;
}
}
result.end_enumerate();
return found;
else {
workunit.workseq_next = OS(sreq) + CPU(sreq);
DB_WORKUNIT db_wu;
db_wu = workunit;
db_wu.update();
}
return wreq.homogeneous_redundancy_reject;
}
void lock_sema() {
@ -617,7 +590,7 @@ static void scan_work_array(
//
if (config.homogeneous_redundancy) {
if (already_sent_to_different_platform(
wreq, sreq, wu_result.workunit
sreq, wu_result.workunit, wreq
)) {
goto dont_send;
}
@ -835,4 +808,3 @@ int send_work(
}
return 0;
}

59
tools/hr_db_convert.C Normal file
View File

@ -0,0 +1,59 @@
// utility program for projects that use homogeneous redundancy.
// Converts old-style info (in result table)
// to new style (using workseq_next field of workunit)
#include "boinc_db.h"
const int unspec = 0;
const int nocpu = 1;
const int Intel = 2;
const int AMD = 3;
const int Macintosh = 4;
const int noos = 128;
const int Linux = 256;
const int Windows = 384;
const int Darwin = 512;
const int SunOS = 640;
int OS(DB_HOST& host){
if ( strstr(host.os_name, "Linux") != NULL ) return Linux;
else if( strstr(host.os_name, "Windows") != NULL ) return Windows;
else if( strstr(host.os_name, "Darwin") != NULL ) return Darwin;
else if( strstr(host.os_name, "SunOS") != NULL ) return SunOS;
else return noos;
};
int CPU(DB_HOST& host){
if ( strstr(host.p_vendor, "Intel") != NULL ) return Intel;
else if( strstr(host.p_vendor, "AMD") != NULL ) return AMD;
else if( strstr(host.p_vendor, "Macintosh") != NULL ) return Macintosh;
else return nocpu;
};
int main() {
if ( boinc_db.open("predictor", "boinc", NULL, NULL) ) {
printf("Open failed\n");
return 0;
}
DB_WORKUNIT workunit;
char buf[256];
while (!workunit.enumerate()) {
printf("workunit %d wsn %d\n", workunit.id, workunit.workseq_next);
DB_RESULT result;
sprintf(buf, "where workunitid=%d", workunit.id);
if ( !result.enumerate(buf) ) {
DB_HOST host;
sprintf(buf, "where id=%d", result.hostid);
if ( !host.enumerate(buf) ) {
workunit.workseq_next = OS(host) + CPU(host);
if ( workunit.update() ) printf("Update failed!\n");
}
}
}
};