From 7ea662932c4701f44f3b1e633d62b5d0313e692b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 26 Jun 2007 21:14:58 +0000
Subject: [PATCH] - add new stats site - back end: use boinc_mkdir to get
 permissions right

html/inc/
    stats_sites.inc
lib/
    filesys.C
sched/
    db_dump.C
    db_purge.C
    feeder.C

svn path=/trunk/boinc/; revision=13033
---
 checkin_notes            | 13 +++++++++++++
 doc/boinc_news.php       |  5 +++++
 html/inc/stats_sites.inc |  7 +++++++
 lib/filesys.C            |  2 ++
 sched/db_dump.C          |  2 +-
 sched/db_purge.C         |  3 ++-
 sched/feeder.C           |  6 ++++++
 sched/sched_util.C       |  4 ++++
 8 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index f6fe97b236..925bfb37ce 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6741,3 +6741,16 @@ David  25 June 2007
 
 	lib/
 		prefs.C,h
+
+David  25 June 2007
+    - add new stats site
+    - back end: use boinc_mkdir to get permissions right
+
+    html/inc/
+        stats_sites.inc
+    lib/
+        filesys.C
+    sched/
+        db_dump.C
+        db_purge.C
+        feeder.C
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 7b4f1dff06..9516574835 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,11 @@
 <?
 
 $project_news = array(
+array("June 26, 2007",
+    "There are reports that version 5.10.8 of the BOINC client software
+    causes a problem on Windows XP Pro in which the desktop becomes empty.
+    If you see this, please uninstall 5.10.8 and install version 5.8.16."
+),
 array("June 3, 2007",
     "BOINCstats and BAM! are now viewable in Finnish
     (<a href=http://fi.boincstats.com>http://fi.boincstats.com</a>). "
diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc
index c77c07f835..20eddd8ee2 100644
--- a/html/inc/stats_sites.inc
+++ b/html/inc/stats_sites.inc
@@ -3,6 +3,9 @@
 // the following sites generate stats for a given CPID
 //
 $cpid_stats_sites = array(
+    array("BOINC all Project Stats",
+        "http://www.allprojectstats.com/showuser.php?id=%s"
+    ),
     array("BOINCstats",
         "http://www.boincstats.com/stats/boinc_user_graph.php?pr=bo&id=%s"
     ),
@@ -18,6 +21,10 @@ $cpid_stats_sites = array(
 );
 
 $stats_sites = array(
+    array(
+        "http://www.allprojectstats.com/",
+        "BOINC all Project Stats"
+    ),
     array(
         "http://stats.free-dc.org",
         "Free-DC",
diff --git a/lib/filesys.C b/lib/filesys.C
index 8ac0358eb4..353dd44105 100755
--- a/lib/filesys.C
+++ b/lib/filesys.C
@@ -496,6 +496,8 @@ int boinc_rename(const char* old, const char* newf) {
     return retval;
 }
 
+// make a dir that's owner and group RWX
+//
 int boinc_mkdir(const char* path) {
     if (is_dir(path)) return 0;
 #ifdef _WIN32
diff --git a/sched/db_dump.C b/sched/db_dump.C
index d60ef7f1f1..6dbcb3da13 100644
--- a/sched/db_dump.C
+++ b/sched/db_dump.C
@@ -834,7 +834,7 @@ int main(int argc, char** argv) {
         );
     }
 
-    mkdir(spec.output_dir, 0777);
+    boinc_mkdir(spec.output_dir);
 
     unsigned int j;
     for (j=0; j<spec.enumerations.size(); j++) {
diff --git a/sched/db_purge.C b/sched/db_purge.C
index fe14262212..027af75a21 100644
--- a/sched/db_purge.C
+++ b/sched/db_purge.C
@@ -73,6 +73,7 @@ using namespace std;
 
 #include "boinc_db.h"
 #include "util.h"
+#include "filesys.h"
 #include "parse.h"
 #include "sched_config.h"
 #include "sched_util.h"
@@ -614,7 +615,7 @@ int main(int argc, char** argv) {
         exit(2);
     }
     install_stop_signal_handler();
-    mkdir("../archives", 0777);
+    boinc_mkdir("../archives");
 
     // on exit, either via the check_stop_daemons signal handler, or
     // through a regular call to exit, these functions will be called
diff --git a/sched/feeder.C b/sched/feeder.C
index c8d5d76af5..c36cfb601f 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -27,6 +27,8 @@
 //  [ -priority_order_create_time ]
 //                        order by priority, then by increasing WU create time
 //  [ -mod n i ]          handle only results with (id mod n) == i
+//  [ -wmod n i ]         handle only workunits with (id mod n) == i
+//                        recommended if using HR with multiple schedulers
 //  [ -sleep_interval x ]   sleep x seconds if nothing to do
 //  [ -allapps ]  		  interleave results from all applications uniformly
 //  [ -purge_stale x ]    remove work items from the shared memory segment
@@ -580,6 +582,10 @@ int main(int argc, char** argv) {
             int n = atoi(argv[++i]);
             int j = atoi(argv[++i]);
             sprintf(mod_select_clause, "and r1.id %% %d = %d ", n, j);
+        } else if (!strcmp(argv[i], "-wmod")) {
+            int n = atoi(argv[++i]);
+            int j = atoi(argv[++i]);
+            sprintf(mod_select_clause, "and workunit.id %% %d = %d ", n, j);
         } else if (!strcmp(argv[i], "-sleep_interval")) {
             sleep_interval = atof(argv[++i]);
         } else {
diff --git a/sched/sched_util.C b/sched/sched_util.C
index d5f4f7b90a..3209c45bb4 100644
--- a/sched/sched_util.C
+++ b/sched/sched_util.C
@@ -125,7 +125,11 @@ void get_log_path(char* p, const char* filename) {
     if (q) *q=0;
     sprintf(dir, "../log_%s", host);
     sprintf(p, "%s/%s", dir, filename);
+    mode_t old_mask = umask(0);
     mkdir(dir, 02770);
+        // make log_x directory sticky and group-rwx
+        // so that whatever apache puts there will be owned by us
+    umask(old_mask);
 }
 
 static void filename_hash(const char* filename, int fanout, char* dir) {