aboutsummaryrefslogtreecommitdiff
path: root/src/sat.cc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2020-04-09 16:02:44 -0700
committerElliott Hughes <enh@google.com>2020-04-10 12:29:39 -0700
commit840a6705113a20b716ac67690bd8a7c91badb294 (patch)
treeb5381fda0b53dd45d295a0fd52d4f7cda1b0e180 /src/sat.cc
parentd621bdcd9a15346a0c9a7234deebb82972925792 (diff)
parent13bdf568b05f5a36e1374de45d37d80a2a0268c2 (diff)
downloadstressapptest-840a6705113a20b716ac67690bd8a7c91badb294.tar.gz
Upgrade to stressapptest v1.0.9.
We already had some cherrypicks from v1.0.9 in the tree for arm64 support. Fix up Android.bp to declare the cpu type. Add METADATA. Test: treehugger Change-Id: Id5a64382bb3215d8933537e1c7ed5fbc7c3347f7
Diffstat (limited to 'src/sat.cc')
-rw-r--r--src/sat.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sat.cc b/src/sat.cc
index 927ba54..0528bf2 100644
--- a/src/sat.cc
+++ b/src/sat.cc
@@ -680,7 +680,7 @@ Sat::Sat() {
strict_ = 1;
warm_ = 0;
run_on_anything_ = 0;
- use_logfile_ = 0;
+ use_logfile_ = false;
logfile_ = 0;
log_timestamps_ = true;
// Detect 32/64 bit binary.
@@ -1015,7 +1015,7 @@ bool Sat::ParseArgs(int argc, char **argv) {
// Set logfile flag.
if (strcmp(logfilename_, ""))
- use_logfile_ = 1;
+ use_logfile_ = true;
// Checks valid page length.
if (page_length_ &&
!(page_length_ & (page_length_ - 1)) &&
@@ -1430,7 +1430,7 @@ void Sat::InitializeThreads() {
reinterpret_cast<void**>(&num),
line_size, line_size * needed_lines * cc_cacheline_count_);
#else
- num = reinterpret_cast<char*>(memalign(
+ num = reinterpret_cast<int*>(memalign(
line_size, line_size * needed_lines * cc_cacheline_count_));
int err_result = (num == 0);
#endif