OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 'info os' crashes on sparc. 

* common/linux-osdata.c (get_number_of_cpu_cores): Delete.
	(linux_xfer_osdata_processes): Fetch _SC_NPROCESSORS_ONLN via
	sysconf.
	(get_cores_used_by_process): Update comment.
This commit is contained in:
David S. Miller 2012-11-20 17:40:28 +00:00
parent 6bb11ab3b2
commit b245bdfc67
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2012-11-20 David S. Miller <davem@davemloft.net>
* common/linux-osdata.c (get_number_of_cpu_cores): Delete.
(linux_xfer_osdata_processes): Fetch _SC_NPROCESSORS_ONLN via
sysconf.
(get_cores_used_by_process): Update comment.
2012-11-20 Yao Qi <yao@codesourcery.com>
* objfiles.c (init_entry_point_info): Remove trailing spaces.

27
gdb/common/linux-osdata.c
View File

@ -26,6 +26,7 @@
#include "linux-osdata.h"
#include <sys/types.h>
#include <sys/sysinfo.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
@ -253,30 +254,8 @@ get_process_owner (uid_t *owner, PID_T pid)
return -1;
}
/* Returns the number of CPU cores found on the system. */
static int
get_number_of_cpu_cores (void)
{
int cores = 0;
FILE *f = fopen ("/proc/cpuinfo", "r");
while (!feof (f))
{
char buf[512];
char *p = fgets (buf, sizeof (buf), f);
if (p && strncmp (buf, "processor", 9) == 0)
++cores;
}
fclose (f);
return cores;
}
/* Find the CPU cores used by process PID and return them in CORES.
CORES points to an array of at least get_number_of_cpu_cores ()
CORES points to an array of at least sysconf(_SC_NPROCESSOR_ONLN)
elements. */
static int
@ -340,7 +319,7 @@ linux_xfer_osdata_processes (gdb_byte *readbuf,
dirp = opendir ("/proc");
if (dirp)
{
const int num_cores = get_number_of_cpu_cores ();
const int num_cores = sysconf (_SC_NPROCESSORS_ONLN);
struct dirent *dp;
while ((dp = readdir (dirp)) != NULL)