- 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

@@ -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

doc/linux.php

@@ -9,22 +9,34 @@ The BOINC client software should work on:
 
 <ul>
 <li> Any Linux version 2.0 or greater with libc version 2.2 or greater.
-<li> Any Intel x86-compatible processor.
-</ul>
-
-<hr>
-If BOINC produces the error message
+(If BOINC produces the error message
 <pre>
 boinc_client: /lib/libc.so.6: version `GLIBC_2.2' not found (required by ./boinc_client)
 </pre>
-then you need to install a newer version of libc.
-<hr>
-If BOINC produces the error message
-<pre>
-boinc_client: /lib/libc.so.6: version `GLIBC_2.3' not found (required by ./boinc_client)
-</pre>
-then the BOINC client was built incorrectly;
-please alert us.
+then you need to install a newer version of libc.)
+
+<li> Any Intel x86-compatible processor.
+</ul>
+
+<h3>64 bit client</h3>
+
+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).
+
+<p>
+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.
 
 ";
 

html/ops/sample_server_status.php

@@ -36,8 +36,6 @@
 //
 // <www_host>    hostname of web server (default: same as <host>)
 // <sched_host>  hostname of scheduling server (default: same as <host>)
-// <sched_pid>   pid file of scheduling server httpd.conf
-//               (default: /etc/httpd/run/httpd.pid)
 // <uldl_host>   hostname of upload/download server (default: same as <host>)
 // <uldl_pid>    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 .= "      <status>running</status>\n";
         $htmlstring .= "<td bgcolor=00ff00>Running</td>\n";
-        }
-    elseif ($running == 0) {
+    } elseif ($running == 0) {
         $xmlstring .= "      <status>not running</status>\n";
         $htmlstring .= "<td bgcolor=ff0000>Not Running</td>\n";
-        }
-    else {
+    } else {
         $xmlstring .= "      <status>disabled</status>\n";
         $htmlstring .= "<td bgcolor=ff8800>Disabled</td>\n";
-        }
+    }
     $xmlstring .= "    </daemon>\n";
     $htmlstring .= "</tr>\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</$xmlkey>\n";
-    if ($xml) { echo $xmlstring; return 0; }
-    if ($xmlout) { fwrite($xmloutfile,$xmlstring); }
+    if ($xml) {
+        echo $xmlstring;
+        return 0;
+    }
+    if ($xmlout) {
+        fwrite($xmloutfile,$xmlstring);
+    }
     echo "<tr><td>$key</td><td>$formattedvalue</td></tr>";
     return 0;
 }
@@ -143,10 +148,6 @@ $www_host = parse_element($config_vars,"<www_host>");
 if ($www_host == "") {
     $www_host = $project_host;
 }
-$sched_pid = parse_element($config_vars,"<sched_pid>");
-if ($sched_pid == "") {
-    $sched_pid = "/etc/httpd/run/httpd.pid";
-}
 $sched_host = parse_element($config_vars,"<sched_host>");
 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,"<daemon>",$cursor))) {
     $pid = parse_element($thisxml,"<pid_file>");
     if (!$pid) { $pid = $ncmd . ".pid"; }
     $disabled = parse_element($thisxml,"<disabled>");
-    show_daemon_status($host,$nlog,$ncmd,$disabled);
+    show_daemon_status($host, $nlog, $ncmd, $disabled);
 }
 
 $xmlstring = "  </daemon_status>\n  <database_file_states>\n";

tools/project.xml

@@ -35,6 +35,10 @@
         <name>sparc64-sun-solaris</name>
         <user_friendly_name>Solaris 2.8 or later running on a SPARC 64-bit CPU</user_friendly_name>
     </platform>
+    <platform>
+        <name>powerpc64-ps3-linux-gnu</name>
+        <user_friendly_name>Sony Playstation 3 running Linux</user_friendly_name>
+    </platform>
     <platform>
         <name>anonymous</name>
         <user_friendly_name>anonymous</user_friendly_name>