From aceb4baa1b3b58d425c4c706069ec51fb594305f Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 27 Sep 2018 14:50:37 -0700 Subject: move blobs and manager header into installation dir The blobs and manager header will be used by handlers once we've transitioned to dynamic loading. Change-Id: Ieae8fcfe383007731cb4f8b2619612c3bfa47f50 Signed-off-by: Patrick Venture --- Makefile.am | 4 + blobs-ipmid/blobs.hpp | 143 +++++++++++++++++++ blobs-ipmid/manager.hpp | 253 +++++++++++++++++++++++++++++++++ blobs.hpp | 143 ------------------- example/example.hpp | 3 +- ipmi.hpp | 3 +- manager.cpp | 3 +- manager.hpp | 254 ---------------------------------- process.hpp | 2 +- test/blob_mock.hpp | 2 +- test/manager_close_unittest.cpp | 3 +- test/manager_commit_unittest.cpp | 2 +- test/manager_delete_unittest.cpp | 3 +- test/manager_getsession_unittest.cpp | 2 +- test/manager_mock.hpp | 5 +- test/manager_open_unittest.cpp | 2 +- test/manager_read_unittest.cpp | 2 +- test/manager_sessionstat_unittest.cpp | 3 +- test/manager_stat_unittest.cpp | 3 +- test/manager_unittest.cpp | 2 +- test/manager_write_unittest.cpp | 3 +- 21 files changed, 422 insertions(+), 418 deletions(-) create mode 100644 blobs-ipmid/blobs.hpp create mode 100644 blobs-ipmid/manager.hpp delete mode 100644 blobs.hpp delete mode 100644 manager.hpp diff --git a/Makefile.am b/Makefile.am index 51f7bdd..9373ea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,4 +20,8 @@ libblobcmds_la_LDFLAGS = $(SYSTEMD_LIBS) \ libblobcmds_la_CXXFLAGS = $(SYSTEMD_CFLAGS) +nobase_include_HEADERS = \ + blobs-ipmid/blobs.hpp \ + blobs-ipmid/manager.hpp + SUBDIRS = . test diff --git a/blobs-ipmid/blobs.hpp b/blobs-ipmid/blobs.hpp new file mode 100644 index 0000000..b6672b7 --- /dev/null +++ b/blobs-ipmid/blobs.hpp @@ -0,0 +1,143 @@ +#pragma once + +#include +#include + +namespace blobs +{ + +enum OpenFlags +{ + read = (1 << 0), + write = (1 << 1), + /* bits 3-7 reserved. */ + /* bits 8-15 given blob-specific definitions */ +}; + +enum StateFlags +{ + open_read = (1 << 0), + open_write = (1 << 1), + committing = (1 << 2), + committed = (1 << 3), + commit_error = (1 << 4), +}; + +struct BlobMeta +{ + uint16_t blobState; + uint32_t size; + std::vector metadata; +}; + +/* + * All blob specific objects implement this interface. + */ +class GenericBlobInterface +{ + public: + virtual ~GenericBlobInterface() = default; + + /** + * Checks if the handler will manage this file path. + * + * @param[in] blobId. + * @return bool whether it will manage the file path. + */ + virtual bool canHandleBlob(const std::string& path) = 0; + + /** + * Return the name(s) of the blob(s). Used during GetCount. + * + * @return List of blobIds this handler manages. + */ + virtual std::vector getBlobIds() = 0; + + /** + * Attempt to delete the blob specified by the path. + * + * @param[in] path - the blobId to try and delete. + * @return bool - whether it was able to delete the blob. + */ + virtual bool deleteBlob(const std::string& path) = 0; + + /** + * Return metadata about the blob. + * + * @param[in] path - the blobId for metadata. + * @param[in,out] meta - a pointer to a blobmeta. + * @return bool - true if it was successful. + */ + virtual bool stat(const std::string& path, struct BlobMeta* meta) = 0; + + /* The methods below are per session. */ + + /** + * Attempt to open a session from this path. + * + * @param[in] session - the session id. + * @param[in] flags - the open flags. + * @param[in] path - the blob path. + * @return bool - was able to open the session. + */ + virtual bool open(uint16_t session, uint16_t flags, + const std::string& path) = 0; + + /** + * Attempt to read from a blob. + * + * @param[in] session - the session id. + * @param[in] offset - offset into the blob. + * @param[in] requestedSize - number of bytes to read. + * @return Bytes read back (0 length on error). + */ + virtual std::vector read(uint16_t session, uint32_t offset, + uint32_t requestedSize) = 0; + + /** + * Attempt to write to a blob. + * + * @param[in] session - the session id. + * @param[in] offset - offset into the blob. + * @param[in] data - the data to write. + * @return bool - was able to write. + */ + virtual bool write(uint16_t session, uint32_t offset, + const std::vector& data) = 0; + + /** + * Attempt to commit to a blob. + * + * @param[in] session - the session id. + * @param[in] data - optional commit data. + * @return bool - was able to start commit. + */ + virtual bool commit(uint16_t session, const std::vector& data) = 0; + + /** + * Attempt to close your session. + * + * @param[in] session - the session id. + * @return bool - was able to close session. + */ + virtual bool close(uint16_t session) = 0; + + /** + * Attempt to return metadata for the session's view of the blob. + * + * @param[in] session - the session id. + * @param[in,out] meta - pointer to update with the BlobMeta. + * @return bool - wether it was successful. + */ + virtual bool stat(uint16_t session, struct BlobMeta* meta) = 0; + + /** + * Attempt to expire a session. This is called when a session has been + * inactive for at least 10 minutes. + * + * @param[in] session - the session id. + * @return bool - whether the session was able to be closed. + */ + virtual bool expire(uint16_t session) = 0; +}; +} // namespace blobs diff --git a/blobs-ipmid/manager.hpp b/blobs-ipmid/manager.hpp new file mode 100644 index 0000000..8220e0e --- /dev/null +++ b/blobs-ipmid/manager.hpp @@ -0,0 +1,253 @@ +#pragma once + +#include +#include +#include +#include +#include +#include + +namespace blobs +{ + +struct SessionInfo +{ + SessionInfo() = default; + SessionInfo(const std::string& path, GenericBlobInterface* handler, + uint16_t flags) : + blobId(path), + handler(handler), flags(flags) + { + } + ~SessionInfo() = default; + + std::string blobId; + GenericBlobInterface* handler; + uint16_t flags; +}; + +class ManagerInterface +{ + public: + virtual ~ManagerInterface() = default; + + virtual bool + registerHandler(std::unique_ptr handler) = 0; + + virtual uint32_t buildBlobList() = 0; + + virtual std::string getBlobId(uint32_t index) = 0; + + virtual bool open(uint16_t flags, const std::string& path, + uint16_t* session) = 0; + + virtual bool stat(const std::string& path, struct BlobMeta* meta) = 0; + + virtual bool stat(uint16_t session, struct BlobMeta* meta) = 0; + + virtual bool commit(uint16_t session, const std::vector& data) = 0; + + virtual bool close(uint16_t session) = 0; + + virtual std::vector read(uint16_t session, uint32_t offset, + uint32_t requestedSize) = 0; + + virtual bool write(uint16_t session, uint32_t offset, + const std::vector& data) = 0; + + virtual bool deleteBlob(const std::string& path) = 0; +}; + +/** + * Blob Manager used to store handlers and sessions. + */ +class BlobManager : public ManagerInterface +{ + public: + BlobManager() + { + next = static_cast(std::time(nullptr)); + }; + + ~BlobManager() = default; + /* delete copy constructor & assignment operator, only support move + * operations. + */ + BlobManager(const BlobManager&) = delete; + BlobManager& operator=(const BlobManager&) = delete; + BlobManager(BlobManager&&) = default; + BlobManager& operator=(BlobManager&&) = default; + + /** + * Register a handler. We own the pointer. + * + * @param[in] handler - a pointer to a blob handler. + * @return bool - true if registered. + */ + bool + registerHandler(std::unique_ptr handler) override; + + /** + * Builds the blobId list for enumeration. + * + * @return lowest value returned is 0, otherwise the number of + * blobIds. + */ + uint32_t buildBlobList() override; + + /** + * Grabs the blobId for the indexed blobId. + * + * @param[in] index - the index into the blobId cache. + * @return string - the blobId or empty string on failure. + */ + std::string getBlobId(uint32_t index) override; + + /** + * Attempts to open the file specified and associates with a session. + * + * @param[in] flags - the flags to pass to open. + * @param[in] path - the file path to open. + * @param[in,out] session - pointer to store the session on success. + * @return bool - true if able to open. + */ + bool open(uint16_t flags, const std::string& path, + uint16_t* session) override; + + /** + * Attempts to retrieve a BlobMeta for the specified path. + * + * @param[in] path - the file path for stat(). + * @param[in,out] meta - a pointer to store the metadata. + * @return bool - true if able to retrieve the information. + */ + bool stat(const std::string& path, struct BlobMeta* meta) override; + + /** + * Attempts to retrieve a BlobMeta for a given session. + * + * @param[in] session - the session for this command. + * @param[in,out] meta - a pointer to store the metadata. + * @return bool - true if able to retrieve the information. + */ + bool stat(uint16_t session, struct BlobMeta* meta) override; + + /** + * Attempt to commit a blob for a given session. + * + * @param[in] session - the session for this command. + * @param[in] data - an optional commit blob. + * @return bool - true if the commit succeeds. + */ + bool commit(uint16_t session, const std::vector& data) override; + + /** + * Attempt to close a session. If the handler returns a failure + * in closing, the session is kept open. + * + * @param[in] session - the session for this command. + * @return bool - true if the session was closed. + */ + bool close(uint16_t session) override; + + /** + * Attempt to read bytes from the blob. If there's a failure, such as + * an invalid offset it'll just return 0 bytes. + * + * @param[in] session - the session for this command. + * @param[in] offset - the offset from which to read. + * @param[in] requestedSize - the number of bytes to try and read. + * @return the bytes read. + */ + std::vector read(uint16_t session, uint32_t offset, + uint32_t requestedSize) override; + + /** + * Attempt to write to a blob. The manager does not track whether + * the session opened the file for writing. + * + * @param[in] session - the session for this command. + * @param[in] offset - the offset into the blob to write. + * @param[in] data - the bytes to write to the blob. + * @return bool - true if the write succeeded. + */ + bool write(uint16_t session, uint32_t offset, + const std::vector& data) override; + + /** + * Attempt to delete a blobId. This method will just call the + * handler, which will return failure if the blob doesn't support + * deletion. This command will also fail if there are any open + * sessions against the specific blob. + * + * In the case where they specify a folder, such as /blob/skm where + * the "real" blobIds are /blob/skm/1, or /blob/skm/2, the manager + * may see there are on open sessions to that specific path and will + * call the handler. In this case, the handler is responsible for + * handling any checks or logic. + * + * @param[in] path - the blobId path. + * @return bool - true if delete was successful. + */ + bool deleteBlob(const std::string& path) override; + + /** + * Attempts to return a valid unique session id. + * + * @param[in,out] - pointer to the session. + * @return bool - true if able to allocate. + */ + bool getSession(uint16_t* session); + + /** + * Given a file path will return first handler to answer that it owns + * it. + * + * @param[in] path - the file path. + * @return pointer to the handler or nullptr if not found. + */ + GenericBlobInterface* getHandler(const std::string& path); + + /** + * Given a session id will return associated handler. + * + * @param[in] session - the session. + * @return pointer to the handler or nullptr if not found. + */ + GenericBlobInterface* getHandler(uint16_t session); + + /** + * Given a session id will return associated metadata, including + * the handler and the flags passed into open. + * + * @param[in] session - the session. + * @return pointer to the information or nullptr if not found. + */ + SessionInfo* getSessionInfo(uint16_t session); + + /** + * Given a session id will return associated path. + * + * @param[in] session - the session. + * @return the path or "" on failure. + */ + std::string getPath(uint16_t session) const; + + private: + void incrementOpen(const std::string& path); + void decrementOpen(const std::string& path); + int getOpen(const std::string& path) const; + + /* The next session ID to use */ + uint16_t next; + /* Temporary list of blobIds used for enumeration. */ + std::vector ids; + /* List of Blob handler. */ + std::vector> handlers; + /* Mapping of session ids to blob handlers and the path used with open. + */ + std::unordered_map sessions; + /* Mapping of open blobIds */ + std::unordered_map openFiles; +}; +} // namespace blobs diff --git a/blobs.hpp b/blobs.hpp deleted file mode 100644 index b6672b7..0000000 --- a/blobs.hpp +++ /dev/null @@ -1,143 +0,0 @@ -#pragma once - -#include -#include - -namespace blobs -{ - -enum OpenFlags -{ - read = (1 << 0), - write = (1 << 1), - /* bits 3-7 reserved. */ - /* bits 8-15 given blob-specific definitions */ -}; - -enum StateFlags -{ - open_read = (1 << 0), - open_write = (1 << 1), - committing = (1 << 2), - committed = (1 << 3), - commit_error = (1 << 4), -}; - -struct BlobMeta -{ - uint16_t blobState; - uint32_t size; - std::vector metadata; -}; - -/* - * All blob specific objects implement this interface. - */ -class GenericBlobInterface -{ - public: - virtual ~GenericBlobInterface() = default; - - /** - * Checks if the handler will manage this file path. - * - * @param[in] blobId. - * @return bool whether it will manage the file path. - */ - virtual bool canHandleBlob(const std::string& path) = 0; - - /** - * Return the name(s) of the blob(s). Used during GetCount. - * - * @return List of blobIds this handler manages. - */ - virtual std::vector getBlobIds() = 0; - - /** - * Attempt to delete the blob specified by the path. - * - * @param[in] path - the blobId to try and delete. - * @return bool - whether it was able to delete the blob. - */ - virtual bool deleteBlob(const std::string& path) = 0; - - /** - * Return metadata about the blob. - * - * @param[in] path - the blobId for metadata. - * @param[in,out] meta - a pointer to a blobmeta. - * @return bool - true if it was successful. - */ - virtual bool stat(const std::string& path, struct BlobMeta* meta) = 0; - - /* The methods below are per session. */ - - /** - * Attempt to open a session from this path. - * - * @param[in] session - the session id. - * @param[in] flags - the open flags. - * @param[in] path - the blob path. - * @return bool - was able to open the session. - */ - virtual bool open(uint16_t session, uint16_t flags, - const std::string& path) = 0; - - /** - * Attempt to read from a blob. - * - * @param[in] session - the session id. - * @param[in] offset - offset into the blob. - * @param[in] requestedSize - number of bytes to read. - * @return Bytes read back (0 length on error). - */ - virtual std::vector read(uint16_t session, uint32_t offset, - uint32_t requestedSize) = 0; - - /** - * Attempt to write to a blob. - * - * @param[in] session - the session id. - * @param[in] offset - offset into the blob. - * @param[in] data - the data to write. - * @return bool - was able to write. - */ - virtual bool write(uint16_t session, uint32_t offset, - const std::vector& data) = 0; - - /** - * Attempt to commit to a blob. - * - * @param[in] session - the session id. - * @param[in] data - optional commit data. - * @return bool - was able to start commit. - */ - virtual bool commit(uint16_t session, const std::vector& data) = 0; - - /** - * Attempt to close your session. - * - * @param[in] session - the session id. - * @return bool - was able to close session. - */ - virtual bool close(uint16_t session) = 0; - - /** - * Attempt to return metadata for the session's view of the blob. - * - * @param[in] session - the session id. - * @param[in,out] meta - pointer to update with the BlobMeta. - * @return bool - wether it was successful. - */ - virtual bool stat(uint16_t session, struct BlobMeta* meta) = 0; - - /** - * Attempt to expire a session. This is called when a session has been - * inactive for at least 10 minutes. - * - * @param[in] session - the session id. - * @return bool - whether the session was able to be closed. - */ - virtual bool expire(uint16_t session) = 0; -}; -} // namespace blobs diff --git a/example/example.hpp b/example/example.hpp index 0ea9572..4a2df5d 100644 --- a/example/example.hpp +++ b/example/example.hpp @@ -1,7 +1,6 @@ #pragma once -#include "blobs.hpp" - +#include #include #include #include diff --git a/ipmi.hpp b/ipmi.hpp index c8b6c24..3b99e6e 100644 --- a/ipmi.hpp +++ b/ipmi.hpp @@ -1,9 +1,8 @@ #pragma once -#include "manager.hpp" - #include +#include #include namespace blobs diff --git a/manager.cpp b/manager.cpp index b6311b4..9a87b4f 100644 --- a/manager.cpp +++ b/manager.cpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#include "manager.hpp" - +#include #include #include diff --git a/manager.hpp b/manager.hpp deleted file mode 100644 index cfa62f5..0000000 --- a/manager.hpp +++ /dev/null @@ -1,254 +0,0 @@ -#pragma once - -#include "blobs.hpp" - -#include -#include -#include -#include -#include - -namespace blobs -{ - -struct SessionInfo -{ - SessionInfo() = default; - SessionInfo(const std::string& path, GenericBlobInterface* handler, - uint16_t flags) : - blobId(path), - handler(handler), flags(flags) - { - } - ~SessionInfo() = default; - - std::string blobId; - GenericBlobInterface* handler; - uint16_t flags; -}; - -class ManagerInterface -{ - public: - virtual ~ManagerInterface() = default; - - virtual bool - registerHandler(std::unique_ptr handler) = 0; - - virtual uint32_t buildBlobList() = 0; - - virtual std::string getBlobId(uint32_t index) = 0; - - virtual bool open(uint16_t flags, const std::string& path, - uint16_t* session) = 0; - - virtual bool stat(const std::string& path, struct BlobMeta* meta) = 0; - - virtual bool stat(uint16_t session, struct BlobMeta* meta) = 0; - - virtual bool commit(uint16_t session, const std::vector& data) = 0; - - virtual bool close(uint16_t session) = 0; - - virtual std::vector read(uint16_t session, uint32_t offset, - uint32_t requestedSize) = 0; - - virtual bool write(uint16_t session, uint32_t offset, - const std::vector& data) = 0; - - virtual bool deleteBlob(const std::string& path) = 0; -}; - -/** - * Blob Manager used to store handlers and sessions. - */ -class BlobManager : public ManagerInterface -{ - public: - BlobManager() - { - next = static_cast(std::time(nullptr)); - }; - - ~BlobManager() = default; - /* delete copy constructor & assignment operator, only support move - * operations. - */ - BlobManager(const BlobManager&) = delete; - BlobManager& operator=(const BlobManager&) = delete; - BlobManager(BlobManager&&) = default; - BlobManager& operator=(BlobManager&&) = default; - - /** - * Register a handler. We own the pointer. - * - * @param[in] handler - a pointer to a blob handler. - * @return bool - true if registered. - */ - bool - registerHandler(std::unique_ptr handler) override; - - /** - * Builds the blobId list for enumeration. - * - * @return lowest value returned is 0, otherwise the number of - * blobIds. - */ - uint32_t buildBlobList() override; - - /** - * Grabs the blobId for the indexed blobId. - * - * @param[in] index - the index into the blobId cache. - * @return string - the blobId or empty string on failure. - */ - std::string getBlobId(uint32_t index) override; - - /** - * Attempts to open the file specified and associates with a session. - * - * @param[in] flags - the flags to pass to open. - * @param[in] path - the file path to open. - * @param[in,out] session - pointer to store the session on success. - * @return bool - true if able to open. - */ - bool open(uint16_t flags, const std::string& path, - uint16_t* session) override; - - /** - * Attempts to retrieve a BlobMeta for the specified path. - * - * @param[in] path - the file path for stat(). - * @param[in,out] meta - a pointer to store the metadata. - * @return bool - true if able to retrieve the information. - */ - bool stat(const std::string& path, struct BlobMeta* meta) override; - - /** - * Attempts to retrieve a BlobMeta for a given session. - * - * @param[in] session - the session for this command. - * @param[in,out] meta - a pointer to store the metadata. - * @return bool - true if able to retrieve the information. - */ - bool stat(uint16_t session, struct BlobMeta* meta) override; - - /** - * Attempt to commit a blob for a given session. - * - * @param[in] session - the session for this command. - * @param[in] data - an optional commit blob. - * @return bool - true if the commit succeeds. - */ - bool commit(uint16_t session, const std::vector& data) override; - - /** - * Attempt to close a session. If the handler returns a failure - * in closing, the session is kept open. - * - * @param[in] session - the session for this command. - * @return bool - true if the session was closed. - */ - bool close(uint16_t session) override; - - /** - * Attempt to read bytes from the blob. If there's a failure, such as - * an invalid offset it'll just return 0 bytes. - * - * @param[in] session - the session for this command. - * @param[in] offset - the offset from which to read. - * @param[in] requestedSize - the number of bytes to try and read. - * @return the bytes read. - */ - std::vector read(uint16_t session, uint32_t offset, - uint32_t requestedSize) override; - - /** - * Attempt to write to a blob. The manager does not track whether - * the session opened the file for writing. - * - * @param[in] session - the session for this command. - * @param[in] offset - the offset into the blob to write. - * @param[in] data - the bytes to write to the blob. - * @return bool - true if the write succeeded. - */ - bool write(uint16_t session, uint32_t offset, - const std::vector& data) override; - - /** - * Attempt to delete a blobId. This method will just call the - * handler, which will return failure if the blob doesn't support - * deletion. This command will also fail if there are any open - * sessions against the specific blob. - * - * In the case where they specify a folder, such as /blob/skm where - * the "real" blobIds are /blob/skm/1, or /blob/skm/2, the manager - * may see there are on open sessions to that specific path and will - * call the handler. In this case, the handler is responsible for - * handling any checks or logic. - * - * @param[in] path - the blobId path. - * @return bool - true if delete was successful. - */ - bool deleteBlob(const std::string& path) override; - - /** - * Attempts to return a valid unique session id. - * - * @param[in,out] - pointer to the session. - * @return bool - true if able to allocate. - */ - bool getSession(uint16_t* session); - - /** - * Given a file path will return first handler to answer that it owns - * it. - * - * @param[in] path - the file path. - * @return pointer to the handler or nullptr if not found. - */ - GenericBlobInterface* getHandler(const std::string& path); - - /** - * Given a session id will return associated handler. - * - * @param[in] session - the session. - * @return pointer to the handler or nullptr if not found. - */ - GenericBlobInterface* getHandler(uint16_t session); - - /** - * Given a session id will return associated metadata, including - * the handler and the flags passed into open. - * - * @param[in] session - the session. - * @return pointer to the information or nullptr if not found. - */ - SessionInfo* getSessionInfo(uint16_t session); - - /** - * Given a session id will return associated path. - * - * @param[in] session - the session. - * @return the path or "" on failure. - */ - std::string getPath(uint16_t session) const; - - private: - void incrementOpen(const std::string& path); - void decrementOpen(const std::string& path); - int getOpen(const std::string& path) const; - - /* The next session ID to use */ - uint16_t next; - /* Temporary list of blobIds used for enumeration. */ - std::vector ids; - /* List of Blob handler. */ - std::vector> handlers; - /* Mapping of session ids to blob handlers and the path used with open. - */ - std::unordered_map sessions; - /* Mapping of open blobIds */ - std::unordered_map openFiles; -}; -} // namespace blobs diff --git a/process.hpp b/process.hpp index e8a9906..8f874dc 100644 --- a/process.hpp +++ b/process.hpp @@ -1,10 +1,10 @@ #pragma once #include "crc.hpp" -#include "manager.hpp" #include +#include #include namespace blobs diff --git a/test/blob_mock.hpp b/test/blob_mock.hpp index 6c21c65..3396048 100644 --- a/test/blob_mock.hpp +++ b/test/blob_mock.hpp @@ -1,6 +1,6 @@ #pragma once -#include "blobs.hpp" +#include #include diff --git a/test/manager_close_unittest.cpp b/test/manager_close_unittest.cpp index 47c9264..85ad81b 100644 --- a/test/manager_close_unittest.cpp +++ b/test/manager_close_unittest.cpp @@ -1,5 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" + +#include #include diff --git a/test/manager_commit_unittest.cpp b/test/manager_commit_unittest.cpp index b1b3c8c..e576707 100644 --- a/test/manager_commit_unittest.cpp +++ b/test/manager_commit_unittest.cpp @@ -1,6 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" +#include #include #include diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp index 9ad3afd..62a2e4c 100644 --- a/test/manager_delete_unittest.cpp +++ b/test/manager_delete_unittest.cpp @@ -1,5 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" + +#include #include diff --git a/test/manager_getsession_unittest.cpp b/test/manager_getsession_unittest.cpp index e66729a..2022146 100644 --- a/test/manager_getsession_unittest.cpp +++ b/test/manager_getsession_unittest.cpp @@ -1,4 +1,4 @@ -#include "manager.hpp" +#include #include diff --git a/test/manager_mock.hpp b/test/manager_mock.hpp index 41979ac..3a9d065 100644 --- a/test/manager_mock.hpp +++ b/test/manager_mock.hpp @@ -1,8 +1,7 @@ #pragma once -#include "blobs.hpp" -#include "manager.hpp" - +#include +#include #include #include diff --git a/test/manager_open_unittest.cpp b/test/manager_open_unittest.cpp index 309d3f6..441c204 100644 --- a/test/manager_open_unittest.cpp +++ b/test/manager_open_unittest.cpp @@ -1,6 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" +#include #include #include diff --git a/test/manager_read_unittest.cpp b/test/manager_read_unittest.cpp index 1d40f5d..5858658 100644 --- a/test/manager_read_unittest.cpp +++ b/test/manager_read_unittest.cpp @@ -1,6 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" +#include #include #include diff --git a/test/manager_sessionstat_unittest.cpp b/test/manager_sessionstat_unittest.cpp index 6ae27d3..8e4c233 100644 --- a/test/manager_sessionstat_unittest.cpp +++ b/test/manager_sessionstat_unittest.cpp @@ -1,5 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" + +#include #include diff --git a/test/manager_stat_unittest.cpp b/test/manager_stat_unittest.cpp index a13a66d..15b779e 100644 --- a/test/manager_stat_unittest.cpp +++ b/test/manager_stat_unittest.cpp @@ -1,5 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" + +#include #include diff --git a/test/manager_unittest.cpp b/test/manager_unittest.cpp index 7d4d49e..c0157e6 100644 --- a/test/manager_unittest.cpp +++ b/test/manager_unittest.cpp @@ -1,7 +1,7 @@ #include "blob_mock.hpp" -#include "manager.hpp" #include +#include #include #include diff --git a/test/manager_write_unittest.cpp b/test/manager_write_unittest.cpp index 33c6d5a..50ea7a4 100644 --- a/test/manager_write_unittest.cpp +++ b/test/manager_write_unittest.cpp @@ -1,5 +1,6 @@ #include "blob_mock.hpp" -#include "manager.hpp" + +#include #include -- cgit v1.2.3