diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 13:42:50 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 13:42:50 +0200 |
commit | 14d0677226e67245f22a4cba506301e9c9dbd779 (patch) | |
tree | 0271ce23c40ba29fc47bb32b0d130485b0c106dd /vespamalloc | |
parent | 476f97dae6dd7310e58e18a26a6973d9295f8815 (diff) | |
parent | a46f6dcc87f07996fbd32ecc07b4253bd563b840 (diff) |
Merge branch 'master' into aressem/vespa-compile-on-centos7
Diffstat (limited to 'vespamalloc')
-rw-r--r-- | vespamalloc/src/tests/allocfree/allocfree.cpp | 8 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/linklist.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vespamalloc/src/tests/allocfree/allocfree.cpp b/vespamalloc/src/tests/allocfree/allocfree.cpp index 0f7b4d53c6f..f1ecb74754b 100644 --- a/vespamalloc/src/tests/allocfree/allocfree.cpp +++ b/vespamalloc/src/tests/allocfree/allocfree.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> #include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> #include "producerconsumer.h" #include <map> @@ -107,9 +107,9 @@ int Test::Main() { EXPECT_EQUAL(numFreeOperations, numMallocOperations); const size_t numCrossThreadMallocFreeOperations(numMallocOperations); - fprintf(stderr, "Did %" PRIu64 " Cross thread malloc/free operations\n", numCrossThreadMallocFreeOperations); - fprintf(stderr, "Did %" PRIu64 " Same thread malloc/free operations\n", numSameThreadMallocFreeOperations); - fprintf(stderr, "Did %" PRIu64 " Total operations\n", numCrossThreadMallocFreeOperations + numSameThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Cross thread malloc/free operations\n", numCrossThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Same thread malloc/free operations\n", numSameThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Total operations\n", numCrossThreadMallocFreeOperations + numSameThreadMallocFreeOperations); TEST_DONE(); } diff --git a/vespamalloc/src/tests/allocfree/linklist.cpp b/vespamalloc/src/tests/allocfree/linklist.cpp index 5ad31d481f9..39cd237420b 100644 --- a/vespamalloc/src/tests/allocfree/linklist.cpp +++ b/vespamalloc/src/tests/allocfree/linklist.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> #include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> #include "producerconsumer.h" #include <vespamalloc/malloc/allocchunk.h> #include <vespamalloc/util/callstack.h> +#include <vespa/log/log.h> using vespalib::Consumer; using vespalib::Producer; @@ -169,13 +169,13 @@ int Test::Main() { FastOS_Thread::Sleep(1000); } pool.Close(); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkIn operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkIn operations\n", c1.operations(), c2.operations(), c1.operations() + c2.operations()); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkOut operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkOut operations\n", p1.operations(), p2.operations(), p1.operations() + p2.operations()); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkInOut operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkInOut operations\n", pc1.operationsConsumed(), pc2.operationsConsumed(), pc1.operationsConsumed() + pc2.operationsConsumed()); - fprintf(stderr, "Did %" PRIu64 " Total operations\n", + fprintf(stderr, "Did %lu Total operations\n", c1.operations() + c2.operations() + p1.operations() + p2.operations() + pc1.operationsConsumed() + pc2.operationsConsumed()); fprintf(stderr, "Start verifying result 2.\n"); for (size_t i=0; i < NumBlocks; i++) { |