diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-01 22:31:48 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-01 22:33:54 +0200 |
commit | 472020f814a996db403a694cfecf51d16142b861 (patch) | |
tree | 711032d17672cc092e6b5c1c731b058749bdabd3 /storageframework | |
parent | 7db9ab26e5c26b0fcf4e56c1b23908ba83689a2d (diff) |
Removed storageframework.h from header files.
Diffstat (limited to 'storageframework')
24 files changed, 51 insertions, 127 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.h b/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.h index c4659bea21e..ae2ebda5fd3 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/clock/fakeclock.h @@ -8,7 +8,6 @@ #pragma once #include <vespa/storageframework/generic/clock/clock.h> -#include <vespa/storageframework/storageframework.h> #include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.h b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.h index a8fd5d597d7..a4c38d24fbd 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.h @@ -9,11 +9,9 @@ */ #pragma once -#include <vespa/storageframework/storageframework.h> +#include <vespa/storageframework/generic/clock/clock.h> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { struct RealClock : public Clock { MicroSecTime getTimeInMicros() const override; @@ -22,7 +20,4 @@ struct RealClock : public Clock { MonotonicTimePoint getMonotonicTime() const override; }; -} // defaultimplementation -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h index 41fb819ae68..247970f62ef 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h @@ -26,9 +26,7 @@ #include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/util/sync.h> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { class MemoryManager; class AllocationLogic; @@ -155,7 +153,4 @@ public: }; -} // defaultimplementation -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.h index 4cbc4da1ac5..5caf5a1d15b 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.h @@ -9,12 +9,10 @@ #pragma once #include "memorymanager.h" -#include <vespa/storageframework/storageframework.h> +#include <vespa/storageframework/generic/clock/clock.h> #include <vespa/vespalib/util/sync.h> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { class MemoryState : public vespalib::Printable { public: @@ -138,7 +136,4 @@ public: } }; -} // defaultimplementation -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp index 707f6a640a5..3e3785f67b1 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp @@ -2,13 +2,12 @@ #include "threadimpl.h" #include "threadpoolimpl.h" +#include <vespa/storageframework/generic/clock/clock.h> #include <vespa/log/log.h> LOG_SETUP(".framework.thread.impl"); -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { ThreadImpl::ThreadImpl(ThreadPoolImpl& pool, Runnable& runnable, @@ -143,6 +142,4 @@ ThreadImpl::AtomicThreadTickData::storeRelaxed( _maxWaitTimeSeenMs.store(newState._maxWaitTimeSeenMs, relaxed); } -} // defaultimplementation -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h index b31b4be3ce9..ad313f510ce 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h @@ -2,14 +2,12 @@ #pragma once +#include <vespa/storageframework/generic/thread/threadpool.h> #include <vespa/vespalib/util/document_runnable.h> -#include <vespa/storageframework/storageframework.h> #include <array> #include <atomic> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { class ThreadPoolImpl; @@ -81,6 +79,4 @@ public: const ThreadProperties& getProperties() const { return _properties; } }; -} // defaultimplementation -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h index 7f88977bbc5..173ec54f097 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h @@ -6,9 +6,7 @@ #include <vespa/fastos/thread.h> #include <vespa/vespalib/util/sync.h> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { class ThreadImpl; @@ -34,7 +32,4 @@ public: Clock& getClock() { return _clock; } }; -} // defaultimplementation -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/clock/clock.h b/storageframework/src/vespa/storageframework/generic/clock/clock.h index c7fd02385ed..69e3cfdc2d0 100644 --- a/storageframework/src/vespa/storageframework/generic/clock/clock.h +++ b/storageframework/src/vespa/storageframework/generic/clock/clock.h @@ -16,8 +16,7 @@ #include "time.h" #include <memory> -namespace storage { -namespace framework { +namespace storage::framework { struct Clock { using UP = std::unique_ptr<Clock>; @@ -32,6 +31,4 @@ struct Clock { virtual MonotonicTimePoint getMonotonicTime() const = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/clock/timer.h b/storageframework/src/vespa/storageframework/generic/clock/timer.h index ea4568fc817..505d41ea23a 100644 --- a/storageframework/src/vespa/storageframework/generic/clock/timer.h +++ b/storageframework/src/vespa/storageframework/generic/clock/timer.h @@ -8,10 +8,9 @@ #pragma once -#include <vespa/storageframework/generic/clock/clock.h> +#include "clock.h" -namespace storage { -namespace framework { +namespace storage::framework { class MilliSecTimer { const Clock* _clock; @@ -37,6 +36,4 @@ public: } }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h b/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h index 6934a9fab32..3abec2f3eb2 100644 --- a/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h +++ b/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h @@ -19,8 +19,7 @@ namespace metrics { class Metric; } -namespace storage { -namespace framework { +namespace storage::framework { class StatusReporter; class MemoryManagerInterface; @@ -75,6 +74,4 @@ struct ManagedComponent { }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/memory/memoryallocationtype.h b/storageframework/src/vespa/storageframework/generic/memory/memoryallocationtype.h index 94679212179..8bcd5f68c7c 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memoryallocationtype.h +++ b/storageframework/src/vespa/storageframework/generic/memory/memoryallocationtype.h @@ -20,8 +20,7 @@ #include <string> #include <memory> -namespace storage { -namespace framework { +namespace storage::framework { struct MemoryAllocationType { using UP = std::unique_ptr<MemoryAllocationType>; @@ -49,6 +48,4 @@ private: std::string _name; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h b/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h index b3f3c8ede21..3a9f15b5710 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h +++ b/storageframework/src/vespa/storageframework/generic/memory/memorymanagerinterface.h @@ -16,8 +16,7 @@ #include "reducememoryusageinterface.h" #include <vector> -namespace storage { -namespace framework { +namespace storage::framework { struct MemoryManagerInterface { @@ -61,6 +60,4 @@ struct MemoryManagerInterface virtual uint64_t getMemorySizeFreeForPriority(uint8_t priority) const = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h index 102656aa4f5..2b132db4434 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h +++ b/storageframework/src/vespa/storageframework/generic/memory/memorytoken.h @@ -14,8 +14,7 @@ #include <memory> -namespace storage { -namespace framework { +namespace storage::framework { class MemoryToken { protected: @@ -27,6 +26,4 @@ public: virtual bool resize(uint64_t min, uint64_t max) = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/memory/reducememoryusageinterface.h b/storageframework/src/vespa/storageframework/generic/memory/reducememoryusageinterface.h index 5baaeb2c700..d16d0983bac 100644 --- a/storageframework/src/vespa/storageframework/generic/memory/reducememoryusageinterface.h +++ b/storageframework/src/vespa/storageframework/generic/memory/reducememoryusageinterface.h @@ -14,8 +14,7 @@ #pragma once -namespace storage { -namespace framework { +namespace storage::framework { struct ReduceMemoryUsageInterface { @@ -36,10 +35,7 @@ struct ReduceMemoryUsageInterface * @param reduceBy Always in the range 0 < reduceBy <= token.size() * @return The amount of memory no longer used. */ - virtual uint64_t reduceMemoryConsumption(const MemoryToken&, - uint64_t reduceBy) = 0; + virtual uint64_t reduceMemoryConsumption(const MemoryToken&, uint64_t reduceBy) = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h index 07fdf1b5a6e..4efe00bfd9c 100644 --- a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h +++ b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h @@ -11,8 +11,7 @@ namespace vespalib { class MonitorGuard; } -namespace storage { -namespace framework { +namespace storage::framework { struct MetricUpdateHook { using MetricLockGuard = vespalib::MonitorGuard; @@ -21,6 +20,4 @@ struct MetricUpdateHook { virtual void updateMetrics(const MetricLockGuard &) = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.h b/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.h index fb9248a97b9..6eedc054a4a 100644 --- a/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.h +++ b/storageframework/src/vespa/storageframework/generic/status/htmlstatusreporter.h @@ -18,8 +18,7 @@ #include "statusreporter.h" -namespace storage { -namespace framework { +namespace storage::framework { struct HtmlStatusReporter : public StatusReporter { HtmlStatusReporter(vespalib::stringref id, vespalib::stringref name); @@ -62,6 +61,4 @@ struct PartlyHtmlStatusReporter : public HtmlStatusReporter { void reportHtmlStatus(std::ostream&, const HttpUrlPath&) const override {} }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp index e29c66a8865..4c437eaa92e 100644 --- a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp +++ b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "httpurlpath.h" +#include <vespa/vespalib/text/stringtokenizer.h> -namespace storage { -namespace framework { +namespace storage::framework { HttpUrlPath::HttpUrlPath(const vespalib::string& urlpath) : _urlPath(urlpath), @@ -69,5 +69,4 @@ HttpUrlPath::print(std::ostream& out, bool, const std::string&) const out << _urlPath; } -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h index 8c8c24c29dd..f7229a1d297 100644 --- a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h +++ b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h @@ -8,11 +8,9 @@ #include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/text/stringtokenizer.h> #include <map> -namespace storage { -namespace framework { +namespace storage::framework { class HttpUrlPath : public vespalib::Printable { vespalib::string _urlPath; @@ -56,6 +54,4 @@ T HttpUrlPath::get(const vespalib::string& id, const T& defaultValue) const return val; } -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/status/statusreporter.h b/storageframework/src/vespa/storageframework/generic/status/statusreporter.h index 0d9aa3a8e4a..8c9cd8c2a2c 100644 --- a/storageframework/src/vespa/storageframework/generic/status/statusreporter.h +++ b/storageframework/src/vespa/storageframework/generic/status/statusreporter.h @@ -18,8 +18,7 @@ #include <vespa/storageframework/generic/status/httpurlpath.h> #include <vespa/vespalib/stllike/string.h> -namespace storage { -namespace framework { +namespace storage::framework { struct StatusReporter { @@ -64,6 +63,4 @@ private: }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.h b/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.h index 98002bf1113..522a6480a75 100644 --- a/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.h +++ b/storageframework/src/vespa/storageframework/generic/status/xmlstatusreporter.h @@ -20,8 +20,7 @@ #include "statusreporter.h" #include <vespa/vespalib/util/xmlserializable.h> -namespace storage { -namespace framework { +namespace storage::framework { struct XmlStatusReporter : public StatusReporter { XmlStatusReporter(vespalib::stringref id, vespalib::stringref name); @@ -77,6 +76,4 @@ public: } }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/thread/thread.h b/storageframework/src/vespa/storageframework/generic/thread/thread.h index a40a209e980..ed0f34b9421 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/thread.h +++ b/storageframework/src/vespa/storageframework/generic/thread/thread.h @@ -19,8 +19,7 @@ namespace vespalib { class Monitor; } -namespace storage { -namespace framework { +namespace storage::framework { class Thread : public ThreadHandle { vespalib::string _id; @@ -61,6 +60,4 @@ public: void interruptAndJoin(vespalib::Monitor* m); }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/thread/threadpool.h b/storageframework/src/vespa/storageframework/generic/thread/threadpool.h index 1cecd24bdc3..711b782e600 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/threadpool.h +++ b/storageframework/src/vespa/storageframework/generic/thread/threadpool.h @@ -18,8 +18,7 @@ #include <vespa/storageframework/generic/clock/time.h> #include <vector> -namespace storage { -namespace framework { +namespace storage::framework { /** * Each thread may have different properties, as to how long they wait between @@ -94,6 +93,4 @@ struct ThreadPool { virtual void visitThreads(ThreadVisitor&) const = 0; }; -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h index 16a67cf709c..cf2389903f3 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h +++ b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h @@ -23,8 +23,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/sync.h> -namespace storage { -namespace framework { +namespace storage::framework { class ThreadPool; typedef uint32_t ThreadIndex; @@ -102,5 +101,4 @@ struct TickingThreadPool : public ThreadLock { virtual vespalib::string getStatus() = 0; }; -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/storageframework.h b/storageframework/src/vespa/storageframework/storageframework.h index 9ac5de9fafe..d6c39f5c217 100644 --- a/storageframework/src/vespa/storageframework/storageframework.h +++ b/storageframework/src/vespa/storageframework/storageframework.h @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** - * \file storageframework.h * * This file includes the most common parts used by the framework. */ |