- scheduler: matchmaking scheduler now works;

uncomment MATCHMAKER to enable it.
    More testing needed.
- client (unix): avoid crash if LD_LIBRARY_PATH not set
    (port to 6.1 branch)


svn path=/trunk/boinc/; revision=15115
This commit is contained in:
David Anderson 2008-05-01 22:11:08 +00:00
parent 20e686d54c
commit d9645557a5
6 changed files with 27 additions and 9 deletions

View File

@ -128,7 +128,6 @@ echo "$cmdline"
if eval $cmdline; then
echo "Done, now run ./configure"
echo " ./configure -C to enable caching"
echo " ./configure --enable-maintainer-mode to enable maintainer dependencies"
exit 0
else
echo "Something failed .... please check error-message and re-run when fixed."

View File

@ -3496,3 +3496,18 @@ Reinhard May 1 2008
features by default
configure.ac
David May 1 2008
- scheduler: matchmaking scheduler now works;
uncomment MATCHMAKER to enable it.
More testing needed.
- client (unix): avoid crash if LD_LIBRARY_PATH not set
_autosetup
client/
cs_cmdline.C
lib/
gui_rpc_client_print.C
coproc.C
sched/
sched_send.C

View File

@ -37,8 +37,8 @@
static void print_options(char* prog) {
printf(
"The command-line options for %s are intended for debugging.\n"
"The recommended command-line interface is a separate program,'boinc_cmd'.\n"
"Run boinc_cmd in the same current as %s.\n"
"The recommended command-line interface is a separate program,'boinccmd'.\n"
"Run boinccmd in the same current as %s.\n"
"\n"
"Usage: %s [options]\n"
" --help show options\n"

View File

@ -132,10 +132,14 @@ void COPROC_CUDA::get(COPROCS& coprocs) {
// Leave it there, shouldn't hurt.
//
char* p = getenv("LD_LIBRARY_PATH");
if (!strstr(p, "/usr/local/cuda/lib")) {
char libpath[8192];
sprintf(libpath, "%s:/usr/local/cuda/lib", p);
setenv("LD_LIBRARY_PATH", libpath, 1);
if (p) {
if (!strstr(p, "/usr/local/cuda/lib")) {
char libpath[8192];
sprintf(libpath, "%s:/usr/local/cuda/lib", p);
setenv("LD_LIBRARY_PATH", libpath, 1);
}
} else {
setenv("LD_LIBRARY_PATH", "/usr/local/cuda/lib", 1);
}
void *cudalib = dlopen ("libcudart.so", RTLD_NOW );

View File

@ -18,7 +18,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
// This file is code to print (in ASCII) the stuff returned by GUI RPC.
// Used only by boinc_cmd.
// Used only by boinccmd.
#if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_)
#include "boinc_win.h"

View File

@ -1378,13 +1378,13 @@ void JOB::get_score(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
WU_RESULT& wu_result = ssp->wu_results[index];
wu = wu_result.workunit;
app = ssp->lookup_app(wu.appid);
score = 0;
// Find the app and app_version for the client's platform.
//
if (anonymous(sreq.platforms.list[0])) {
app = ssp->lookup_app(wu.appid);
found = sreq.has_version(*app);
if (!found) return;
bavp = NULL;