Mercurial > emacs

changeset 4011:1117ec91799c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author David J. MacKenzie <djm@gnu.org>
date Tue, 06 Jul 1993 23:07:30 +0000
parents 735b8dc6cdd2
children 26e0209b6e56
files src/getloadavg.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/getloadavg.c	Tue Jul 06 22:39:56 1993 +0000
+++ b/src/getloadavg.c	Tue Jul 06 23:07:30 1993 +0000
@@ -699,7 +699,6 @@
   /* Get the address of LDAV_SYMBOL.  */
   if (offset == 0)
     {
-#ifndef SUNOS_5
 #ifndef sgi
 #ifndef NLIST_STRUCT
       strcpy (nl[0].n_name, LDAV_SYMBOL);
@@ -714,6 +713,7 @@
 #endif /* not NLIST_NAME_UNION */
 #endif /* NLIST_STRUCT */
 
+#ifndef SUNOS_5
       if (nlist (KERNEL_FILE, nl) >= 0)
 	/* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
 	{
@@ -722,6 +722,7 @@
 #endif
 	  offset = nl[0].n_value;
 	}
+#endif  /* !SUNOS_5 */
 #else /* sgi */
       int ldav_off;
 
@@ -729,7 +730,6 @@
       if (ldav_off != -1)
 	offset = (long) ldav_off & 0x7fffffff;
 #endif /* sgi */
-#endif  /* !SUNOS_5 */
     }
 
   /* Make sure we have /dev/kmem open.  */
@@ -740,10 +740,14 @@
       if (channel >= 0)
 	getloadavg_initialized = 1;
 #else /* SUNOS_5 */
+      /* We pass 0 for the kernel, corefile, and swapfile names
+	 to use the currently running kernel.  */
       kd = kvm_open (0, 0, 0, O_RDONLY, 0);
       if (kd != 0) 
 	{
+	  /* nlist the currently running kernel.  */
 	  kvm_nlist (kd, nl);
+	  offset = nl[0].n_value;
 	  getloadavg_initialized = 1;
 	}
 #endif /* SUNOS_5 */