mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-26 09:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement GetThreadCount on Linux, fix warnings.

Browse Source
This commit is contained in:
Victor Zverovich 2014-04-30 10:45:58 -07:00
parent 25ce9e7153
commit 8f06746051
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtest/gtest-all.cc
View File

@ -601,7 +601,6 @@ class GTestFlagSaver {
bool list_tests_; bool list_tests_;
String output_; String output_;
bool print_time_; bool print_time_;
bool pretty_;
internal::Int32 random_seed_; internal::Int32 random_seed_;
internal::Int32 repeat_; internal::Int32 repeat_;
bool shuffle_; bool shuffle_;
@ -7497,7 +7496,6 @@ namespace internal {
// of them. // of them.
const char kPathSeparator = '\\'; const char kPathSeparator = '\\';
const char kAlternatePathSeparator = '/'; const char kAlternatePathSeparator = '/';
const char kPathSeparatorString[] = "\\";
const char kAlternatePathSeparatorString[] = "/"; const char kAlternatePathSeparatorString[] = "/";
# if GTEST_OS_WINDOWS_MOBILE # if GTEST_OS_WINDOWS_MOBILE
// Windows CE doesn't have a current directory. You should not use // Windows CE doesn't have a current directory. You should not use
@ -7511,7 +7509,6 @@ const char kCurrentDirectoryString[] = ".\\";
# endif // GTEST_OS_WINDOWS_MOBILE # endif // GTEST_OS_WINDOWS_MOBILE
#else #else
const char kPathSeparator = '/'; const char kPathSeparator = '/';
const char kPathSeparatorString[] = "/";
const char kCurrentDirectoryString[] = "./"; const char kCurrentDirectoryString[] = "./";
#endif // GTEST_OS_WINDOWS #endif // GTEST_OS_WINDOWS
@ -7849,6 +7846,7 @@ void FilePath::Normalize() {
# include <io.h> # include <io.h>
# include <sys/stat.h> # include <sys/stat.h>
#else #else
# include <dirent.h>
# include <unistd.h> # include <unistd.h>
#endif // GTEST_OS_WINDOWS_MOBILE #endif // GTEST_OS_WINDOWS_MOBILE
@ -7900,6 +7898,22 @@ size_t GetThreadCount() {
} }
} }
#elif GTEST_OS_LINUX
// Returns the number of threads running in the process, or 0 to indicate that
// we cannot detect it.
size_t GetThreadCount() {
size_t thread_count = 0;
if (DIR *dir = opendir("/proc/self/task")) {
while (dirent *entry = readdir(dir)) {
if (entry->d_name[0] != '.')
++thread_count;
}
closedir(dir);
}
return thread_count;
}
#else #else
size_t GetThreadCount() { size_t GetThreadCount() {