From 46f999f0baf797fd5740d4447ca88cb8fac534ae Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 13 Jun 2007 21:16:27 +0000 Subject: [PATCH] - Added project.xml entry for Playstation 3 / Linux - Server status page: if the scheduler isn't running, it's almost certainly because "stop_sched" is present, not because Apache isn't running. Get rid of the use of "sched_pid". tools/ project.xml html/ops/ sample_server_status.php svn path=/trunk/boinc/; revision=12931 --- checkin_notes | 12 ++++++++++ doc/linux.php | 38 ++++++++++++++++++++----------- html/ops/sample_server_status.php | 38 +++++++++++++++---------------- tools/project.xml | 4 ++++ 4 files changed, 59 insertions(+), 33 deletions(-) diff --git a/checkin_notes b/checkin_notes index ad4bcc83e2..86b07f44c5 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6234,3 +6234,15 @@ David 13 June 2007 client/ client_state.C scheduler_op.C + +David 13 June 2007 + - Added project.xml entry for Playstation 3 / Linux + - Server status page: if the scheduler isn't running, + it's almost certainly because "stop_sched" is present, + not because Apache isn't running. + Get rid of the use of "sched_pid". + + tools/ + project.xml + html/ops/ + sample_server_status.php diff --git a/doc/linux.php b/doc/linux.php index 72a2e6cfc9..4480eb1c4d 100644 --- a/doc/linux.php +++ b/doc/linux.php @@ -9,22 +9,34 @@ The BOINC client software should work on: - -
-If BOINC produces the error message +(If BOINC produces the error message 
 boinc_client: /lib/libc.so.6: version `GLIBC_2.2' not found (required by ./boinc_client)
-then you need to install a newer version of libc. -
-If BOINC produces the error message -
-boinc_client: /lib/libc.so.6: version `GLIBC_2.3' not found (required by ./boinc_client)
-
-then the BOINC client was built incorrectly; -please alert us. +then you need to install a newer version of libc.) + +
  • Any Intel x86-compatible processor. + + +

    64 bit client

    + +On a 64-bit Linux system you should use the +64-bit version of the BOINC client +(its benchmarks will be more accurate than those of the 32-bit version). + +

    +NOTE: the 64-bit BOINC client will download 32-bit applications +from projects that don't have 64-bit apps. +Note that 32-bit binaries don't just work on every 64-bit Linux. If +for example you install a fresh Ubuntu 6.10 or 7.04, 32-bit binaries +won't work. They are not even recognized as valid executables. You +first have to install the ia32 package and dependent packages. +Further, for programs that link with the graphic library, you will +manually have to copy a 32-bit libglut library to the usr/lib32 +directory. +If after this you still get client errors, +find your exe in the projects directory and run ldd to see what +libraries are missing. "; diff --git a/html/ops/sample_server_status.php b/html/ops/sample_server_status.php index fa2f0c32da..27f07f779f 100644 --- a/html/ops/sample_server_status.php +++ b/html/ops/sample_server_status.php @@ -36,8 +36,6 @@ // // hostname of web server (default: same as ) // hostname of scheduling server (default: same as ) -// pid file of scheduling server httpd.conf -// (default: /etc/httpd/run/httpd.pid) // hostname of upload/download server (default: same as ) // pid file of upload/download server httpd.conf // (default: /etc/httpd/run/httpd.pid) @@ -97,19 +95,21 @@ function show_status($host, $function, $running) { if ($running == 1) { $xmlstring .= " running\n"; $htmlstring .= "Running\n"; - } - elseif ($running == 0) { + } elseif ($running == 0) { $xmlstring .= " not running\n"; $htmlstring .= "Not Running\n"; - } - else { + } else { $xmlstring .= " disabled\n"; $htmlstring .= "Disabled\n"; - } + } $xmlstring .= " \n"; $htmlstring .= "\n"; - if ($xml) { echo $xmlstring; return 0; } - if ($xmlout) { fwrite($xmloutfile,$xmlstring); } + if ($xml) { + echo $xmlstring; return 0; + } + if ($xmlout) { + fwrite($xmloutfile, $xmlstring); + } echo $htmlstring; return 0; } @@ -123,8 +123,13 @@ function show_counts($key, $xmlkey, $value) { global $xml,$xmlout,$xmloutfile; $formattedvalue = number_format($value); $xmlstring = " <$xmlkey>$value\n"; - if ($xml) { echo $xmlstring; return 0; } - if ($xmlout) { fwrite($xmloutfile,$xmlstring); } + if ($xml) { + echo $xmlstring; + return 0; + } + if ($xmlout) { + fwrite($xmloutfile,$xmlstring); + } echo "$key$formattedvalue"; return 0; } @@ -143,10 +148,6 @@ $www_host = parse_element($config_vars,""); if ($www_host == "") { $www_host = $project_host; } -$sched_pid = parse_element($config_vars,""); -if ($sched_pid == "") { - $sched_pid = "/etc/httpd/run/httpd.pid"; -} $sched_host = parse_element($config_vars,""); if ($sched_host == "") { $sched_host = $project_host; @@ -217,10 +218,7 @@ $uldl_running = file_exists($uldl_pid); if ($uldl_running == 0) $uldl_running = -1; show_status($uldl_host, "upload/download server", $uldl_running); -// $sched_running = !file_exists("../../stop_sched"); -// -$sched_running = file_exists($sched_pid); -if ($sched_running == 0) $sched_running = -1; +$sched_running = !file_exists("../../stop_sched"); show_status($sched_host, "scheduler", $sched_running); // parse through config.xml to get all daemons running @@ -237,7 +235,7 @@ while ($thisxml = trim(parse_next_element($config_xml,"",$cursor))) { $pid = parse_element($thisxml,""); if (!$pid) { $pid = $ncmd . ".pid"; } $disabled = parse_element($thisxml,""); - show_daemon_status($host,$nlog,$ncmd,$disabled); + show_daemon_status($host, $nlog, $ncmd, $disabled); } $xmlstring = " \n \n"; diff --git a/tools/project.xml b/tools/project.xml index 89a6e58872..a295a595d9 100644 --- a/tools/project.xml +++ b/tools/project.xml @@ -35,6 +35,10 @@ sparc64-sun-solaris Solaris 2.8 or later running on a SPARC 64-bit CPU + + powerpc64-ps3-linux-gnu + Sony Playstation 3 running Linux + anonymous anonymous