generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reimplement scandir(3).

Browse Source 
The old scandir implementation didn't take into account the varying
size of directory entries, and didn't correctly clean up on its
error exits.

Bug: 7339844
Change-Id: Ib40e3564709752241a3119a496cbb2192e3f9abe
This commit is contained in:
Elliott Hughes
2013-02-25 13:14:31 -08:00
parent f6bb5bf498
commit 701bec2af3
5 changed files with 175 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libc/bionic/sysconf.cpp
View File

@@ -39,6 +39,8 @@
#include <time.h>
#include <unistd.h>
#include "private/ScopedReaddir.h"
/* seems to be the default on Linux, per the GLibc sources and my own digging */
#define SYSTEM_CLK_TCK 100
@@ -78,19 +80,18 @@ static bool __matches_cpuN(const char* s) {
static int __sysconf_nprocessors_conf() {
// On x86 kernels you can use /proc/cpuinfo for this, but on ARM kernels offline CPUs disappear
// from there. This method works on both.
DIR* d = opendir("/sys/devices/system/cpu");
if (!d) {
ScopedReaddir reader("/sys/devices/system/cpu");
if (reader.IsBad()) {
return 1;
}
int result = 0;
struct dirent* e;
while ((e = readdir(d)) != NULL) {
if (e->d_type == DT_DIR && __matches_cpuN(e->d_name)) {
dirent* entry;
while ((entry = reader.ReadEntry()) != NULL) {
if (entry->d_type == DT_DIR && __matches_cpuN(entry->d_name)) {
++result;
}
}
closedir(d);
return result;
}