Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- client: do the /proc/interrupts stuff (see above) 

only on Linux-like systems;
    use device_idle() only on non-Linux Unix systems

svn path=/trunk/boinc/; revision=15059
This commit is contained in:
David Anderson 2008-04-15 22:42:23 +00:00
parent 02fdbc87db
commit 753b20a67f
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -3255,3 +3255,11 @@ Rytis April 15 2008
html/inc/ html/inc/
translation.inc translation.inc
David April 15 2008
- client: do the /proc/interrupts stuff (see above)
only on Linux-like systems;
use device_idle() only on non-Linux Unix systems
client/
hostinfo_unix.C

12
client/hostinfo_unix.C
View File

@ -1036,6 +1036,7 @@ inline bool user_idle(time_t t, struct utmp* u) {
#else // ! __APPLE__ #else // ! __APPLE__
#if LINUX_LIKE_SYSTEM
bool interrupts_idle(time_t t) { bool interrupts_idle(time_t t) {
static FILE *ifp = NULL; static FILE *ifp = NULL;
static long irq_count[256]; static long irq_count[256];
@ -1066,6 +1067,7 @@ bool interrupts_idle(time_t t) {
} }
return last_irq < t; return last_irq < t;
} }
#endif
bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) { bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
time_t idle_time = time(0) - (long) (60 * idle_time_to_run); time_t idle_time = time(0) - (long) (60 * idle_time_to_run);
@ -1078,15 +1080,19 @@ bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
if (!all_tty_idle(idle_time)) return false; if (!all_tty_idle(idle_time)) return false;
// According to Frank Thomas (#463) the following may be pointless #if LINUX_LIKE_SYSTEM
// Check /proc/interrupts to detect keyboard or mouse activity.
if (!interrupts_idle(idle_time)) return false;
#else
// We should find out which of the following are actually relevant
// on which systems (if any)
// //
if (!device_idle(idle_time, "/dev/mouse")) return false; if (!device_idle(idle_time, "/dev/mouse")) return false;
// solaris, linux // solaris, linux
if (!device_idle(idle_time, "/dev/input/mice")) return false; if (!device_idle(idle_time, "/dev/input/mice")) return false;
if (!device_idle(idle_time, "/dev/kbd")) return false; if (!device_idle(idle_time, "/dev/kbd")) return false;
// solaris // solaris
// Check /proc/interrupts to detect keyboard or mouse activity. #endif
if (!interrupts_idle(idle_time)) return false;
return true; return true;
} }

7
html/inc/email.inc
View File

@ -46,10 +46,11 @@ function send_email($user, $subject, $body, $body_html=null) {
return true; return true;
} }
} else { } else {
if (defined('EMAIL_FROM')) { $headers ="";
if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) {
$headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">";
} else if (defined('EMAIL_FROM')) {
$headers = "From: ". EMAIL_FROM; $headers = "From: ". EMAIL_FROM;
} else {
$headers ="";
} }
return mail($user->email_addr, $subject, $body, $headers); return mail($user->email_addr, $subject, $body, $headers);
} }