emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master e10d08d: Fix 'load-average' on MS-Windows


From: Eli Zaretskii
Subject: [Emacs-diffs] master e10d08d: Fix 'load-average' on MS-Windows
Date: Tue, 7 May 2019 10:49:44 -0400 (EDT)

branch: master
commit e10d08df7edbb2e9e90169d19c3361099802fad6
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix 'load-average' on MS-Windows
    
    * src/w32.c (getloadavg): Always return at least one element
    of the array.
---
 src/w32.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/w32.c b/src/w32.c
index 677c37f..833ff4c 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2003,6 +2003,13 @@ getloadavg (double loadavg[], int nelem)
       loadavg[elem] = avg;
     }
 
+  /* Always return at least one element, otherwise load-average
+     returns nil, and Lisp programs might decide we cannot measure
+     system load.  For example, jit-lock-stealth-load's defcustom
+     might decide that feature is "unsupported".  */
+  if (elem == 0)
+    loadavg[elem++] = 0.09;    /* < display-time-load-average-threshold */
+
   return elem;
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]