Fossil SCM
If getloadavg() fails, return 0.0 as function result in stead of a random number
Commit
1707129a8744a7d719ef69bcd6e08d1c98eb3c16
Parent
d0fa1578402362b…
1 file changed
+5
-7
+5
-7
| --- src/loadctrl.c | ||
| +++ src/loadctrl.c | ||
| @@ -24,19 +24,17 @@ | ||
| 24 | 24 | |
| 25 | 25 | /* |
| 26 | 26 | ** Return the load average for the host processor |
| 27 | 27 | */ |
| 28 | 28 | double load_average(void){ |
| 29 | -#ifdef _WIN32 | |
| 30 | - return 0.0; | |
| 31 | -#elif defined(FOSSIL_OMIT_LOAD_AVERAGE) | |
| 32 | - return 0.0; | |
| 33 | -#else | |
| 29 | +#if !defined(_WIN32) && !defined(FOSSIL_OMIT_LOAD_AVERAGE) | |
| 34 | 30 | double a[3]; |
| 35 | - getloadavg(a, 3); | |
| 36 | - return a[0]; | |
| 31 | + if( getloadavg(a, 3)>0 ){ | |
| 32 | + return a[0]; | |
| 33 | + } | |
| 37 | 34 | #endif |
| 35 | + return 0.0; | |
| 38 | 36 | } |
| 39 | 37 | |
| 40 | 38 | /* |
| 41 | 39 | ** COMMAND: test-loadavg |
| 42 | 40 | ** %fossil test-loadavg |
| 43 | 41 |
| --- src/loadctrl.c | |
| +++ src/loadctrl.c | |
| @@ -24,19 +24,17 @@ | |
| 24 | |
| 25 | /* |
| 26 | ** Return the load average for the host processor |
| 27 | */ |
| 28 | double load_average(void){ |
| 29 | #ifdef _WIN32 |
| 30 | return 0.0; |
| 31 | #elif defined(FOSSIL_OMIT_LOAD_AVERAGE) |
| 32 | return 0.0; |
| 33 | #else |
| 34 | double a[3]; |
| 35 | getloadavg(a, 3); |
| 36 | return a[0]; |
| 37 | #endif |
| 38 | } |
| 39 | |
| 40 | /* |
| 41 | ** COMMAND: test-loadavg |
| 42 | ** %fossil test-loadavg |
| 43 |
| --- src/loadctrl.c | |
| +++ src/loadctrl.c | |
| @@ -24,19 +24,17 @@ | |
| 24 | |
| 25 | /* |
| 26 | ** Return the load average for the host processor |
| 27 | */ |
| 28 | double load_average(void){ |
| 29 | #if !defined(_WIN32) && !defined(FOSSIL_OMIT_LOAD_AVERAGE) |
| 30 | double a[3]; |
| 31 | if( getloadavg(a, 3)>0 ){ |
| 32 | return a[0]; |
| 33 | } |
| 34 | #endif |
| 35 | return 0.0; |
| 36 | } |
| 37 | |
| 38 | /* |
| 39 | ** COMMAND: test-loadavg |
| 40 | ** %fossil test-loadavg |
| 41 |