bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SIGAR-102] do not attempt to filter LinuxThreads in 2.6+ kernels

This commit is contained in:
Doug MacEachern 2008-05-09 04:18:17 +00:00
parent 74e788d135
commit ed23cc08e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/linux/linux_sigar.c
View File

@ -95,7 +95,7 @@ static int get_proc_signal_offset(void)
{ {
char buffer[BUFSIZ], *ptr=buffer; char buffer[BUFSIZ], *ptr=buffer;
int fields = 0; int fields = 0;
int status = sigar_file2str("/proc/self/stat", int status = sigar_file2str(PROCP_FS_ROOT "self/stat",
buffer, sizeof(buffer)); buffer, sizeof(buffer));
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
@ -210,6 +210,9 @@ char *sigar_os_error_string(sigar_t *sigar, int err)
return NULL; return NULL;
} }
/* Native POSIX Thread Library 2.6+ kernel */
#define SIGAR_HAS_NPTL (sigar->iostat == IOSTAT_DISKSTATS)
static int sigar_cpu_total_count(sigar_t *sigar) static int sigar_cpu_total_count(sigar_t *sigar)
{ {
sigar->ncpu = (int)sysconf(_SC_NPROCESSORS_CONF); sigar->ncpu = (int)sysconf(_SC_NPROCESSORS_CONF);
@ -582,12 +585,13 @@ int sigar_os_proc_list_get(sigar_t *sigar,
{ {
DIR *dirp = opendir(PROCP_FS_ROOT); DIR *dirp = opendir(PROCP_FS_ROOT);
struct dirent *ent, dbuf; struct dirent *ent, dbuf;
register const int threadbadhack = !SIGAR_HAS_NPTL;
if (!dirp) { if (!dirp) {
return errno; return errno;
} }
if (sigar->proc_signal_offset == -1) { if (threadbadhack && (sigar->proc_signal_offset == -1)) {
sigar->proc_signal_offset = get_proc_signal_offset(); sigar->proc_signal_offset = get_proc_signal_offset();
} }
@ -600,7 +604,8 @@ int sigar_os_proc_list_get(sigar_t *sigar,
continue; continue;
} }
if (proc_isthread(sigar, ent->d_name, strlen(ent->d_name))) if (threadbadhack &&
proc_isthread(sigar, ent->d_name, strlen(ent->d_name)))
{ {
continue; continue;
} }