diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-18 01:54:29 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-19 14:15:43 +0000 |
commit | 876b07cf8ce2f17d08c772381877a468feefc7b4 (patch) | |
tree | db2055d9dd68e7627c2939a2a776fb4f49d39373 /storageframework | |
parent | 6475fe524f6c5c77cc811409cbfc760776b39923 (diff) |
include only what you need.
Diffstat (limited to 'storageframework')
25 files changed, 41 insertions, 77 deletions
diff --git a/storageframework/src/tests/clock/timetest.cpp b/storageframework/src/tests/clock/timetest.cpp index c7319667ea8..c41676e5f4d 100644 --- a/storageframework/src/tests/clock/timetest.cpp +++ b/storageframework/src/tests/clock/timetest.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/storageframework/generic/clock/time.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> #include <vespa/vdstestlib/cppunit/macros.h> diff --git a/storageframework/src/tests/memory/memorymanagertest.cpp b/storageframework/src/tests/memory/memorymanagertest.cpp index 3675cc55c2d..678a40a4b44 100644 --- a/storageframework/src/tests/memory/memorymanagertest.cpp +++ b/storageframework/src/tests/memory/memorymanagertest.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storageframework/defaultimplementation/memory/memorymanager.h> #include <vespa/storageframework/defaultimplementation/memory/simplememorylogic.h> diff --git a/storageframework/src/tests/status/htmlstatustest.cpp b/storageframework/src/tests/status/htmlstatustest.cpp index 2c3ef818e8e..14c62321f50 100644 --- a/storageframework/src/tests/status/htmlstatustest.cpp +++ b/storageframework/src/tests/status/htmlstatustest.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageframework/generic/status/htmlstatusreporter.h> diff --git a/storageframework/src/tests/testrunner.cpp b/storageframework/src/tests/testrunner.cpp index 16027870c47..0d40a0429d9 100644 --- a/storageframework/src/tests/testrunner.cpp +++ b/storageframework/src/tests/testrunner.cpp @@ -1,10 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <iostream> -#include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/cppunittestrunner.h> +#include <vespa/log/log.h> LOG_SETUP("persistencecppunittests"); int diff --git a/storageframework/src/tests/thread/taskthreadtest.cpp b/storageframework/src/tests/thread/taskthreadtest.cpp index 6b524f10cf5..36d3a8abfab 100644 --- a/storageframework/src/tests/thread/taskthreadtest.cpp +++ b/storageframework/src/tests/thread/taskthreadtest.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/storageframework/generic/thread/taskthread.h> #include <vespa/vdstestlib/cppunit/macros.h> diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.cpp index cc9b01add51..c72d00fb3ac 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> +#include "fakeclock.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp index 86343a7c4ea..9e9403bb2a7 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/clock/realclock.h> - +#include "realclock.h" #include <sys/time.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.cpp index e04260a74fe..7ef2b62ecc8 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.cpp @@ -1,8 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/memory/memorymanager.h> -#include <vespa/storageframework/defaultimplementation/memory/memorystate.h> +#include "memorymanager.h" +#include "memorystate.h" #include <vespa/vespalib/util/exceptions.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp index 0c82a63792a..022e0fa54fa 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -#include <vespa/storageframework/defaultimplementation/memory/memorystate.h> +#include "memorystate.h" +#include <vespa/log/log.h> LOG_SETUP(".memory.state"); namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp index c8d8e339bb9..938c604e053 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/memory/nomemorymanager.h> +#include "nomemorymanager.h" #include <vespa/vespalib/util/exceptions.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.cpp index e7cd372d97d..9ddeeef8cd8 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.cpp @@ -1,11 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h> +#include "prioritymemorylogic.h" #include <vespa/log/log.h> -#include <vespa/vespalib/util/exceptions.h> - LOG_SETUP(".memory.logic.priority"); namespace storage { @@ -15,8 +12,7 @@ namespace defaultimplementation { PriorityMemoryLogic::PriorityMemoryLogic(Clock& c, uint64_t maxMem) : SimpleMemoryLogic(c, maxMem) { - LOG(debug, "Setup priority memory logic with max memory of %" PRIu64 " bytes", - maxMem); + LOG(debug, "Setup priority memory logic with max memory of %" PRIu64 " bytes", maxMem); } float diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp index 6e64d7e704e..b02e1944368 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp @@ -1,11 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/memory/simplememorylogic.h> +#include "simplememorylogic.h" -#include <vespa/log/log.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/log/log.h> LOG_SETUP(".memory.logic.simple"); namespace storage { @@ -18,8 +17,7 @@ SimpleMemoryLogic::SimpleMemoryLogic(Clock& c, uint64_t maxMemory) _state(c, maxMemory), _reducers() { - LOG(debug, "Setup simple memory logic with max memory of %" PRIu64 " bytes", - maxMemory); + LOG(debug, "Setup simple memory logic with max memory of %" PRIu64 " bytes", maxMemory); } void diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp index 20fd12ea959..707f6a640a5 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/thread/threadimpl.h> +#include "threadimpl.h" +#include "threadpoolimpl.h" #include <vespa/log/log.h> -#include <vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h> - LOG_SETUP(".framework.thread.impl"); namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.cpp index baf289613f0..ec2852dca30 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.cpp @@ -1,12 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h> - -#include <iostream> -#include <vespa/storageframework/defaultimplementation/thread/threadimpl.h> +#include "threadpoolimpl.h" +#include "threadimpl.h" #include <vespa/vespalib/util/exceptions.h> +using vespalib::IllegalStateException; + namespace storage { namespace framework { namespace defaultimplementation { @@ -15,8 +14,7 @@ ThreadPoolImpl::ThreadPoolImpl(Clock& clock) : _backendThreadPool(512 * 1024), _clock(clock), _stopping(false) -{ -} +{ } ThreadPoolImpl::~ThreadPoolImpl() { @@ -36,10 +34,10 @@ ThreadPoolImpl::~ThreadPoolImpl() if (_threads.empty()) break; } if (i > 1000) { - std::cerr << "Failed to kill thread pool. Threads won't die. (And " - << "if allowing thread pool object to be deleted this " - << "will create a segfault later)\n"; - assert(false); + fprintf(stderr, "Failed to kill thread pool. Threads won't die. (And " + "if allowing thread pool object to be deleted this " + "will create a segfault later)\n"); + abort(); } FastOS_Thread::Sleep(10); } @@ -55,8 +53,7 @@ ThreadPoolImpl::startThread(Runnable& runnable, { vespalib::LockGuard lock(_threadVectorLock); if (_stopping) { - throw vespalib::IllegalStateException( - "Threadpool is stopping", VESPA_STRLOC); + throw vespalib::IllegalStateException("Threadpool is stopping", VESPA_STRLOC); } ThreadImpl* ti; Thread::UP t(ti = new ThreadImpl( @@ -87,7 +84,7 @@ ThreadPoolImpl::unregisterThread(ThreadImpl& t) } } _threads.swap(threads); - } +} } // defaultimplementation } // framework diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h index 785cc5e27b7..eda78bcc13b 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h @@ -1,10 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - #pragma once -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/storageframework.h> +#include <vespa/storageframework/generic/thread/threadpool.h> +#include <vespa/fastos/thread.h> #include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/generic/component/component.cpp b/storageframework/src/vespa/storageframework/generic/component/component.cpp index 47897f8adab..18ecdda3f1c 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.cpp +++ b/storageframework/src/vespa/storageframework/generic/component/component.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/component/component.h> - -#include <vespa/storageframework/generic/component/componentregister.h> +#include "component.h" +#include "componentregister.h" #include <vespa/storageframework/generic/metric/metricregistrator.h> #include <vespa/storageframework/generic/thread/threadpool.h> #include <vespa/vespalib/util/sync.h> diff --git a/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h b/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h index 623b9e5ab1f..b3f3c8ede21 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h +++ b/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h @@ -11,9 +11,10 @@ #pragma once -#include <vespa/storageframework/generic/memory/memoryallocationtype.h> -#include <vespa/storageframework/generic/memory/memorytoken.h> -#include <vespa/storageframework/generic/memory/reducememoryusageinterface.h> +#include "memoryallocationtype.h" +#include "memorytoken.h" +#include "reducememoryusageinterface.h" +#include <vector> namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.cpp b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.cpp index d2e9376c51d..07f51939c2c 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.cpp +++ b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/memory/memorytoken.h> +#include "memorytoken.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h index ef77d802877..102656aa4f5 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h +++ b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h @@ -12,9 +12,7 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <memory> -#include <vespa/vespalib/util/linkedptr.h> namespace storage { namespace framework { @@ -23,7 +21,6 @@ class MemoryToken { protected: public: typedef std::unique_ptr<MemoryToken> UP; - typedef vespalib::LinkedPtr<MemoryToken> LP; virtual ~MemoryToken(); virtual uint64_t getSize() const = 0; diff --git a/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.cpp b/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.cpp index 25ee0315dff..24ba4edf91e 100644 --- a/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.cpp +++ b/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/status/htmlstatusreporter.h> +#include "htmlstatusreporter.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp index 6baa9a81ebe..645a745a310 100644 --- a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp +++ b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/status/httpurlpath.h> -#include <stdint.h> +#include "httpurlpath.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/status/statusreporter.cpp b/storageframework/src/vespa/storageframework/generic/status/statusreporter.cpp index a5cc9b8e7ee..cbd174a2cdf 100644 --- a/storageframework/src/vespa/storageframework/generic/status/statusreporter.cpp +++ b/storageframework/src/vespa/storageframework/generic/status/statusreporter.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/status/statusreporter.h> +#include "statusreporter.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.cpp b/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.cpp index abb70ae6aca..04ddb25bdc5 100644 --- a/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.cpp +++ b/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/status/xmlstatusreporter.h> +#include "xmlstatusreporter.h" namespace storage { namespace framework { diff --git a/storageframework/src/vespa/storageframework/generic/thread/thread.cpp b/storageframework/src/vespa/storageframework/generic/thread/thread.cpp index d943cc66bb7..d883a39bb42 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/thread.cpp +++ b/storageframework/src/vespa/storageframework/generic/thread/thread.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/thread/thread.h> +#include "thread.h" #include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/generic/thread/threadpool.cpp b/storageframework/src/vespa/storageframework/generic/thread/threadpool.cpp index bea27961edc..5d042b59940 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/threadpool.cpp +++ b/storageframework/src/vespa/storageframework/generic/thread/threadpool.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/generic/thread/threadpool.h> +#include "threadpool.h" namespace storage { namespace framework { |