aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/benchmark/benchmark.h17
-rw-r--r--src/benchmark.cc4
-rw-r--r--src/benchmark_register.cc3
-rw-r--r--src/benchmark_register.h4
-rw-r--r--src/colorprint.cc2
-rw-r--r--src/commandlineflags.cc5
-rw-r--r--src/complexity.cc5
-rw-r--r--src/console_reporter.cc32
-rw-r--r--src/csv_reporter.cc15
-rw-r--r--src/cycleclock.h2
-rw-r--r--src/json_reporter.cc5
-rw-r--r--src/perf_counters.cc2
-rw-r--r--src/reporter.cc10
-rw-r--r--src/sleep.cc5
-rw-r--r--src/statistics.cc5
-rw-r--r--src/string_util.cc21
-rw-r--r--src/string_util.h7
-rw-r--r--src/sysinfo.cc59
-rw-r--r--src/timers.cc33
19 files changed, 116 insertions, 120 deletions
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
index b5b736f..d8b8cd9 100644
--- a/include/benchmark/benchmark.h
+++ b/include/benchmark/benchmark.h
@@ -243,10 +243,9 @@ BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
#define BENCHMARK_BUILTIN_EXPECT(x, y) __builtin_expect(x, y)
#define BENCHMARK_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
#define BENCHMARK_DISABLE_DEPRECATED_WARNING \
- _Pragma("GCC diagnostic push") \
+ _Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define BENCHMARK_RESTORE_DEPRECATED_WARNING \
- _Pragma("GCC diagnostic pop")
+#define BENCHMARK_RESTORE_DEPRECATED_WARNING _Pragma("GCC diagnostic pop")
#else
#define BENCHMARK_BUILTIN_EXPECT(x, y) x
#define BENCHMARK_DEPRECATED_MSG(msg)
@@ -1235,7 +1234,7 @@ class Fixture : public internal::Benchmark {
#define BENCHMARK_PRIVATE_CONCAT2(a, b, c) a##b##c
// Helper for concatenation with macro name expansion
#define BENCHMARK_PRIVATE_CONCAT_NAME(BaseClass, Method) \
- BaseClass##_##Method##_Benchmark
+ BaseClass##_##Method##_Benchmark
#define BENCHMARK_PRIVATE_DECLARE(n) \
static ::benchmark::internal::Benchmark* BENCHMARK_PRIVATE_NAME(n) \
@@ -1440,11 +1439,7 @@ struct CPUInfo {
int num_sharing;
};
- enum Scaling {
- UNKNOWN,
- ENABLED,
- DISABLED
- };
+ enum Scaling { UNKNOWN, ENABLED, DISABLED };
int num_cpus;
Scaling scaling;
@@ -1704,7 +1699,6 @@ class BENCHMARK_DEPRECATED_MSG(
std::set<std::string> user_counter_names_;
};
-
inline const char* GetTimeUnitString(TimeUnit unit) {
switch (unit) {
case kSecond:
@@ -1745,8 +1739,7 @@ inline double GetTimeUnitMultiplier(TimeUnit unit) {
std::vector<int64_t> CreateRange(int64_t lo, int64_t hi, int multi);
// Creates a list of integer values for the given range and step.
-std::vector<int64_t> CreateDenseRange(int64_t start, int64_t limit,
- int step);
+std::vector<int64_t> CreateDenseRange(int64_t start, int64_t limit, int step);
} // namespace benchmark
diff --git a/src/benchmark.cc b/src/benchmark.cc
index c7d3969..be0a237 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -617,9 +617,7 @@ void Initialize(int* argc, char** argv) {
internal::LogLevel() = FLAGS_v;
}
-void Shutdown() {
- delete internal::global_context;
-}
+void Shutdown() { delete internal::global_context; }
bool ReportUnrecognizedArguments(int argc, char** argv) {
for (int i = 1; i < argc; ++i) {
diff --git a/src/benchmark_register.cc b/src/benchmark_register.cc
index f2b32bd..0b148e2 100644
--- a/src/benchmark_register.cc
+++ b/src/benchmark_register.cc
@@ -466,8 +466,7 @@ std::vector<int64_t> CreateRange(int64_t lo, int64_t hi, int multi) {
return args;
}
-std::vector<int64_t> CreateDenseRange(int64_t start, int64_t limit,
- int step) {
+std::vector<int64_t> CreateDenseRange(int64_t start, int64_t limit, int step) {
BM_CHECK_LE(start, limit);
std::vector<int64_t> args;
for (int64_t arg = start; arg <= limit; arg += step) {
diff --git a/src/benchmark_register.h b/src/benchmark_register.h
index 7033dbf..d3f4974 100644
--- a/src/benchmark_register.h
+++ b/src/benchmark_register.h
@@ -12,8 +12,8 @@ namespace internal {
// Append the powers of 'mult' in the closed interval [lo, hi].
// Returns iterator to the start of the inserted range.
template <typename T>
-typename std::vector<T>::iterator
-AddPowers(std::vector<T>* dst, T lo, T hi, int mult) {
+typename std::vector<T>::iterator AddPowers(std::vector<T>* dst, T lo, T hi,
+ int mult) {
BM_CHECK_GE(lo, 0);
BM_CHECK_GE(hi, lo);
BM_CHECK_GE(mult, 2);
diff --git a/src/colorprint.cc b/src/colorprint.cc
index 092a4bd..1a000a0 100644
--- a/src/colorprint.cc
+++ b/src/colorprint.cc
@@ -25,8 +25,8 @@
#include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS
-#include <windows.h>
#include <io.h>
+#include <windows.h>
#else
#include <unistd.h>
#endif // BENCHMARK_OS_WINDOWS
diff --git a/src/commandlineflags.cc b/src/commandlineflags.cc
index 5724aaa..9615e35 100644
--- a/src/commandlineflags.cc
+++ b/src/commandlineflags.cc
@@ -248,9 +248,8 @@ bool ParseStringFlag(const char* str, const char* flag, std::string* value) {
return true;
}
-bool ParseKeyValueFlag(
- const char* str, const char* flag,
- std::map<std::string, std::string>* value) {
+bool ParseKeyValueFlag(const char* str, const char* flag,
+ std::map<std::string, std::string>* value) {
const char* const value_str = ParseFlagValue(str, flag, false);
if (value_str == nullptr) return false;
diff --git a/src/complexity.cc b/src/complexity.cc
index b87697f..825c573 100644
--- a/src/complexity.cc
+++ b/src/complexity.cc
@@ -15,12 +15,13 @@
// Source project : https://github.com/ismaelJimenez/cpp.leastsq
// Adapted to be used with google benchmark
-#include "benchmark/benchmark.h"
+#include "complexity.h"
#include <algorithm>
#include <cmath>
+
+#include "benchmark/benchmark.h"
#include "check.h"
-#include "complexity.h"
namespace benchmark {
diff --git a/src/console_reporter.cc b/src/console_reporter.cc
index ac2cc08..04cc0b7 100644
--- a/src/console_reporter.cc
+++ b/src/console_reporter.cc
@@ -45,7 +45,7 @@ bool ConsoleReporter::ReportContext(const Context& context) {
GetErrorStream()
<< "Color printing is only supported for stdout on windows."
" Disabling color printing\n";
- output_options_ = static_cast< OutputOptions >(output_options_ & ~OO_Color);
+ output_options_ = static_cast<OutputOptions>(output_options_ & ~OO_Color);
}
#endif
@@ -53,11 +53,12 @@ bool ConsoleReporter::ReportContext(const Context& context) {
}
void ConsoleReporter::PrintHeader(const Run& run) {
- std::string str = FormatString("%-*s %13s %15s %12s", static_cast<int>(name_field_width_),
- "Benchmark", "Time", "CPU", "Iterations");
- if(!run.counters.empty()) {
- if(output_options_ & OO_Tabular) {
- for(auto const& c : run.counters) {
+ std::string str =
+ FormatString("%-*s %13s %15s %12s", static_cast<int>(name_field_width_),
+ "Benchmark", "Time", "CPU", "Iterations");
+ if (!run.counters.empty()) {
+ if (output_options_ & OO_Tabular) {
+ for (auto const& c : run.counters) {
str += FormatString(" %10s", c.first.c_str());
}
} else {
@@ -97,7 +98,6 @@ static void IgnoreColorPrint(std::ostream& out, LogColor, const char* fmt,
va_end(args);
}
-
static std::string FormatTime(double time) {
// Align decimal places...
if (time < 1.0) {
@@ -115,8 +115,9 @@ static std::string FormatTime(double time) {
void ConsoleReporter::PrintRunData(const Run& result) {
typedef void(PrinterFn)(std::ostream&, LogColor, const char*, ...);
auto& Out = GetOutputStream();
- PrinterFn* printer = (output_options_ & OO_Color) ?
- static_cast<PrinterFn*>(ColorPrintf) : IgnoreColorPrint;
+ PrinterFn* printer = (output_options_ & OO_Color)
+ ? static_cast<PrinterFn*>(ColorPrintf)
+ : IgnoreColorPrint;
auto name_color =
(result.report_big_o || result.report_rms) ? COLOR_BLUE : COLOR_GREEN;
printer(Out, name_color, "%-*s ", name_field_width_,
@@ -134,19 +135,18 @@ void ConsoleReporter::PrintRunData(const Run& result) {
const std::string real_time_str = FormatTime(real_time);
const std::string cpu_time_str = FormatTime(cpu_time);
-
if (result.report_big_o) {
std::string big_o = GetBigOString(result.complexity);
- printer(Out, COLOR_YELLOW, "%10.2f %-4s %10.2f %-4s ", real_time, big_o.c_str(),
- cpu_time, big_o.c_str());
+ printer(Out, COLOR_YELLOW, "%10.2f %-4s %10.2f %-4s ", real_time,
+ big_o.c_str(), cpu_time, big_o.c_str());
} else if (result.report_rms) {
printer(Out, COLOR_YELLOW, "%10.0f %-4s %10.0f %-4s ", real_time * 100, "%",
cpu_time * 100, "%");
} else if (result.run_type != Run::RT_Aggregate ||
result.aggregate_unit == StatisticUnit::kTime) {
const char* timeLabel = GetTimeUnitString(result.time_unit);
- printer(Out, COLOR_YELLOW, "%s %-4s %s %-4s ", real_time_str.c_str(), timeLabel,
- cpu_time_str.c_str(), timeLabel);
+ printer(Out, COLOR_YELLOW, "%s %-4s %s %-4s ", real_time_str.c_str(),
+ timeLabel, cpu_time_str.c_str(), timeLabel);
} else {
assert(result.aggregate_unit == StatisticUnit::kPercentage);
printer(Out, COLOR_YELLOW, "%10.2f %-4s %10.2f %-4s ",
@@ -159,8 +159,8 @@ void ConsoleReporter::PrintRunData(const Run& result) {
}
for (auto& c : result.counters) {
- const std::size_t cNameLen = std::max(std::string::size_type(10),
- c.first.length());
+ const std::size_t cNameLen =
+ std::max(std::string::size_type(10), c.first.length());
std::string s;
const char* unit = "";
if (result.run_type == Run::RT_Aggregate &&
diff --git a/src/csv_reporter.cc b/src/csv_reporter.cc
index 9bd7121..1c5e9fa 100644
--- a/src/csv_reporter.cc
+++ b/src/csv_reporter.cc
@@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-
#include <algorithm>
#include <cstdint>
#include <iostream>
@@ -22,7 +19,9 @@
#include <tuple>
#include <vector>
+#include "benchmark/benchmark.h"
#include "check.h"
+#include "complexity.h"
#include "string_util.h"
#include "timers.h"
@@ -37,13 +36,17 @@ std::vector<std::string> elements = {
"error_occurred", "error_message"};
} // namespace
-std::string CsvEscape(const std::string & s) {
+std::string CsvEscape(const std::string& s) {
std::string tmp;
tmp.reserve(s.size() + 2);
for (char c : s) {
switch (c) {
- case '"' : tmp += "\"\""; break;
- default : tmp += c; break;
+ case '"':
+ tmp += "\"\"";
+ break;
+ default:
+ tmp += c;
+ break;
}
}
return '"' + tmp + '"';
diff --git a/src/cycleclock.h b/src/cycleclock.h
index f22ca9f..0db7bc4 100644
--- a/src/cycleclock.h
+++ b/src/cycleclock.h
@@ -187,7 +187,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
asm("stck %0" : "=Q"(tsc) : : "cc");
#endif
return tsc;
-#elif defined(__riscv) // RISC-V
+#elif defined(__riscv) // RISC-V
// Use RDCYCLE (and RDCYCLEH on riscv32)
#if __riscv_xlen == 32
uint32_t cycles_lo, cycles_hi0, cycles_hi1;
diff --git a/src/json_reporter.cc b/src/json_reporter.cc
index 4f7912b..e84a4ed 100644
--- a/src/json_reporter.cc
+++ b/src/json_reporter.cc
@@ -317,6 +317,7 @@ void JSONReporter::PrintRunData(Run const& run) {
out << '\n';
}
-const int64_t MemoryManager::TombstoneValue = std::numeric_limits<int64_t>::max();
-
+const int64_t MemoryManager::TombstoneValue =
+ std::numeric_limits<int64_t>::max();
+
} // end namespace benchmark
diff --git a/src/perf_counters.cc b/src/perf_counters.cc
index 4ddf0de..b2ac768 100644
--- a/src/perf_counters.cc
+++ b/src/perf_counters.cc
@@ -49,7 +49,7 @@ PerfCounters PerfCounters::Create(
const int mode = PFM_PLM3; // user mode only
for (size_t i = 0; i < counter_names.size(); ++i) {
const bool is_first = i == 0;
- struct perf_event_attr attr{};
+ struct perf_event_attr attr {};
attr.size = sizeof(attr);
const int group_id = !is_first ? counter_ids[0] : -1;
const auto& name = counter_names[i];
diff --git a/src/reporter.cc b/src/reporter.cc
index c720a9d..1d2df17 100644
--- a/src/reporter.cc
+++ b/src/reporter.cc
@@ -12,23 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "benchmark/benchmark.h"
-#include "timers.h"
-
#include <cstdlib>
-
#include <iostream>
#include <map>
#include <string>
#include <tuple>
#include <vector>
+#include "benchmark/benchmark.h"
#include "check.h"
#include "string_util.h"
+#include "timers.h"
namespace benchmark {
namespace internal {
-extern std::map<std::string, std::string>* global_context;
+extern std::map<std::string, std::string> *global_context;
}
BenchmarkReporter::BenchmarkReporter()
@@ -70,7 +68,7 @@ void BenchmarkReporter::PrintBasicContext(std::ostream *out,
}
if (internal::global_context != nullptr) {
- for (const auto& kv: *internal::global_context) {
+ for (const auto &kv : *internal::global_context) {
Out << kv.first << ": " << kv.second << "\n";
}
}
diff --git a/src/sleep.cc b/src/sleep.cc
index 4609d54..ab59000 100644
--- a/src/sleep.cc
+++ b/src/sleep.cc
@@ -35,7 +35,7 @@ void SleepForMilliseconds(int milliseconds) { Sleep(milliseconds); }
void SleepForSeconds(double seconds) {
SleepForMilliseconds(static_cast<int>(kNumMillisPerSecond * seconds));
}
-#else // BENCHMARK_OS_WINDOWS
+#else // BENCHMARK_OS_WINDOWS
void SleepForMicroseconds(int microseconds) {
#ifdef BENCHMARK_OS_ZOS
// z/OS does not support nanosleep. Instead call sleep() and then usleep() to
@@ -43,8 +43,7 @@ void SleepForMicroseconds(int microseconds) {
// argument is greater than 1000000.
div_t sleepTime = div(microseconds, kNumMicrosPerSecond);
int seconds = sleepTime.quot;
- while (seconds != 0)
- seconds = sleep(seconds);
+ while (seconds != 0) seconds = sleep(seconds);
while (usleep(sleepTime.rem) == -1 && errno == EINTR)
;
#else
diff --git a/src/statistics.cc b/src/statistics.cc
index 00ae97d..3e5ef09 100644
--- a/src/statistics.cc
+++ b/src/statistics.cc
@@ -13,15 +13,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "benchmark/benchmark.h"
+#include "statistics.h"
#include <algorithm>
#include <cmath>
#include <numeric>
#include <string>
#include <vector>
+
+#include "benchmark/benchmark.h"
#include "check.h"
-#include "statistics.h"
namespace benchmark {
diff --git a/src/string_util.cc b/src/string_util.cc
index 3551418..0f8b1fa 100644
--- a/src/string_util.cc
+++ b/src/string_util.cc
@@ -198,11 +198,10 @@ unsigned long stoul(const std::string& str, size_t* pos, int base) {
/* Check for errors and return */
if (strtoulErrno == ERANGE) {
- throw std::out_of_range(
- "stoul failed: " + str + " is outside of range of unsigned long");
+ throw std::out_of_range("stoul failed: " + str +
+ " is outside of range of unsigned long");
} else if (strEnd == strStart || strtoulErrno != 0) {
- throw std::invalid_argument(
- "stoul failed: " + str + " is not an integer");
+ throw std::invalid_argument("stoul failed: " + str + " is not an integer");
}
if (pos != nullptr) {
*pos = static_cast<size_t>(strEnd - strStart);
@@ -225,11 +224,10 @@ int stoi(const std::string& str, size_t* pos, int base) {
/* Check for errors and return */
if (strtolErrno == ERANGE || long(int(result)) != result) {
- throw std::out_of_range(
- "stoul failed: " + str + " is outside of range of int");
+ throw std::out_of_range("stoul failed: " + str +
+ " is outside of range of int");
} else if (strEnd == strStart || strtolErrno != 0) {
- throw std::invalid_argument(
- "stoul failed: " + str + " is not an integer");
+ throw std::invalid_argument("stoul failed: " + str + " is not an integer");
}
if (pos != nullptr) {
*pos = static_cast<size_t>(strEnd - strStart);
@@ -252,11 +250,10 @@ double stod(const std::string& str, size_t* pos) {
/* Check for errors and return */
if (strtodErrno == ERANGE) {
- throw std::out_of_range(
- "stoul failed: " + str + " is outside of range of int");
+ throw std::out_of_range("stoul failed: " + str +
+ " is outside of range of int");
} else if (strEnd == strStart || strtodErrno != 0) {
- throw std::invalid_argument(
- "stoul failed: " + str + " is not an integer");
+ throw std::invalid_argument("stoul failed: " + str + " is not an integer");
}
if (pos != nullptr) {
*pos = static_cast<size_t>(strEnd - strStart);
diff --git a/src/string_util.h b/src/string_util.h
index 6bc28b6..8600ed7 100644
--- a/src/string_util.h
+++ b/src/string_util.h
@@ -4,6 +4,7 @@
#include <sstream>
#include <string>
#include <utility>
+
#include "internal_macros.h"
namespace benchmark {
@@ -47,13 +48,13 @@ std::vector<std::string> StrSplit(const std::string& str, char delim);
* namespace, not std:: namespace.
*/
unsigned long stoul(const std::string& str, size_t* pos = nullptr,
- int base = 10);
+ int base = 10);
int stoi(const std::string& str, size_t* pos = nullptr, int base = 10);
double stod(const std::string& str, size_t* pos = nullptr);
#else
-using std::stoul;
-using std::stoi;
using std::stod;
+using std::stoi;
+using std::stoul;
#endif
} // end namespace benchmark
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index 937604f..1b34584 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -19,6 +19,7 @@
#undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA
#include <versionhelpers.h>
#include <windows.h>
+
#include <codecvt>
#else
#include <fcntl.h>
@@ -55,9 +56,9 @@
#include <iostream>
#include <iterator>
#include <limits>
+#include <locale>
#include <memory>
#include <sstream>
-#include <locale>
#include <utility>
#include "check.h"
@@ -147,7 +148,7 @@ ValueUnion GetSysctlImp(std::string const& Name) {
int mib[2];
mib[0] = CTL_HW;
- if ((Name == "hw.ncpu") || (Name == "hw.cpuspeed")){
+ if ((Name == "hw.ncpu") || (Name == "hw.cpuspeed")) {
ValueUnion buff(sizeof(int));
if (Name == "hw.ncpu") {
@@ -224,7 +225,8 @@ CPUInfo::Scaling CpuScaling(int num_cpus) {
for (int cpu = 0; cpu < num_cpus; ++cpu) {
std::string governor_file =
StrCat("/sys/devices/system/cpu/cpu", cpu, "/cpufreq/scaling_governor");
- if (ReadFromFile(governor_file, &res) && res != "performance") return CPUInfo::Scaling::ENABLED;
+ if (ReadFromFile(governor_file, &res) && res != "performance")
+ return CPUInfo::Scaling::ENABLED;
}
return CPUInfo::Scaling::DISABLED;
#else
@@ -368,29 +370,29 @@ std::vector<CPUInfo::CacheInfo> GetCacheSizesWindows() {
#elif BENCHMARK_OS_QNX
std::vector<CPUInfo::CacheInfo> GetCacheSizesQNX() {
std::vector<CPUInfo::CacheInfo> res;
- struct cacheattr_entry *cache = SYSPAGE_ENTRY(cacheattr);
+ struct cacheattr_entry* cache = SYSPAGE_ENTRY(cacheattr);
uint32_t const elsize = SYSPAGE_ELEMENT_SIZE(cacheattr);
- int num = SYSPAGE_ENTRY_SIZE(cacheattr) / elsize ;
- for(int i = 0; i < num; ++i ) {
+ int num = SYSPAGE_ENTRY_SIZE(cacheattr) / elsize;
+ for (int i = 0; i < num; ++i) {
CPUInfo::CacheInfo info;
- switch (cache->flags){
- case CACHE_FLAG_INSTR :
+ switch (cache->flags) {
+ case CACHE_FLAG_INSTR:
info.type = "Instruction";
info.level = 1;
break;
- case CACHE_FLAG_DATA :
+ case CACHE_FLAG_DATA:
info.type = "Data";
info.level = 1;
break;
- case CACHE_FLAG_UNIFIED :
+ case CACHE_FLAG_UNIFIED:
info.type = "Unified";
info.level = 2;
break;
- case CACHE_FLAG_SHARED :
+ case CACHE_FLAG_SHARED:
info.type = "Shared";
info.level = 3;
break;
- default :
+ default:
continue;
break;
}
@@ -418,24 +420,23 @@ std::vector<CPUInfo::CacheInfo> GetCacheSizes() {
std::string GetSystemName() {
#if defined(BENCHMARK_OS_WINDOWS)
std::string str;
- const unsigned COUNT = MAX_COMPUTERNAME_LENGTH+1;
- TCHAR hostname[COUNT] = {'\0'};
+ const unsigned COUNT = MAX_COMPUTERNAME_LENGTH + 1;
+ TCHAR hostname[COUNT] = {'\0'};
DWORD DWCOUNT = COUNT;
- if (!GetComputerName(hostname, &DWCOUNT))
- return std::string("");
+ if (!GetComputerName(hostname, &DWCOUNT)) return std::string("");
#ifndef UNICODE
str = std::string(hostname, DWCOUNT);
#else
- //Using wstring_convert, Is deprecated in C++17
+ // Using wstring_convert, Is deprecated in C++17
using convert_type = std::codecvt_utf8<wchar_t>;
std::wstring_convert<convert_type, wchar_t> converter;
std::wstring wStr(hostname, DWCOUNT);
str = converter.to_bytes(wStr);
#endif
return str;
-#else // defined(BENCHMARK_OS_WINDOWS)
+#else // defined(BENCHMARK_OS_WINDOWS)
#ifndef HOST_NAME_MAX
-#ifdef BENCHMARK_HAS_SYSCTL // BSD/Mac Doesnt have HOST_NAME_MAX defined
+#ifdef BENCHMARK_HAS_SYSCTL // BSD/Mac Doesnt have HOST_NAME_MAX defined
#define HOST_NAME_MAX 64
#elif defined(BENCHMARK_OS_NACL)
#define HOST_NAME_MAX 64
@@ -447,12 +448,12 @@ std::string GetSystemName() {
#pragma message("HOST_NAME_MAX not defined. using 64")
#define HOST_NAME_MAX 64
#endif
-#endif // def HOST_NAME_MAX
+#endif // def HOST_NAME_MAX
char hostname[HOST_NAME_MAX];
int retVal = gethostname(hostname, HOST_NAME_MAX);
if (retVal != 0) return std::string("");
return std::string(hostname);
-#endif // Catch-all POSIX block.
+#endif // Catch-all POSIX block.
}
int GetNumCPUs() {
@@ -474,8 +475,7 @@ int GetNumCPUs() {
// Returns -1 in case of a failure.
int NumCPU = sysconf(_SC_NPROCESSORS_ONLN);
if (NumCPU < 0) {
- fprintf(stderr,
- "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
+ fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
strerror(errno));
}
return NumCPU;
@@ -498,7 +498,8 @@ int GetNumCPUs() {
#if defined(__s390__)
// s390 has another format in /proc/cpuinfo
// it needs to be parsed differently
- if (SplitIdx != std::string::npos) value = ln.substr(Key.size()+1,SplitIdx-Key.size()-1);
+ if (SplitIdx != std::string::npos)
+ value = ln.substr(Key.size() + 1, SplitIdx - Key.size() - 1);
#else
if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
#endif
@@ -644,13 +645,13 @@ double GetCPUCyclesPerSecond(CPUInfo::Scaling scaling) {
"~MHz", nullptr, &data, &data_size)))
return static_cast<double>((int64_t)data *
(int64_t)(1000 * 1000)); // was mhz
-#elif defined (BENCHMARK_OS_SOLARIS)
- kstat_ctl_t *kc = kstat_open();
+#elif defined(BENCHMARK_OS_SOLARIS)
+ kstat_ctl_t* kc = kstat_open();
if (!kc) {
std::cerr << "failed to open /dev/kstat\n";
return -1;
}
- kstat_t *ksp = kstat_lookup(kc, (char*)"cpu_info", -1, (char*)"cpu_info0");
+ kstat_t* ksp = kstat_lookup(kc, (char*)"cpu_info", -1, (char*)"cpu_info0");
if (!ksp) {
std::cerr << "failed to lookup in /dev/kstat\n";
return -1;
@@ -659,7 +660,7 @@ double GetCPUCyclesPerSecond(CPUInfo::Scaling scaling) {
std::cerr << "failed to read from /dev/kstat\n";
return -1;
}
- kstat_named_t *knp =
+ kstat_named_t* knp =
(kstat_named_t*)kstat_data_lookup(ksp, (char*)"current_clock_Hz");
if (!knp) {
std::cerr << "failed to lookup data in /dev/kstat\n";
@@ -673,7 +674,7 @@ double GetCPUCyclesPerSecond(CPUInfo::Scaling scaling) {
double clock_hz = knp->value.ui64;
kstat_close(kc);
return clock_hz;
-#elif defined (BENCHMARK_OS_QNX)
+#elif defined(BENCHMARK_OS_QNX)
return static_cast<double>((int64_t)(SYSPAGE_ENTRY(cpuinfo)->speed) *
(int64_t)(1000 * 1000));
#endif
diff --git a/src/timers.cc b/src/timers.cc
index ac5b72d..21d3db2 100644
--- a/src/timers.cc
+++ b/src/timers.cc
@@ -13,6 +13,7 @@
// limitations under the License.
#include "timers.h"
+
#include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS
@@ -125,8 +126,8 @@ double ProcessCPUUsage() {
// syncronous system calls in Emscripten.
return emscripten_get_now() * 1e-3;
#elif defined(CLOCK_PROCESS_CPUTIME_ID) && !defined(BENCHMARK_OS_MACOSX)
- // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
- // https://github.com/google/benchmark/pull/292
+ // FIXME We want to use clock_gettime, but its not available in MacOS 10.11.
+ // See https://github.com/google/benchmark/pull/292
struct timespec spec;
if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &spec) == 0)
return MakeTime(spec);
@@ -149,8 +150,8 @@ double ThreadCPUUsage() {
&user_time);
return MakeTime(kernel_time, user_time);
#elif defined(BENCHMARK_OS_MACOSX)
- // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
- // https://github.com/google/benchmark/pull/292
+ // FIXME We want to use clock_gettime, but its not available in MacOS 10.11.
+ // See https://github.com/google/benchmark/pull/292
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
thread_basic_info_data_t info;
mach_port_t thread = pthread_mach_thread_np(pthread_self());
@@ -192,11 +193,14 @@ std::string LocalDateTimeString() {
long int offset_minutes;
char tz_offset_sign = '+';
// tz_offset is set in one of three ways:
- // * strftime with %z - This either returns empty or the ISO 8601 time. The maximum length an
+ // * strftime with %z - This either returns empty or the ISO 8601 time. The
+ // maximum length an
// ISO 8601 string can be is 7 (e.g. -03:30, plus trailing zero).
- // * snprintf with %c%02li:%02li - The maximum length is 41 (one for %c, up to 19 for %02li,
+ // * snprintf with %c%02li:%02li - The maximum length is 41 (one for %c, up to
+ // 19 for %02li,
// one for :, up to 19 %02li, plus trailing zero).
- // * A fixed string of "-00:00". The maximum length is 7 (-00:00, plus trailing zero).
+ // * A fixed string of "-00:00". The maximum length is 7 (-00:00, plus
+ // trailing zero).
//
// Thus, the maximum size this needs to be is 41.
char tz_offset[41];
@@ -204,10 +208,10 @@ std::string LocalDateTimeString() {
char storage[128];
#if defined(BENCHMARK_OS_WINDOWS)
- std::tm *timeinfo_p = ::localtime(&now);
+ std::tm* timeinfo_p = ::localtime(&now);
#else
std::tm timeinfo;
- std::tm *timeinfo_p = &timeinfo;
+ std::tm* timeinfo_p = &timeinfo;
::localtime_r(&now, &timeinfo);
#endif
@@ -224,10 +228,11 @@ std::string LocalDateTimeString() {
tz_offset_sign = '-';
}
- tz_len = ::snprintf(tz_offset, sizeof(tz_offset), "%c%02li:%02li",
- tz_offset_sign, offset_minutes / 100, offset_minutes % 100);
+ tz_len =
+ ::snprintf(tz_offset, sizeof(tz_offset), "%c%02li:%02li",
+ tz_offset_sign, offset_minutes / 100, offset_minutes % 100);
BM_CHECK(tz_len == kTzOffsetLen);
- ((void)tz_len); // Prevent unused variable warning in optimized build.
+ ((void)tz_len); // Prevent unused variable warning in optimized build.
} else {
// Unknown offset. RFC3339 specifies that unknown local offsets should be
// written as UTC time with -00:00 timezone.
@@ -241,8 +246,8 @@ std::string LocalDateTimeString() {
strncpy(tz_offset, "-00:00", kTzOffsetLen + 1);
}
- timestamp_len = std::strftime(storage, sizeof(storage), "%Y-%m-%dT%H:%M:%S",
- timeinfo_p);
+ timestamp_len =
+ std::strftime(storage, sizeof(storage), "%Y-%m-%dT%H:%M:%S", timeinfo_p);
BM_CHECK(timestamp_len == kTimestampLen);
// Prevent unused variable warning in optimized build.
((void)kTimestampLen);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 14:52:52 +0000