- client (Mac): append /usr/local/cuda/lib to LD_LIBRARY_PATH

and DYLD_LIBRARY_PATH
- client simulator: compile fixes

svn path=/trunk/boinc/; revision=20117

checkin_notes

@@ -237,3 +237,18 @@ Charlie  8 Jan 2010
         AdvancedFrame.cpp
         BOINCBaseFrame.cpp, .h
         MainDocument.cpp, .h
+
+David  9 Jan 2010
+    - client (Mac): append /usr/local/cuda/lib to LD_LIBRARY_PATH
+        and DYLD_LIBRARY_PATH
+    - client simulator: compile fixes
+
+    client/
+        app.cpp
+        app_start.cpp
+        client_state.h
+        cs_apps.cpp
+        rr_sim.cpp
+        sim.cpp,h
+        time_stats.cpp
+        work_fetch.cpp

client/app.cpp

@@ -54,12 +54,7 @@
 
 #endif
 
-#ifdef SIM
-#include "sim.h"
-#else
 #include "client_state.h"
-#include "client_types.h"
-#endif
 
 #include "error_numbers.h"
 #include "filesys.h"

client/app_start.cpp

@@ -799,16 +799,22 @@ int ACTIVE_TASK::start(bool first_time) {
         // - the project dir (../../projects/X)
         // - the slot dir (.)
         // - the BOINC dir (../..)
+        // (Mac) /usr/local/cuda/lib/
         // We use relative paths in case higher-level dirs
         // are not readable to the account under which app runs
         //
         char libpath[8192];
+        char newlibs[256];
         get_project_dir(wup->project, buf, sizeof(buf));
+        sprintf(newlibs, "../../%s:.:../..", buf);
+#ifdef __APPLE__
+        strcat(newlibs, ":/usr/local/cuda/lib/");
+#endif
         char* p = getenv("LD_LIBRARY_PATH");
         if (p) {
-            sprintf(libpath, "../../%s:.:../..:%s", buf, p);
+            sprintf(libpath, "%s:%s", newlibs, p);
         } else {
-            sprintf(libpath, "../../%s:.:../..", buf);
+            strcpy(libpath, newlibs);
         }
         setenv("LD_LIBRARY_PATH", libpath, 1);
 
@@ -817,9 +823,9 @@ int ACTIVE_TASK::start(bool first_time) {
 #ifdef __APPLE__
         p = getenv("DYLD_LIBRARY_PATH");
         if (p) {
-            sprintf(libpath, "../../%s:.:../..:%s", buf, p);
+            sprintf(libpath, "%s:%s", newlibs, p);
         } else {
-            sprintf(libpath, "../../%s:.:../..", buf);
+            strcpy(libpath, newlibs);
         }
         setenv("DYLD_LIBRARY_PATH", libpath, 1);
 #endif

client/client_state.h

@@ -18,6 +18,10 @@
 #ifndef _CLIENT_STATE_
 #define _CLIENT_STATE_
 
+#ifdef SIM
+#include "sim.h"
+#else
+
 #ifndef _WIN32
 #include <string>
 #include <vector>
@@ -539,3 +543,4 @@ extern void print_suspend_tasks_message(int);
     // maximum short-term debt
 
 #endif
+#endif

client/cs_apps.cpp

@@ -39,11 +39,7 @@
 #include "shmem.h"
 #include "log_flags.h"
 #include "client_msgs.h"
-#ifdef SIM
-#include "sim.h"
-#else
 #include "client_state.h"
-#endif
 
 using std::vector;
 

client/rr_sim.cpp

@@ -42,11 +42,7 @@
 #include "boinc_win.h"
 #endif
 
-#ifdef SIM
-#include "sim.h"
-#else
 #include "client_state.h"
-#endif
 
 #include "coproc.h"
 #include "client_msgs.h"

client/sim.cpp

@@ -644,6 +644,10 @@ int main(int argc, char** argv) {
     vector<std::string> dirs;
 
     logfile = fopen("sim_log.txt", "w");
+    if (!logfile) {
+        fprintf(stderr, "Can't open sim_log.txt\n");
+        exit(1);
+    }
 
     sim_results.clear();
     for (i=1; i<argc;) {

client/sim.h

@@ -164,6 +164,10 @@ public:
     double share_violation();
     double monotony();
     bool user_active;
+    bool abort_jobs_on_exit;
+    bool skip_cpu_benchmarks;
+    bool unsigned_apps_ok;
+    bool exit_after_finish;
 
 private:
     double app_started;

client/time_stats.cpp

@@ -37,11 +37,7 @@
 #include "error_numbers.h"
 #include "client_msgs.h"
 #include "file_names.h"
-#ifdef SIM
-#include "sim.h"
-#else
 #include "client_state.h"
-#endif
 #include "network.h"
 #include "log_flags.h"
 

client/work_fetch.cpp

@@ -17,13 +17,8 @@
 
 #include "util.h"
 
-#include "client_types.h"
-#include "client_msgs.h"
-#ifdef SIM
-#include "sim.h"
-#else
 #include "client_state.h"
-#endif
+#include "client_msgs.h"
 
 #include "scheduler_op.h"
 #include "work_fetch.h"

doc/docutil.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once("../inc/util_basic.inc");
+require_once("../inc/translation.inc");
 
 if (0) {
     $x = $_SERVER['PHP_SELF'];
@@ -17,7 +18,7 @@ function search_form() {
     <input type=hidden name=sitesearch value=\"http://boinc.berkeley.edu\">
     <span class=\"nobar\">
     <input class=small name=q size=20>
-    <input class=small type=submit value=Search>
+    <input class=small type=submit value=".tra("Search").">
     </span>
     </form>
 ";

doc/download.php

@@ -114,7 +114,7 @@ function show_download($pname) {
         <b>"
         .sprintf(
             tra("Note: if your computer is equipped with an Graphics Processing Unit (GPU), you may be able to %suse it to compute faster%s"),
-                "<a href=gpu.php>", ".</a>"
+                "<a href=http://boinc.berkeley.edu/wiki/GPU_computing>", ".</a>"
         )
         ."</b>
         <br><br>

doc/download_all.php

@@ -195,7 +195,7 @@ if ($xml) {
             <h3>GPU computing</h3>
             If your computer is equipped with a Graphics Processing Unit (GPU),
             you may be able to
-            <a href=gpu.php>use it to compute faster</a>.
+            <a href=http://boinc.berkeley.edu/wiki/GPU_computing>use it to compute faster</a>.
             <h3>Other platforms</h3>
             If your computer is not of one of these types, you can
             <ul>

doc/gpu.php

@@ -5,6 +5,11 @@ require_once("docutil.php");
 page_head("Use your GPU for scientific computing");
 
 echo "
+
+THIS PAGE IS DEPRECATED: USE
+http://boinc.berkeley.edu/wiki/GPU_computing
+instead
+<p>
 <img align=right src=images/cuda.png>
 Most computers are equipped with a
 <b>Graphics Processing Unit (GPU)</b>
@@ -33,7 +38,7 @@ If your GPU is listed here and has at least 256MB of RAM, it's compatible.
 R600 and newer GPUs are found with ATI Radeon HD2400,
 HD2600, HD2900 and HD3800 graphics board.
 A full list is
-<a href=http://developer.amd.com/gpu/ATIStreamSDK/pages/ATIStreamSystemRequirements.aspx>here</a>.
+<a href=http://developer.amd.com/gpu/ATIStreamSDK/Pages/default.aspx#two>here</a>.
 </ul>
 <p>
 <h3>2) Get the latest BOINC software</h3>
@@ -49,6 +54,8 @@ Otherwise
 <ul>
 <li>
 <a href=http://www.nvidia.com/page/drivers.html>Get latest NVIDIA driver</a>
+(Mac users: you need a special
+ <a href=http://www.nvidia.com/object/cuda_get.html>CUDA Driver</a>).
 <li>
 <a href=http://support.amd.com/us/gpudownload/Pages/index.aspx>Get latest ATI driver</a>.
 </ul>

doc/index.php

@@ -154,6 +154,7 @@ function show_other() {
                 <li> <a href=\"trac/wiki/TranslateIntro\">".tra("Translation")."</a>
                 <li> <a href=\"trac/wiki/AlphaInstructions\">".tra("Testing")."</a>
                 <li> <a href=\"trac/wiki/WikiMeta\">".tra("Documentation")."</a>
+                <li> <a href=\"http://boinc.berkeley.edu/wiki/Publicizing_BOINC\">".tra("Publicity")."</a>
             </ul>
             <li> <a href=\"trac/wiki/SoftwareDevelopment\">".tra("Software development")."</a>
             <li> <a href=\"trac/wiki/SoftwareAddon\">".tra("APIs for add-on software")."</a>
@@ -245,7 +246,7 @@ echo "
     </td><td align=center>
     <span class=\"subtitle\">
     ".sprintf(tra("Open-source software for %svolunteer computing%s and %sgrid computing%s."), '<a href=volunteer.php><span class=nobr>', '</span></a>', '<a href=dg.php><span class=nobr>', '</span></a>')."
-    </span>
+    </span><br><br>
     <table><tr><td>
 ";
 language_form();
@@ -253,7 +254,16 @@ echo "</td><td>";
 search_form();
 echo "
     </td></tr></table>
-    </td></tr></table>
+    </td>
+    <td>
+    <center>
+    <a href=http://www.berkeley.edu>
+    <img src=images/uc_logo.jpg width=107 height=105 title=\"".tra("BOINC is based at The University of California, Berkeley")."\" alt=\"The University of California logo\">
+    </a>
+    </span>
+    </center>
+    </td>
+    </tr></table>
     <table width=\"100%\" border=0 cellspacing=0 cellpadding=4>
     <tr>
     <td valign=top>

doc/projects.php

@@ -39,7 +39,7 @@ See also
 <p>
 Note: if your computer is equipped with a Graphics Processing Unit
 (GPU), you may be able to
-<a href=http://boinc.berkeley.edu/gpu.php>use it to compute faster</a>.
+<a href=http://boinc.berkeley.edu/wiki/GPU_computing>use it to compute faster</a>.
 ";
 list_start("cellpadding=2 width=100%");
 list_heading(