libIpc separated from vasum #1 (code refactor)

[Feature]      Code refactor
                a) moved vasum::utils namspace to utils namespace
                b) moved vasum::ipc namespace to ipc namespace
                c) moved vasum::epoll namespace to ipc::epoll namespace
                d) moved common/epoll source dir to common/ipc/epoll
                e) moved UtilsException to utils namespace
                f) moved getSystemErrorMessage to utils/exception.hpp
[Cause]        N/A
[Solution]     N/A
[Verification] Build, install

Change-Id: I2cda58decfdb30ec9a27f7cb65940ae8dbc7edf3

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 9b1d890..e08c79b 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -22,7 +22,7 @@ MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Client...")
 FILE(GLOB project_SRCS *.cpp *.hpp *.h)
 
-FILE(GLOB common_SRCS ${COMMON_FOLDER}/epoll/*.hpp              ${COMMON_FOLDER}/epoll/*.cpp
+FILE(GLOB common_SRCS ${COMMON_FOLDER}/ipc/epoll/*.hpp          ${COMMON_FOLDER}/ipc/epoll/*.cpp
                       ${COMMON_FOLDER}/ipc/*.hpp                ${COMMON_FOLDER}/ipc/*.cpp
                       ${COMMON_FOLDER}/ipc/internals/*.hpp      ${COMMON_FOLDER}/ipc/internals/*.cpp
                       ${COMMON_FOLDER}/utils/*.hpp              ${COMMON_FOLDER}/utils/*.cpp

diff --git a/client/host-ipc-connection.cpp b/client/host-ipc-connection.cpp
index b17c6cf..7444f19 100644 (file)
--- a/client/host-ipc-connection.cpp
+++ b/client/host-ipc-connection.cpp
@@ -40,7 +40,7 @@ void HostIPCConnection::createSystem()
     mClient.reset(new ipc::Client(mDispatcher.getPoll(), HOST_IPC_SOCKET));
     mClient->start();
 }
-epoll::ThreadDispatcher& HostIPCConnection::getDispatcher()
+ipc::epoll::ThreadDispatcher& HostIPCConnection::getDispatcher()
 {
     return mDispatcher;
 }

diff --git a/client/host-ipc-connection.hpp b/client/host-ipc-connection.hpp
index 1497390..52b90b7 100644 (file)
--- a/client/host-ipc-connection.hpp
+++ b/client/host-ipc-connection.hpp
@@ -27,7 +27,7 @@
 #define VASUM_CLIENT_HOST_IPC_CONNECTION_HPP
 
 #include <api/messages.hpp>
-#include <epoll/thread-dispatcher.hpp>
+#include <ipc/epoll/thread-dispatcher.hpp>
 #include <ipc/client.hpp>
 
 #include <functional>
@@ -44,7 +44,7 @@ public:
     typedef std::function<void(const vasum::api::Notification&)> NotificationCallback;
     void createSystem();
     void create(const std::string& address);
-    epoll::ThreadDispatcher& getDispatcher();
+    ipc::epoll::ThreadDispatcher& getDispatcher();
 
     void callGetZoneIds(vasum::api::ZoneIds& argOut);
     void callGetActiveZoneId(vasum::api::ZoneId& argOut);
@@ -80,7 +80,7 @@ public:
     void unsubscribe(const SubscriptionId& id);
 
 private:
-    epoll::ThreadDispatcher mDispatcher;
+    ipc::epoll::ThreadDispatcher mDispatcher;
     std::unique_ptr<ipc::Client> mClient;
 };
 

diff --git a/client/vasum-client-impl.cpp b/client/vasum-client-impl.cpp
index bbc7e9e..b9af36f 100644 (file)
--- a/client/vasum-client-impl.cpp
+++ b/client/vasum-client-impl.cpp
@@ -27,6 +27,7 @@
 #include "vasum-client-impl.hpp"
 #include "utils.hpp"
 #include "exception.hpp"
+#include "utils/exception.hpp"
 #include "host-ipc-connection.hpp"
 #include "logger/logger.hpp"
 
@@ -42,6 +43,7 @@
 #include <boost/algorithm/string/classification.hpp>
 
 using namespace std;
+using namespace utils;
 using namespace vasum;
 
 namespace {
@@ -194,7 +196,7 @@ VsmStatus Client::create(const string& address) noexcept
     });
 }
 
-epoll::EventPoll& Client::getEventPoll() noexcept
+ipc::epoll::EventPoll& Client::getEventPoll() noexcept
 {
     return mHostClient.getDispatcher().getPoll();
 }

diff --git a/client/vasum-client-impl.hpp b/client/vasum-client-impl.hpp
index da6dc8f..0b96149 100644 (file)
--- a/client/vasum-client-impl.hpp
+++ b/client/vasum-client-impl.hpp
@@ -69,7 +69,7 @@ public:
      */
     VsmStatus createSystem() noexcept;
 
-    vasum::epoll::EventPoll& getEventPoll() noexcept;
+    ipc::epoll::EventPoll& getEventPoll() noexcept;
 
     /**
      * Create client.

diff --git a/common/base-exception.hpp b/common/base-exception.hpp
index 89b79bc..645fa41 100644 (file)
--- a/common/base-exception.hpp
+++ b/common/base-exception.hpp
@@ -41,13 +41,6 @@ struct VasumException: public std::runtime_error {
     VasumException(const std::string& error) : std::runtime_error(error) {}
 };
 
-/**
- * Return string describing error number
- * it is wrapper for strerror_r
- */
-std::string getSystemErrorMessage();
-std::string getSystemErrorMessage(int err);
-
 } // namespace vasum
 
 

diff --git a/common/ipc/client.cpp b/common/ipc/client.cpp
index 75a62ad..3fff662 100644 (file)
--- a/common/ipc/client.cpp
+++ b/common/ipc/client.cpp
@@ -28,7 +28,6 @@
 #include "ipc/internals/socket.hpp"
 #include "ipc/exception.hpp"
 
-namespace vasum {
 namespace ipc {
 
 Client::Client(epoll::EventPoll& eventPoll, const std::string& socketPath)
@@ -139,4 +138,3 @@ void Client::removeMethod(const MethodID methodID)
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/client.hpp b/common/ipc/client.hpp
index db15a4a..c76a817 100644 (file)
--- a/common/ipc/client.hpp
+++ b/common/ipc/client.hpp
@@ -33,7 +33,6 @@
 
 #include <string>
 
-namespace vasum {
 namespace ipc {
 
 /**
@@ -212,6 +211,5 @@ void Client::signal(const MethodID methodID,
 }
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_CLIENT_HPP

diff --git a/common/epoll/event-poll.cpp b/common/ipc/epoll/event-poll.cpp
similarity index 97%
rename from common/epoll/event-poll.cpp
rename to common/ipc/epoll/event-poll.cpp
index adca814..d43c97d 100644 (file)
--- a/common/epoll/event-poll.cpp
+++ b/common/ipc/epoll/event-poll.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "config.hpp"
-#include "epoll/event-poll.hpp"
+#include "ipc/epoll/event-poll.hpp"
 #include "utils/fd-utils.hpp"
 #include "utils/exception.hpp"
 #include "logger/logger.hpp"
@@ -33,7 +33,10 @@
 #include <string.h>
 #include <assert.h>
 
-namespace vasum {
+using namespace vasum;
+using namespace utils;
+
+namespace ipc {
 namespace epoll {
 
 EventPoll::EventPoll()
@@ -176,4 +179,4 @@ void EventPoll::removeFDInternal(const int fd)
 }
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc

diff --git a/common/epoll/event-poll.hpp b/common/ipc/epoll/event-poll.hpp
similarity index 96%
rename from common/epoll/event-poll.hpp
rename to common/ipc/epoll/event-poll.hpp
index 67614ab..5e84ee3 100644 (file)
--- a/common/epoll/event-poll.hpp
+++ b/common/ipc/epoll/event-poll.hpp
@@ -25,14 +25,14 @@
 #ifndef COMMON_EPOLL_EVENT_POLL_HPP
 #define COMMON_EPOLL_EVENT_POLL_HPP
 
-#include "epoll/events.hpp"
+#include "ipc/epoll/events.hpp"
 
 #include <functional>
 #include <mutex>
 #include <unordered_map>
 #include <memory>
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 class EventPoll {
@@ -70,6 +70,6 @@ private:
 
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc
 
 #endif // COMMON_EPOLL_EVENT_POLL_HPP

diff --git a/common/epoll/events.cpp b/common/ipc/epoll/events.cpp
similarity index 96%
rename from common/epoll/events.cpp
rename to common/ipc/epoll/events.cpp
index 1ee27e0..35952fd 100644 (file)
--- a/common/epoll/events.cpp
+++ b/common/ipc/epoll/events.cpp
@@ -23,11 +23,11 @@
  */
 
 #include "config.hpp"
-#include "epoll/events.hpp"
+#include "ipc/epoll/events.hpp"
 
 #include <sstream>
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 namespace {
@@ -68,4 +68,4 @@ std::string eventsToString(Events events)
 }
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc

diff --git a/common/epoll/events.hpp b/common/ipc/epoll/events.hpp
similarity index 96%
rename from common/epoll/events.hpp
rename to common/ipc/epoll/events.hpp
index 62eb00a..093542b 100644 (file)
--- a/common/epoll/events.hpp
+++ b/common/ipc/epoll/events.hpp
@@ -28,7 +28,7 @@
 #include <string>
 #include <sys/epoll.h> // for EPOLL* constatnts
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 typedef unsigned int Events; ///< bitmask of EPOLL* constants
@@ -36,6 +36,6 @@ typedef unsigned int Events; ///< bitmask of EPOLL* constants
 std::string eventsToString(Events events);
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc
 
 #endif // COMMON_EPOLL_EVENTS_HPP

diff --git a/common/epoll/glib-dispatcher.cpp b/common/ipc/epoll/glib-dispatcher.cpp
similarity index 96%
rename from common/epoll/glib-dispatcher.cpp
rename to common/ipc/epoll/glib-dispatcher.cpp
index 9567abb..d17ea54 100644 (file)
--- a/common/epoll/glib-dispatcher.cpp
+++ b/common/ipc/epoll/glib-dispatcher.cpp
@@ -23,10 +23,10 @@
  */
 
 #include "config.hpp"
-#include "epoll/glib-dispatcher.hpp"
+#include "ipc/epoll/glib-dispatcher.hpp"
 #include "utils/callback-wrapper.hpp"
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 GlibDispatcher::GlibDispatcher()
@@ -63,4 +63,4 @@ EventPoll& GlibDispatcher::getPoll()
 }
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc

diff --git a/common/epoll/glib-dispatcher.hpp b/common/ipc/epoll/glib-dispatcher.hpp
similarity index 94%
rename from common/epoll/glib-dispatcher.hpp
rename to common/ipc/epoll/glib-dispatcher.hpp
index 0fa7b3a..2eb58b1 100644 (file)
--- a/common/epoll/glib-dispatcher.hpp
+++ b/common/ipc/epoll/glib-dispatcher.hpp
@@ -25,12 +25,12 @@
 #ifndef COMMON_EPOLL_GLIB_DISPATCHER_HPP
 #define COMMON_EPOLL_GLIB_DISPATCHER_HPP
 
-#include "epoll/event-poll.hpp"
+#include "ipc/epoll/event-poll.hpp"
 #include "utils/callback-guard.hpp"
 
 #include <gio/gio.h>
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 /**
@@ -51,6 +51,6 @@ private:
 
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc
 
 #endif // COMMON_UTILS_GLIB_DISPATCHER_HPP

diff --git a/common/epoll/thread-dispatcher.cpp b/common/ipc/epoll/thread-dispatcher.cpp
similarity index 95%
rename from common/epoll/thread-dispatcher.cpp
rename to common/ipc/epoll/thread-dispatcher.cpp
index d286c19..fcc3d17 100644 (file)
--- a/common/epoll/thread-dispatcher.cpp
+++ b/common/ipc/epoll/thread-dispatcher.cpp
@@ -23,9 +23,9 @@
  */
 
 #include "config.hpp"
-#include "epoll/thread-dispatcher.hpp"
+#include "ipc/epoll/thread-dispatcher.hpp"
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 ThreadDispatcher::ThreadDispatcher()
@@ -57,4 +57,4 @@ EventPoll& ThreadDispatcher::getPoll()
 }
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc

diff --git a/common/epoll/thread-dispatcher.hpp b/common/ipc/epoll/thread-dispatcher.hpp
similarity index 95%
rename from common/epoll/thread-dispatcher.hpp
rename to common/ipc/epoll/thread-dispatcher.hpp
index 5c6c145..033967f 100644 (file)
--- a/common/epoll/thread-dispatcher.hpp
+++ b/common/ipc/epoll/thread-dispatcher.hpp
@@ -25,13 +25,13 @@
 #ifndef COMMON_EPOLL_THREAD_DISPATCHER_HPP
 #define COMMON_EPOLL_THREAD_DISPATCHER_HPP
 
-#include "epoll/event-poll.hpp"
+#include "ipc/epoll/event-poll.hpp"
 #include "utils/eventfd.hpp"
 
 #include <thread>
 #include <atomic>
 
-namespace vasum {
+namespace ipc {
 namespace epoll {
 
 /**
@@ -51,6 +51,6 @@ private:
 };
 
 } // namespace epoll
-} // namespace vasum
+} // namespace ipc
 
 #endif // COMMON_EPOLL_THREAD_DISPATCHER_HPP

diff --git a/common/ipc/exception.hpp b/common/ipc/exception.hpp
index 8e9a7df..3d89d3b 100644 (file)
--- a/common/ipc/exception.hpp
+++ b/common/ipc/exception.hpp
@@ -28,13 +28,12 @@
 
 #include "base-exception.hpp"
 
-namespace vasum {
 namespace ipc {
 
 /**
  * Base class for exceptions in IPC
  */
-struct IPCException: public VasumException {
+struct IPCException: public vasum::VasumException {
     IPCException(const std::string& message)
         : VasumException(message) {}
 };
@@ -90,6 +89,5 @@ private:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_EXCEPTION_HPP

diff --git a/common/ipc/internals/acceptor.cpp b/common/ipc/internals/acceptor.cpp
index 15b9ad8..604c65a 100644 (file)
--- a/common/ipc/internals/acceptor.cpp
+++ b/common/ipc/internals/acceptor.cpp
@@ -27,7 +27,6 @@
 #include "ipc/internals/acceptor.hpp"
 #include "logger/logger.hpp"
 
-namespace vasum {
 namespace ipc {
 
 Acceptor::Acceptor(const std::string& socketPath, const NewConnectionCallback& newConnectionCallback)
@@ -54,4 +53,3 @@ FileDescriptor Acceptor::getConnectionFD()
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/internals/acceptor.hpp b/common/ipc/internals/acceptor.hpp
index a6e9ec8..9725e70 100644 (file)
--- a/common/ipc/internals/acceptor.hpp
+++ b/common/ipc/internals/acceptor.hpp
@@ -32,7 +32,6 @@
 
 #include <string>
 
-namespace vasum {
 namespace ipc {
 
 /**
@@ -73,6 +72,5 @@ private:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_ACCEPTOR_HPP

diff --git a/common/ipc/internals/add-peer-request.hpp b/common/ipc/internals/add-peer-request.hpp
index 57ec06c..bb8a81f 100644 (file)
--- a/common/ipc/internals/add-peer-request.hpp
+++ b/common/ipc/internals/add-peer-request.hpp
@@ -28,7 +28,6 @@
 #include "ipc/types.hpp"
 #include "ipc/internals/socket.hpp"
 
-namespace vasum {
 namespace ipc {
 
 class AddPeerRequest {
@@ -47,6 +46,5 @@ public:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_ADD_PEER_REQUEST_HPP

diff --git a/common/ipc/internals/event-queue.hpp b/common/ipc/internals/event-queue.hpp
index b4532fd..1b13449 100644 (file)
--- a/common/ipc/internals/event-queue.hpp
+++ b/common/ipc/internals/event-queue.hpp
@@ -33,7 +33,6 @@
 #include <mutex>
 #include <queue>
 
-namespace vasum {
 namespace ipc {
 
 
@@ -119,6 +118,5 @@ bool EventQueue<MessageType>::isEmpty()
 }
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_EVENT_QUEUE_HPP

diff --git a/common/ipc/internals/finish-request.hpp b/common/ipc/internals/finish-request.hpp
index d09a14e..934c135 100644 (file)
--- a/common/ipc/internals/finish-request.hpp
+++ b/common/ipc/internals/finish-request.hpp
@@ -27,7 +27,6 @@
 
 #include <condition_variable>
 
-namespace vasum {
 namespace ipc {
 
 class FinishRequest {
@@ -43,6 +42,5 @@ public:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_FINISH_REQUEST_HPP

diff --git a/common/ipc/internals/method-request.hpp b/common/ipc/internals/method-request.hpp
index 8ec1223..663cbde 100644 (file)
--- a/common/ipc/internals/method-request.hpp
+++ b/common/ipc/internals/method-request.hpp
@@ -32,7 +32,6 @@
 #include "config/manager.hpp"
 #include <utility>
 
-namespace vasum {
 namespace ipc {
 
 class MethodRequest {
@@ -94,6 +93,5 @@ std::shared_ptr<MethodRequest> MethodRequest::create(const MethodID methodID,
 }
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_METHOD_REQUEST_HPP

diff --git a/common/ipc/internals/processor.cpp b/common/ipc/internals/processor.cpp
index 587723c..9cb86c0 100644 (file)
--- a/common/ipc/internals/processor.cpp
+++ b/common/ipc/internals/processor.cpp
@@ -36,7 +36,8 @@
 #include <sys/socket.h>
 #include <limits>
 
-namespace vasum {
+using namespace utils;
+
 namespace ipc {
 
 #define IGNORE_EXCEPTIONS(expr)                        \
@@ -728,4 +729,3 @@ std::ostream& operator<<(std::ostream& os, const Processor::Event& event)
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/internals/processor.hpp b/common/ipc/internals/processor.hpp
index 84aaa5c..ecc3a1d 100644 (file)
--- a/common/ipc/internals/processor.hpp
+++ b/common/ipc/internals/processor.hpp
@@ -54,7 +54,6 @@
 #include <unordered_map>
 #include <utility>
 
-namespace vasum {
 namespace ipc {
 
 const unsigned int DEFAULT_MAX_NUMBER_OF_PEERS = 500;
@@ -684,6 +683,5 @@ void Processor::signal(const MethodID methodID,
 
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_PROCESSOR_HPP

diff --git a/common/ipc/internals/remove-peer-request.hpp b/common/ipc/internals/remove-peer-request.hpp
index 6ef8eca..c9f7ec7 100644 (file)
--- a/common/ipc/internals/remove-peer-request.hpp
+++ b/common/ipc/internals/remove-peer-request.hpp
@@ -30,7 +30,6 @@
 #include <condition_variable>
 
 
-namespace vasum {
 namespace ipc {
 
 class RemovePeerRequest {
@@ -50,6 +49,5 @@ public:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_REMOVE_PEER_REQUEST_HPP

diff --git a/common/ipc/internals/request-queue.hpp b/common/ipc/internals/request-queue.hpp
index 44306ee..810175f 100644 (file)
--- a/common/ipc/internals/request-queue.hpp
+++ b/common/ipc/internals/request-queue.hpp
@@ -34,7 +34,6 @@
 #include <mutex>
 #include <algorithm>
 
-namespace vasum {
 namespace ipc {
 
 /**
@@ -184,6 +183,5 @@ bool RequestQueue<RequestIdType>::removeIf(Predicate predicate)
     return true;
 }
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_MESSAGE_QUEUE_HPP

diff --git a/common/ipc/internals/result-builder.hpp b/common/ipc/internals/result-builder.hpp
index 3fe3c49..97134e3 100644 (file)
--- a/common/ipc/internals/result-builder.hpp
+++ b/common/ipc/internals/result-builder.hpp
@@ -30,7 +30,6 @@
 #include <exception>
 #include <memory>
 
-namespace vasum {
 namespace ipc {
 
 class ResultBuilder {
@@ -67,7 +66,6 @@ typedef std::function<void(ResultBuilder&)> ResultBuilderHandler;
 
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_RESULT_BUILDER_HPP
 

diff --git a/common/ipc/internals/send-result-request.hpp b/common/ipc/internals/send-result-request.hpp
index bc1db6c..a6ed2b4 100644 (file)
--- a/common/ipc/internals/send-result-request.hpp
+++ b/common/ipc/internals/send-result-request.hpp
@@ -28,7 +28,6 @@
 #include "ipc/types.hpp"
 #include "logger/logger-scope.hpp"
 
-namespace vasum {
 namespace ipc {
 
 class SendResultRequest {
@@ -53,6 +52,5 @@ public:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_SEND_RESULT_REQUEST_HPP

diff --git a/common/ipc/internals/signal-request.hpp b/common/ipc/internals/signal-request.hpp
index dac9c4d..904d3f3 100644 (file)
--- a/common/ipc/internals/signal-request.hpp
+++ b/common/ipc/internals/signal-request.hpp
@@ -29,7 +29,6 @@
 #include "config/manager.hpp"
 #include "logger/logger-scope.hpp"
 
-namespace vasum {
 namespace ipc {
 
 class SignalRequest {
@@ -75,6 +74,5 @@ std::shared_ptr<SignalRequest> SignalRequest::create(const MethodID methodID,
 }
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_SIGNAL_REQUEST_HPP

diff --git a/common/ipc/internals/socket.cpp b/common/ipc/internals/socket.cpp
index 26e1c27..0654a4e 100644 (file)
--- a/common/ipc/internals/socket.cpp
+++ b/common/ipc/internals/socket.cpp
@@ -27,6 +27,7 @@
 #include "ipc/exception.hpp"
 #include "ipc/internals/socket.hpp"
 #include "utils/fd-utils.hpp"
+#include "utils/exception.hpp"
 #include "logger/logger.hpp"
 
 #include <systemd/sd-daemon.h>
@@ -38,8 +39,8 @@
 #include <cerrno>
 #include <cstring>
 
+using namespace utils;
 
-namespace vasum {
 namespace ipc {
 
 namespace {
@@ -225,4 +226,3 @@ Socket Socket::connectSocket(const std::string& path)
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/internals/socket.hpp b/common/ipc/internals/socket.hpp
index 839afe4..65f574d 100644 (file)
--- a/common/ipc/internals/socket.hpp
+++ b/common/ipc/internals/socket.hpp
@@ -29,7 +29,6 @@
 #include <mutex>
 #include <memory>
 
-namespace vasum {
 namespace ipc {
 
 /**
@@ -114,6 +113,5 @@ private:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_INTERNALS_SOCKET_HPP

diff --git a/common/ipc/ipc-gsource.cpp b/common/ipc/ipc-gsource.cpp
index 1769414..d339d50 100644 (file)
--- a/common/ipc/ipc-gsource.cpp
+++ b/common/ipc/ipc-gsource.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 
-namespace vasum {
 namespace ipc {
 
 namespace {
@@ -205,4 +204,3 @@ void  IPCGSource::finalize(GSource* gSource)
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/ipc-gsource.hpp b/common/ipc/ipc-gsource.hpp
index 87057db..ed01989 100644 (file)
--- a/common/ipc/ipc-gsource.hpp
+++ b/common/ipc/ipc-gsource.hpp
@@ -34,7 +34,6 @@
 #include <list>
 
 
-namespace vasum {
 namespace ipc {
 
 /**
@@ -143,6 +142,5 @@ private:
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_IPC_GSOURCE_HPP

diff --git a/common/ipc/method-result.cpp b/common/ipc/method-result.cpp
index 826354c..ffb97a8 100644 (file)
--- a/common/ipc/method-result.cpp
+++ b/common/ipc/method-result.cpp
@@ -27,7 +27,6 @@
 #include "ipc/method-result.hpp"
 #include "ipc/internals/processor.hpp"
 
-namespace vasum {
 namespace ipc {
 
 MethodResult::MethodResult(Processor& processor,
@@ -56,4 +55,3 @@ void MethodResult::setError(const int code, const std::string& message)
 }
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/method-result.hpp b/common/ipc/method-result.hpp
index ebe9697..bd9d10f 100644 (file)
--- a/common/ipc/method-result.hpp
+++ b/common/ipc/method-result.hpp
@@ -29,7 +29,6 @@
 #include "logger/logger.hpp"
 #include <memory>
 
-namespace vasum {
 namespace ipc {
 
 class Processor;
@@ -70,6 +69,5 @@ struct MethodHandler {
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_METHOD_RESULT_HPP

diff --git a/common/ipc/result.hpp b/common/ipc/result.hpp
index 0edf172..9069fd5 100644 (file)
--- a/common/ipc/result.hpp
+++ b/common/ipc/result.hpp
@@ -29,7 +29,6 @@
 #include <exception>
 #include <memory>
 
-namespace vasum {
 namespace ipc {
 
 template<typename Data>
@@ -69,6 +68,5 @@ struct ResultHandler {
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_RESULT_HPP

diff --git a/common/ipc/service.cpp b/common/ipc/service.cpp
index d4e1b88..48d8c96 100644 (file)
--- a/common/ipc/service.cpp
+++ b/common/ipc/service.cpp
@@ -30,7 +30,6 @@
 
 using namespace std::placeholders;
 
-namespace vasum {
 namespace ipc {
 
 Service::Service(epoll::EventPoll& eventPoll,
@@ -149,4 +148,3 @@ void Service::removeMethod(const MethodID methodID)
 
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/service.hpp b/common/ipc/service.hpp
index 32b604f..8f6f62b 100644 (file)
--- a/common/ipc/service.hpp
+++ b/common/ipc/service.hpp
@@ -34,7 +34,6 @@
 
 #include <string>
 
-namespace vasum {
 namespace ipc {
 
 
@@ -220,6 +219,5 @@ void Service::signal(const MethodID methodID,
 }
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_SERVICE_HPP

diff --git a/common/ipc/types.cpp b/common/ipc/types.cpp
index 9854e0e..0961b35 100644 (file)
--- a/common/ipc/types.cpp
+++ b/common/ipc/types.cpp
@@ -29,7 +29,6 @@
 
 #include <atomic>
 
-namespace vasum {
 namespace ipc {
 
 namespace {
@@ -49,4 +48,3 @@ PeerID getNextPeerID()
 
 
 } // namespace ipc
-} // namespace vasum

diff --git a/common/ipc/types.hpp b/common/ipc/types.hpp
index 3fec337..ab4ed00 100644 (file)
--- a/common/ipc/types.hpp
+++ b/common/ipc/types.hpp
@@ -29,7 +29,6 @@
 #include <memory>
 #include <string>
 
-namespace vasum {
 namespace ipc {
 
 typedef int FileDescriptor;
@@ -52,6 +51,5 @@ struct SignalHandler {
 };
 
 } // namespace ipc
-} // namespace vasum
 
 #endif // COMMON_IPC_TYPES_HPP

diff --git a/common/netlink/netlink.cpp b/common/netlink/netlink.cpp
index e5cf8a7..633276a 100644 (file)
--- a/common/netlink/netlink.cpp
+++ b/common/netlink/netlink.cpp
@@ -25,7 +25,7 @@
 #include "config.hpp"
 #include "netlink.hpp"
 #include "utils.hpp"
-#include "base-exception.hpp"
+#include "utils/exception.hpp"
 #include "utils/make-clean.hpp"
 #include "utils/environment.hpp"
 
@@ -40,6 +40,7 @@
 #define PAGE_SIZE 4096
 #endif
 
+using namespace utils;
 using namespace vasum;
 
 namespace {

diff --git a/common/utils/c-array.hpp b/common/utils/c-array.hpp
index 68fa816..d238e4a 100644 (file)
--- a/common/utils/c-array.hpp
+++ b/common/utils/c-array.hpp
@@ -27,7 +27,6 @@
 
 #include <vector>
 
-namespace vasum {
 namespace utils {
 
 template<typename T>
@@ -67,7 +66,6 @@ private:
 typedef CArrayBuilder<const char*> CStringArrayBuilder;
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_C_ARRAY_HPP

diff --git a/common/utils/callback-guard.cpp b/common/utils/callback-guard.cpp
index b0ce7dd..c3deca1 100644 (file)
--- a/common/utils/callback-guard.cpp
+++ b/common/utils/callback-guard.cpp
@@ -31,7 +31,6 @@
 #include <cassert>
 
 
-namespace vasum {
 namespace utils {
 
 // Reference counting class like shared_ptr but with the ability to wait for it.
@@ -127,4 +126,3 @@ bool CallbackGuard::waitForTrackers(const unsigned int timeoutMs)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/callback-guard.hpp b/common/utils/callback-guard.hpp
index d28e707..7cb299b 100644 (file)
--- a/common/utils/callback-guard.hpp
+++ b/common/utils/callback-guard.hpp
@@ -29,7 +29,6 @@
 #include <memory>
 
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -73,7 +72,6 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_CALLBACK_GUARD_HPP

diff --git a/common/utils/callback-wrapper.hpp b/common/utils/callback-wrapper.hpp
index fd5a4c0..fbf8455 100644 (file)
--- a/common/utils/callback-wrapper.hpp
+++ b/common/utils/callback-wrapper.hpp
@@ -28,7 +28,6 @@
 #include "callback-guard.hpp"
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -86,7 +85,6 @@ const Callback& getCallbackFromPointer(const void* pointer)
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_CALLBACK_WRAPPER_HPP

diff --git a/common/utils/counting-map.hpp b/common/utils/counting-map.hpp
index da5f4c7..a05f76a 100644 (file)
--- a/common/utils/counting-map.hpp
+++ b/common/utils/counting-map.hpp
@@ -27,7 +27,6 @@
 
 #include <unordered_map>
 
-namespace vasum {
 namespace utils {
 
 
@@ -82,7 +81,6 @@ private:
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_COUNTING_MAP_HPP

diff --git a/common/utils/environment.cpp b/common/utils/environment.cpp
index 209f9ba..7bd7d07 100644 (file)
--- a/common/utils/environment.cpp
+++ b/common/utils/environment.cpp
@@ -26,6 +26,7 @@
 
 #include "utils/environment.hpp"
 #include "utils/execute.hpp"
+#include "utils/exception.hpp"
 #include "utils/make-clean.hpp"
 #include "base-exception.hpp"
 #include "logger/logger.hpp"
@@ -60,7 +61,7 @@ static inline int setns(int fd, int nstype)
 
 #endif
 
-using namespace vasum::utils;
+using namespace utils;
 
 namespace {
 
@@ -126,7 +127,6 @@ bool fdSend(int socket, int fd)
 
 } // namespace
 
-namespace vasum {
 namespace utils {
 
 
@@ -223,7 +223,7 @@ int passNemaspacedFd(int nsPid, int ns, const std::function<int()>& fdFactory)
     int fds[2];
     int ret = socketpair(PF_LOCAL, SOCK_RAW, 0, fds);
     if (ret == -1) {
-        LOGE("Can't create socket pair: " << vasum::getSystemErrorMessage());
+        LOGE("Can't create socket pair: " << getSystemErrorMessage());
         return -1;
     }
     bool success = executeAndWait([&, fds, nsPid, ns]() {
@@ -254,4 +254,3 @@ int passNemaspacedFd(int nsPid, int ns, const std::function<int()>& fdFactory)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/environment.hpp b/common/utils/environment.hpp
index d63ac16..b4e3194 100644 (file)
--- a/common/utils/environment.hpp
+++ b/common/utils/environment.hpp
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -63,7 +62,6 @@ bool joinToNs(int nsPid, int ns);
 int passNemaspacedFd(int nsPid, int ns, const std::function<int()>& fdFactory);
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_ENVIRONMENT_HPP

diff --git a/common/utils/eventfd.cpp b/common/utils/eventfd.cpp
index d69d572..a1b45e9 100644 (file)
--- a/common/utils/eventfd.cpp
+++ b/common/utils/eventfd.cpp
@@ -34,7 +34,8 @@
 #include <cstring>
 #include <cstdint>
 
-namespace vasum {
+using namespace vasum;
+
 namespace utils {
 
 EventFD::EventFD()
@@ -71,4 +72,3 @@ void EventFD::receive()
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/eventfd.hpp b/common/utils/eventfd.hpp
index b3d5027..f49bbff 100644 (file)
--- a/common/utils/eventfd.hpp
+++ b/common/utils/eventfd.hpp
@@ -25,7 +25,6 @@
 #ifndef COMMON_UTILS_EVENTFD_HPP
 #define COMMON_UTILS_EVENTFD_HPP
 
-namespace vasum {
 namespace utils {
 
 class EventFD {
@@ -58,6 +57,5 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_EVENTFD_HPP

diff --git a/common/base-exception.cpp b/common/utils/exception.cpp
similarity index 89%
rename from common/base-exception.cpp
rename to common/utils/exception.cpp
index 628296d..ae69618 100644 (file)
--- a/common/base-exception.cpp
+++ b/common/utils/exception.cpp
@@ -19,16 +19,16 @@
 /**
  * @file
  * @author  Mateusz Malicki (m.malicki2@samsung.com)
- * @brief   Vasum base exception implementation
+ * @brief   Utils base exception helper implementation
  */
 
-#include "base-exception.hpp"
+#include "utils/exception.hpp"
 
 #include <string>
 #include <cstring>
 #include <cerrno>
 
-namespace vasum {
+namespace utils {
 
 const int ERROR_MESSAGE_BUFFER_CAPACITY = 256;
 
@@ -43,4 +43,4 @@ std::string getSystemErrorMessage(int err)
     return strerror_r(err, buf, sizeof(buf));
 }
 
-} // namespace vasum
+} // namespace utils

diff --git a/common/utils/exception.hpp b/common/utils/exception.hpp
index 32f416c..49aceb8 100644 (file)
--- a/common/utils/exception.hpp
+++ b/common/utils/exception.hpp
@@ -29,18 +29,24 @@
 #include "base-exception.hpp"
 
 
-namespace vasum {
+namespace utils {
 
 
 /**
  * Base class for exceptions in utils
  */
-struct UtilsException: public VasumException {
+struct UtilsException: public vasum::VasumException {
 
-    UtilsException(const std::string& error) : VasumException(error) {}
+    UtilsException(const std::string& error) : vasum::VasumException(error) {}
 };
 
+/**
+ * Return string describing error number
+ * it is wrapper for strerror_r
+ */
+std::string getSystemErrorMessage();
+std::string getSystemErrorMessage(int err);
 
-} // namespace vasum
+} // namespace utils
 
 #endif // COMMON_UTILS_EXCEPTION_HPP

diff --git a/common/utils/execute.cpp b/common/utils/execute.cpp
index 4e8eebf..d030177 100644 (file)
--- a/common/utils/execute.cpp
+++ b/common/utils/execute.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "config.hpp"
-#include "base-exception.hpp"
+#include "utils/exception.hpp"
 #include "utils/execute.hpp"
 #include "logger/logger.hpp"
 
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -74,7 +73,7 @@ bool executeAndWait(const std::function<void()>& func, int& status)
 
     pid_t pid = fork();
     if (pid == -1) {
-        LOGE("Fork failed: " << vasum::getSystemErrorMessage());
+        LOGE("Fork failed: " << getSystemErrorMessage());
         return false;
     }
     if (pid == 0) {
@@ -128,4 +127,3 @@ bool waitPid(pid_t pid, int& status)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/execute.hpp b/common/utils/execute.hpp
index 8f7fd56..bc5cf9d 100644 (file)
--- a/common/utils/execute.hpp
+++ b/common/utils/execute.hpp
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <functional>
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -55,7 +54,6 @@ bool executeAndWait(const std::function<void()>& func);
 bool waitPid(pid_t pid, int& status);
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_EXECUTE_HPP

diff --git a/common/utils/fd-utils.cpp b/common/utils/fd-utils.cpp
index 17448b5..95080ff 100644 (file)
--- a/common/utils/fd-utils.cpp
+++ b/common/utils/fd-utils.cpp
@@ -39,7 +39,8 @@
 namespace fs = boost::filesystem;
 namespace chr = std::chrono;
 
-namespace vasum {
+using namespace vasum;
+
 namespace utils {
 
 namespace {
@@ -202,5 +203,4 @@ unsigned int getFDNumber()
 }
 
 } // namespace utils
-} // namespace vasum
 

diff --git a/common/utils/fd-utils.hpp b/common/utils/fd-utils.hpp
index ac32b0a..151eb1c 100644 (file)
--- a/common/utils/fd-utils.hpp
+++ b/common/utils/fd-utils.hpp
@@ -27,7 +27,6 @@
 
 #include <cstddef>
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -73,6 +72,5 @@ void setMaxFDNumber(unsigned int limit);
 unsigned int getFDNumber();
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_FD_HPP

diff --git a/common/utils/file-wait.cpp b/common/utils/file-wait.cpp
index f89ada6..4949314 100644 (file)
--- a/common/utils/file-wait.cpp
+++ b/common/utils/file-wait.cpp
@@ -30,8 +30,8 @@
 #include <unistd.h>
 #include <stdexcept>
 
+using namespace vasum;
 
-namespace vasum {
 namespace utils {
 
 
@@ -56,4 +56,3 @@ void waitForFile(const std::string& filename, const unsigned int timeoutMs)
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/file-wait.hpp b/common/utils/file-wait.hpp
index 9029c6e..02b361e 100644 (file)
--- a/common/utils/file-wait.hpp
+++ b/common/utils/file-wait.hpp
@@ -28,7 +28,6 @@
 #include <string>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -38,7 +37,6 @@ void waitForFile(const std::string& filename, const unsigned int timeoutMs);
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_FILE_WAIT_HPP

diff --git a/common/utils/fs.cpp b/common/utils/fs.cpp
index e4dcd7f..5581a29 100644 (file)
--- a/common/utils/fs.cpp
+++ b/common/utils/fs.cpp
@@ -45,7 +45,8 @@
 
 namespace fs = boost::filesystem;
 
-namespace vasum {
+using namespace vasum;
+
 namespace utils {
 
 
@@ -527,4 +528,3 @@ bool createLink(const std::string& src, const std::string& dest)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/fs.hpp b/common/utils/fs.hpp
index b2e05b6..bff2e70 100644 (file)
--- a/common/utils/fs.hpp
+++ b/common/utils/fs.hpp
@@ -31,7 +31,6 @@
 #include <boost/filesystem.hpp>
 
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -149,7 +148,6 @@ bool copyFile(const std::string& src, const std::string& dest);
 bool createLink(const std::string& src, const std::string& dest);
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_FS_HPP

diff --git a/common/utils/glib-loop.cpp b/common/utils/glib-loop.cpp
index dd82204..0ce15d9 100644 (file)
--- a/common/utils/glib-loop.cpp
+++ b/common/utils/glib-loop.cpp
@@ -30,7 +30,6 @@
 #include <cassert>
 #include <glib-object.h>
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -85,4 +84,3 @@ gboolean Glib::onTimerEvent(gpointer data)
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/glib-loop.hpp b/common/utils/glib-loop.hpp
index 8db43b6..0c5a459 100644 (file)
--- a/common/utils/glib-loop.hpp
+++ b/common/utils/glib-loop.hpp
@@ -32,7 +32,6 @@
 #include <glib.h>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -81,7 +80,6 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_GLIB_LOOP_HPP

diff --git a/common/utils/glib-utils.cpp b/common/utils/glib-utils.cpp
index 93cbff9..fcd2f35 100644 (file)
--- a/common/utils/glib-utils.cpp
+++ b/common/utils/glib-utils.cpp
@@ -28,7 +28,6 @@
 
 #include <glib-object.h>
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -56,4 +55,3 @@ void executeInGlibThread(const VoidCallback& callback, const CallbackGuard& guar
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/glib-utils.hpp b/common/utils/glib-utils.hpp
index eaeeee8..a818230 100644 (file)
--- a/common/utils/glib-utils.hpp
+++ b/common/utils/glib-utils.hpp
@@ -27,7 +27,6 @@
 
 #include "utils/callback-guard.hpp"
 
-namespace vasum {
 namespace utils {
 
 typedef std::function<void()> VoidCallback;
@@ -39,6 +38,5 @@ void executeInGlibThread(const VoidCallback& callback, const CallbackGuard& guar
 
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_GLIB_UTILS_HPP

diff --git a/common/utils/img.cpp b/common/utils/img.cpp
index 785291c..20f6daf 100644 (file)
--- a/common/utils/img.cpp
+++ b/common/utils/img.cpp
@@ -27,13 +27,12 @@
 #include "utils/img.hpp"
 #include "utils/fs.hpp"
 #include "utils/paths.hpp"
-#include "base-exception.hpp"
+#include "utils/exception.hpp"
 
 #include <sys/mount.h>
 #include <fcntl.h>
 #include <linux/loop.h>
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -238,4 +237,3 @@ bool copyImageContents(const std::string& img, const std::string& dst)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/img.hpp b/common/utils/img.hpp
index 8782ae2..de04fdc 100644 (file)
--- a/common/utils/img.hpp
+++ b/common/utils/img.hpp
@@ -25,7 +25,6 @@
 #ifndef COMMON_UTILS_IMG_HPP
 #define COMMON_UTILS_IMG_HPP
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -50,6 +49,5 @@ bool umountImage(const std::string& path, const std::string& loopdev);
 bool copyImageContents(const std::string& img, const std::string& dst);
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_IMG_HPP

diff --git a/common/utils/initctl.cpp b/common/utils/initctl.cpp
index 5986799..55e8cfd 100644 (file)
--- a/common/utils/initctl.cpp
+++ b/common/utils/initctl.cpp
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -87,4 +86,3 @@ bool setRunLevel(RunLevel runLevel)
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/initctl.hpp b/common/utils/initctl.hpp
index 97f4ca4..d81c7bc 100644 (file)
--- a/common/utils/initctl.hpp
+++ b/common/utils/initctl.hpp
@@ -26,7 +26,6 @@
 #define COMMON_UTILS_INITCTL_HPP
 
 
-namespace vasum {
 namespace utils {
 
 enum RunLevel : int {
@@ -38,7 +37,6 @@ bool setRunLevel(RunLevel runLevel);
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_INITCTL_HPP

diff --git a/common/utils/latch.cpp b/common/utils/latch.cpp
index e4b3649..4889946 100644 (file)
--- a/common/utils/latch.cpp
+++ b/common/utils/latch.cpp
@@ -28,7 +28,6 @@
 #include <cassert>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -81,4 +80,3 @@ bool Latch::empty()
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/latch.hpp b/common/utils/latch.hpp
index 7ef1dd7..ad48475 100644 (file)
--- a/common/utils/latch.hpp
+++ b/common/utils/latch.hpp
@@ -29,7 +29,6 @@
 #include <condition_variable>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -89,7 +88,6 @@ private:
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_LATCH_HPP

diff --git a/common/utils/make-clean.hpp b/common/utils/make-clean.hpp
index 1d551ef..18fe6d7 100644 (file)
--- a/common/utils/make-clean.hpp
+++ b/common/utils/make-clean.hpp
@@ -28,7 +28,6 @@
 #include <algorithm>
 #include <type_traits>
 
-namespace vasum {
 namespace utils {
 
 template<class T>
@@ -47,7 +46,6 @@ T make_clean()
 }
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_MAKE_CLEAN_HPP

diff --git a/common/utils/paths.hpp b/common/utils/paths.hpp
index b86333f..26ebde6 100644 (file)
--- a/common/utils/paths.hpp
+++ b/common/utils/paths.hpp
@@ -30,7 +30,6 @@
 #include <algorithm>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -121,7 +120,6 @@ inline std::string getAbsolutePath(const std::string& path, const std::string& b
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_PATHS_HPP

diff --git a/common/utils/same-thread-guard.cpp b/common/utils/same-thread-guard.cpp
index 5b54c73..65621d4 100644 (file)
--- a/common/utils/same-thread-guard.cpp
+++ b/common/utils/same-thread-guard.cpp
@@ -30,7 +30,6 @@
 #include "logger/logger.hpp"
 #include "logger/formatter.hpp"
 
-namespace vasum {
 namespace utils {
 
 namespace {
@@ -70,6 +69,5 @@ void SameThreadGuard::reset()
 }
 
 } // namespace utils
-} // namespace vasum
 
 #endif // ENABLE_SAME_THREAD_GUARD

diff --git a/common/utils/same-thread-guard.hpp b/common/utils/same-thread-guard.hpp
index fd697fd..3a173b5 100644 (file)
--- a/common/utils/same-thread-guard.hpp
+++ b/common/utils/same-thread-guard.hpp
@@ -34,7 +34,6 @@
 #include <cassert>
 #endif
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -74,7 +73,6 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_SAME_THREAD_GUARD_HPP

diff --git a/common/utils/scoped-gerror.cpp b/common/utils/scoped-gerror.cpp
index 0e4de47..92e0dd2 100644 (file)
--- a/common/utils/scoped-gerror.cpp
+++ b/common/utils/scoped-gerror.cpp
@@ -26,7 +26,6 @@
 
 #include "scoped-gerror.hpp"
 
-namespace vasum {
 namespace utils {
 
 ScopedGError::ScopedGError()
@@ -74,4 +73,3 @@ std::ostream& operator<<(std::ostream& os, const ScopedGError& e)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/scoped-gerror.hpp b/common/utils/scoped-gerror.hpp
index 0ee4c64..5d3bcc7 100644 (file)
--- a/common/utils/scoped-gerror.hpp
+++ b/common/utils/scoped-gerror.hpp
@@ -28,7 +28,6 @@
 #include <iostream>
 #include <gio/gio.h>
 
-namespace vasum{
 namespace utils {
 
 class ScopedGError {
@@ -73,6 +72,5 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_SCOPED_GERROR_HPP

diff --git a/common/utils/signal.cpp b/common/utils/signal.cpp
index 11ea8f2..2daa766 100644 (file)
--- a/common/utils/signal.cpp
+++ b/common/utils/signal.cpp
@@ -31,7 +31,6 @@
 #include <cstring>
 #include <csignal>
 
-namespace vasum {
 namespace utils {
 
 void signalBlock(const int signalToBlock)
@@ -57,7 +56,6 @@ void signalBlock(const int signalToBlock)
 }
 
 } // namespace utils
-} // namespace vasum
 
 
 

diff --git a/common/utils/signal.hpp b/common/utils/signal.hpp
index f26e365..c466688 100644 (file)
--- a/common/utils/signal.hpp
+++ b/common/utils/signal.hpp
@@ -25,13 +25,11 @@
 #ifndef COMMON_UTILS_SIGNAL_HPP
 #define COMMON_UTILS_SIGNAL_HPP
 
-namespace vasum {
 namespace utils {
 
 void signalBlock(const int signalsToBlock);
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_SIGNAL_HPP

diff --git a/common/utils/typeinfo.cpp b/common/utils/typeinfo.cpp
index 0f7e574..e97aa35 100644 (file)
--- a/common/utils/typeinfo.cpp
+++ b/common/utils/typeinfo.cpp
@@ -29,7 +29,6 @@
 #include <cxxabi.h>
 #include <stdexcept>
 
-namespace vasum {
 namespace utils {
 
 std::string getTypeName(const std::type_info& ti)
@@ -47,4 +46,3 @@ std::string getTypeName(const std::type_info& ti)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/typeinfo.hpp b/common/utils/typeinfo.hpp
index 9faf0cb..f1c83a0 100644 (file)
--- a/common/utils/typeinfo.hpp
+++ b/common/utils/typeinfo.hpp
@@ -28,7 +28,6 @@
 #include <string>
 #include <typeinfo>
 
-namespace vasum {
 namespace utils {
 
 std::string getTypeName(const std::type_info& ti);
@@ -39,7 +38,6 @@ template<class T> std::string getTypeName(const T& t)
 }
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_TYPE_INFO_HPP

diff --git a/common/utils/value-latch.hpp b/common/utils/value-latch.hpp
index 0e06f6f..74fc738 100644 (file)
--- a/common/utils/value-latch.hpp
+++ b/common/utils/value-latch.hpp
@@ -31,7 +31,6 @@
 #include <mutex>
 #include <condition_variable>
 
-namespace vasum {
 namespace utils {
 
 template <typename T>
@@ -121,6 +120,5 @@ T ValueLatch<T>::get(const unsigned int timeoutMs)
 }
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_VALUE_LATCH_H

diff --git a/common/utils/vt.cpp b/common/utils/vt.cpp
index 44461e4..373a949 100644 (file)
--- a/common/utils/vt.cpp
+++ b/common/utils/vt.cpp
@@ -25,7 +25,7 @@
 #include "config.hpp"
 #include "utils/vt.hpp"
 #include "logger/logger.hpp"
-#include "base-exception.hpp"
+#include "utils/exception.hpp"
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -40,7 +40,6 @@ const std::string TTY_DEV = "/dev/tty0";
 
 } // namespace
 
-namespace vasum {
 namespace utils {
 
 bool activateVT(const int& vt)
@@ -84,4 +83,3 @@ bool activateVT(const int& vt)
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/vt.hpp b/common/utils/vt.hpp
index 16f4030..a28261c 100644 (file)
--- a/common/utils/vt.hpp
+++ b/common/utils/vt.hpp
@@ -25,12 +25,10 @@
 #ifndef COMMON_UTILS_VT_HPP
 #define COMMON_UTILS_VT_HPP
 
-namespace vasum {
 namespace utils {
 
 bool activateVT(const int& vt);
 
 } // namespace utils
-} // namespace vasum
 
 #endif // COMMON_UTILS_VT_HPP

diff --git a/common/utils/worker.cpp b/common/utils/worker.cpp
index 2cb3284..7e87d33 100644 (file)
--- a/common/utils/worker.cpp
+++ b/common/utils/worker.cpp
@@ -35,7 +35,6 @@
 #include <cassert>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -183,4 +182,3 @@ void Worker::addTask(const Task& task)
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/common/utils/worker.hpp b/common/utils/worker.hpp
index 0d951fb..677f218 100644 (file)
--- a/common/utils/worker.hpp
+++ b/common/utils/worker.hpp
@@ -28,7 +28,6 @@
 #include <functional>
 #include <memory>
 
-namespace vasum {
 namespace utils {
 
 /**
@@ -68,7 +67,6 @@ private:
 };
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // COMMON_UTILS_WORKER_HPP

diff --git a/libs/dbus/connection.cpp b/libs/dbus/connection.cpp
index 3485ea5..60b3225 100644 (file)
--- a/libs/dbus/connection.cpp
+++ b/libs/dbus/connection.cpp
@@ -30,7 +30,7 @@
 #include "utils/glib-utils.hpp"
 #include "logger/logger.hpp"
 
-using namespace vasum::utils;
+using namespace utils;
 
 namespace dbus {
 

diff --git a/libs/dbus/connection.hpp b/libs/dbus/connection.hpp
index faf737c..5248d2e 100644 (file)
--- a/libs/dbus/connection.hpp
+++ b/libs/dbus/connection.hpp
@@ -181,7 +181,7 @@ private:
             : nameAcquired(acquired), nameLost(lost) {}
     };
 
-    vasum::utils::CallbackGuard mGuard;
+    utils::CallbackGuard mGuard;
     GDBusConnection* mConnection;
     guint mNameId;
 

diff --git a/server/host-ipc-connection.hpp b/server/host-ipc-connection.hpp
index d5144fd..b5d671e 100644 (file)
--- a/server/host-ipc-connection.hpp
+++ b/server/host-ipc-connection.hpp
@@ -27,7 +27,7 @@
 #define SERVER_HOST_IPC_CONNECTION_HPP
 
 #include "api/messages.hpp"
-#include "epoll/thread-dispatcher.hpp"
+#include "ipc/epoll/thread-dispatcher.hpp"
 #include "ipc/service.hpp"
 #include "ipc-callback-wrapper.hpp"
 
@@ -84,7 +84,7 @@ public:
     void sendNotification(const api::Notification& notification);
 
 private:
-    epoll::ThreadDispatcher mDispatcher;
+    ipc::epoll::ThreadDispatcher mDispatcher;
     std::unique_ptr<ipc::Service> mService;
 };
 

diff --git a/server/host-ipc-definitions.hpp b/server/host-ipc-definitions.hpp
index a54b679..0053efa 100644 (file)
--- a/server/host-ipc-definitions.hpp
+++ b/server/host-ipc-definitions.hpp
@@ -31,36 +31,36 @@ namespace vasum {
 namespace api {
 namespace ipc {
 
-const vasum::ipc::MethodID METHOD_GET_ZONE_ID_LIST         = 2;
-const vasum::ipc::MethodID METHOD_GET_ACTIVE_ZONE_ID       = 3;
-const vasum::ipc::MethodID METHOD_GET_ZONE_INFO            = 4;
-const vasum::ipc::MethodID METHOD_SET_NETDEV_ATTRS         = 5;
-const vasum::ipc::MethodID METHOD_GET_NETDEV_ATTRS         = 6;
-const vasum::ipc::MethodID METHOD_GET_NETDEV_LIST          = 7;
-const vasum::ipc::MethodID METHOD_CREATE_NETDEV_VETH       = 8;
-const vasum::ipc::MethodID METHOD_CREATE_NETDEV_MACVLAN    = 9;
-const vasum::ipc::MethodID METHOD_CREATE_NETDEV_PHYS       = 10;
-const vasum::ipc::MethodID METHOD_DELETE_NETDEV_IP_ADDRESS = 11;
-const vasum::ipc::MethodID METHOD_DESTROY_NETDEV           = 12;
-const vasum::ipc::MethodID METHOD_DECLARE_FILE             = 13;
-const vasum::ipc::MethodID METHOD_DECLARE_MOUNT            = 14;
-const vasum::ipc::MethodID METHOD_DECLARE_LINK             = 15;
-const vasum::ipc::MethodID METHOD_GET_DECLARATIONS         = 16;
-const vasum::ipc::MethodID METHOD_REMOVE_DECLARATION       = 17;
-const vasum::ipc::MethodID METHOD_SET_ACTIVE_ZONE          = 18;
-const vasum::ipc::MethodID METHOD_CREATE_ZONE              = 19;
-const vasum::ipc::MethodID METHOD_DESTROY_ZONE             = 20;
-const vasum::ipc::MethodID METHOD_SHUTDOWN_ZONE            = 21;
-const vasum::ipc::MethodID METHOD_START_ZONE               = 22;
-const vasum::ipc::MethodID METHOD_LOCK_ZONE                = 23;
-const vasum::ipc::MethodID METHOD_UNLOCK_ZONE              = 24;
-const vasum::ipc::MethodID METHOD_GRANT_DEVICE             = 25;
-const vasum::ipc::MethodID METHOD_REVOKE_DEVICE            = 26;
+const ::ipc::MethodID METHOD_GET_ZONE_ID_LIST         = 2;
+const ::ipc::MethodID METHOD_GET_ACTIVE_ZONE_ID       = 3;
+const ::ipc::MethodID METHOD_GET_ZONE_INFO            = 4;
+const ::ipc::MethodID METHOD_SET_NETDEV_ATTRS         = 5;
+const ::ipc::MethodID METHOD_GET_NETDEV_ATTRS         = 6;
+const ::ipc::MethodID METHOD_GET_NETDEV_LIST          = 7;
+const ::ipc::MethodID METHOD_CREATE_NETDEV_VETH       = 8;
+const ::ipc::MethodID METHOD_CREATE_NETDEV_MACVLAN    = 9;
+const ::ipc::MethodID METHOD_CREATE_NETDEV_PHYS       = 10;
+const ::ipc::MethodID METHOD_DELETE_NETDEV_IP_ADDRESS = 11;
+const ::ipc::MethodID METHOD_DESTROY_NETDEV           = 12;
+const ::ipc::MethodID METHOD_DECLARE_FILE             = 13;
+const ::ipc::MethodID METHOD_DECLARE_MOUNT            = 14;
+const ::ipc::MethodID METHOD_DECLARE_LINK             = 15;
+const ::ipc::MethodID METHOD_GET_DECLARATIONS         = 16;
+const ::ipc::MethodID METHOD_REMOVE_DECLARATION       = 17;
+const ::ipc::MethodID METHOD_SET_ACTIVE_ZONE          = 18;
+const ::ipc::MethodID METHOD_CREATE_ZONE              = 19;
+const ::ipc::MethodID METHOD_DESTROY_ZONE             = 20;
+const ::ipc::MethodID METHOD_SHUTDOWN_ZONE            = 21;
+const ::ipc::MethodID METHOD_START_ZONE               = 22;
+const ::ipc::MethodID METHOD_LOCK_ZONE                = 23;
+const ::ipc::MethodID METHOD_UNLOCK_ZONE              = 24;
+const ::ipc::MethodID METHOD_GRANT_DEVICE             = 25;
+const ::ipc::MethodID METHOD_REVOKE_DEVICE            = 26;
 
-const vasum::ipc::MethodID METHOD_NOTIFY_ACTIVE_ZONE         = 100;
-const vasum::ipc::MethodID METHOD_FILE_MOVE_REQUEST          = 101;
-const vasum::ipc::MethodID SIGNAL_NOTIFICATION               = 102;
-const vasum::ipc::MethodID SIGNAL_SWITCH_TO_DEFAULT          = 103;
+const ::ipc::MethodID METHOD_NOTIFY_ACTIVE_ZONE         = 100;
+const ::ipc::MethodID METHOD_FILE_MOVE_REQUEST          = 101;
+const ::ipc::MethodID SIGNAL_NOTIFICATION               = 102;
+const ::ipc::MethodID SIGNAL_SWITCH_TO_DEFAULT          = 103;
 
 const std::string FILE_MOVE_DESTINATION_NOT_FOUND   = "FILE_MOVE_DESTINATION_NOT_FOUND";
 const std::string FILE_MOVE_WRONG_DESTINATION       = "FILE_MOVE_WRONG_DESTINATION";

diff --git a/server/input-monitor.cpp b/server/input-monitor.cpp
index 68e63c0..e99906f 100644 (file)
--- a/server/input-monitor.cpp
+++ b/server/input-monitor.cpp
@@ -49,7 +49,7 @@
 #include <vector>
 #include <functional>
 
-using namespace vasum::utils;
+using namespace utils;
 namespace fs = boost::filesystem;
 
 namespace vasum {

diff --git a/server/netdev.cpp b/server/netdev.cpp
index 38ccb88..b9a1389 100644 (file)
--- a/server/netdev.cpp
+++ b/server/netdev.cpp
@@ -26,6 +26,7 @@
 #include "netdev.hpp"
 #include "netlink/netlink-message.hpp"
 #include "utils/make-clean.hpp"
+#include "utils/exception.hpp"
 #include "utils.hpp"
 #include "exception.hpp"
 
@@ -64,7 +65,7 @@
 #endif
 
 using namespace std;
-using namespace vasum;
+using namespace utils;
 using namespace vasum::netlink;
 
 namespace vasum {

diff --git a/server/server.cpp b/server/server.cpp
index ab8cba3..95f22a0 100644 (file)
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -34,6 +34,7 @@
 #include "utils/environment.hpp"
 #include "utils/fs.hpp"
 #include "utils/signal.hpp"
+#include "utils/exception.hpp"
 
 #include <csignal>
 #include <cerrno>
@@ -65,6 +66,8 @@
 
 extern char** environ;
 
+using namespace utils;
+
 namespace vasum {
 
 

diff --git a/server/zone-provision.cpp b/server/zone-provision.cpp
index 1c542f7..70c3711 100644 (file)
--- a/server/zone-provision.cpp
+++ b/server/zone-provision.cpp
@@ -41,6 +41,8 @@
 
 namespace fs = boost::filesystem;
 
+using namespace utils;
+
 namespace vasum {
 
 ZoneProvision::ZoneProvision(const std::string& rootPath,

diff --git a/tests/unit_tests/client/ut-client.cpp b/tests/unit_tests/client/ut-client.cpp
index adc325e..a43319c 100644 (file)
--- a/tests/unit_tests/client/ut-client.cpp
+++ b/tests/unit_tests/client/ut-client.cpp
@@ -46,7 +46,7 @@
 #include <utility>
 
 using namespace vasum;
-using namespace vasum::utils;
+using namespace utils;
 
 namespace {
 

diff --git a/tests/unit_tests/config/ut-configuration.cpp b/tests/unit_tests/config/ut-configuration.cpp
index 1334966..88b6a4e 100644 (file)
--- a/tests/unit_tests/config/ut-configuration.cpp
+++ b/tests/unit_tests/config/ut-configuration.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using namespace utils;
 using namespace config;
 
 const std::string UT_PATH = "/tmp/ut-config/";
@@ -44,7 +45,7 @@ const std::string DB_PREFIX = "ut";
 const int TOLERANCE = 1;
 
 struct Fixture {
-    vasum::utils::ScopedDir mUTDirGuard;
+    ScopedDir mUTDirGuard;
     Fixture() : mUTDirGuard(UT_PATH) {}
 };
 

diff --git a/tests/unit_tests/config/ut-dynvisit.cpp b/tests/unit_tests/config/ut-dynvisit.cpp
index 2050def..bbe45e0 100644 (file)
--- a/tests/unit_tests/config/ut-dynvisit.cpp
+++ b/tests/unit_tests/config/ut-dynvisit.cpp
@@ -33,12 +33,13 @@
 
 namespace {
 
+using namespace utils;
 using namespace config;
 
 const std::string UT_PATH = "/tmp/ut-config/";
 
 struct Fixture {
-    vasum::utils::ScopedDir mUTDirGuard;
+    ScopedDir mUTDirGuard;
     std::string dbPath;
     std::string dbPrefix;
 

diff --git a/tests/unit_tests/config/ut-kvstore.cpp b/tests/unit_tests/config/ut-kvstore.cpp
index 239f568..13691c7 100644 (file)
--- a/tests/unit_tests/config/ut-kvstore.cpp
+++ b/tests/unit_tests/config/ut-kvstore.cpp
@@ -37,7 +37,7 @@
 #include <boost/filesystem.hpp>
 
 using namespace config;
-using namespace vasum::utils;
+using namespace utils;
 namespace fs = boost::filesystem;
 
 namespace {
@@ -45,7 +45,7 @@ namespace {
 const std::string UT_PATH = "/tmp/ut-config/";
 
 struct Fixture {
-    vasum::utils::ScopedDir mUTDirGuard;
+    ScopedDir mUTDirGuard;
     std::string dbPath;
     KVStore c;
 

diff --git a/tests/unit_tests/dbus/ut-connection.cpp b/tests/unit_tests/dbus/ut-connection.cpp
index 84ea626..b427355 100644 (file)
--- a/tests/unit_tests/dbus/ut-connection.cpp
+++ b/tests/unit_tests/dbus/ut-connection.cpp
@@ -46,8 +46,8 @@
 
 BOOST_AUTO_TEST_SUITE(DbusSuite)
 
+using namespace utils;
 using namespace vasum;
-using namespace vasum::utils;
 using namespace dbus;
 
 namespace {

diff --git a/tests/unit_tests/epoll/ut-event-poll.cpp b/tests/unit_tests/epoll/ut-event-poll.cpp
index 3a26b5e..819e959 100644 (file)
--- a/tests/unit_tests/epoll/ut-event-poll.cpp
+++ b/tests/unit_tests/epoll/ut-event-poll.cpp
@@ -26,18 +26,18 @@
 #include "config.hpp"
 #include "ut.hpp"
 
-#include "epoll/event-poll.hpp"
+#include "ipc/epoll/event-poll.hpp"
 #include "logger/logger.hpp"
 #include "ipc/internals/socket.hpp"
 #include "utils/value-latch.hpp"
 #include "utils/glib-loop.hpp"
-#include "epoll/glib-dispatcher.hpp"
-#include "epoll/thread-dispatcher.hpp"
+#include "ipc/epoll/glib-dispatcher.hpp"
+#include "ipc/epoll/thread-dispatcher.hpp"
 
 using namespace vasum;
-using namespace vasum::utils;
-using namespace vasum::epoll;
-using namespace vasum::ipc;
+using namespace utils;
+using namespace ipc;
+using namespace ipc::epoll;
 
 namespace {
 

diff --git a/tests/unit_tests/ipc/ut-ipc.cpp b/tests/unit_tests/ipc/ut-ipc.cpp
index 6f2765b..b5edbf7 100644 (file)
--- a/tests/unit_tests/ipc/ut-ipc.cpp
+++ b/tests/unit_tests/ipc/ut-ipc.cpp
@@ -34,8 +34,8 @@
 #include "ipc/client.hpp"
 #include "ipc/types.hpp"
 #include "ipc/result.hpp"
-#include "epoll/thread-dispatcher.hpp"
-#include "epoll/glib-dispatcher.hpp"
+#include "ipc/epoll/thread-dispatcher.hpp"
+#include "ipc/epoll/glib-dispatcher.hpp"
 #include "utils/glib-loop.hpp"
 #include "utils/latch.hpp"
 #include "utils/value-latch.hpp"
@@ -52,9 +52,9 @@
 #include <future>
 
 using namespace vasum;
-using namespace vasum::ipc;
-using namespace vasum::epoll;
-using namespace vasum::utils;
+using namespace ipc;
+using namespace epoll;
+using namespace utils;
 using namespace std::placeholders;
 
 // Timeout for sending one message

diff --git a/tests/unit_tests/ipc/ut-socket.cpp b/tests/unit_tests/ipc/ut-socket.cpp
index 6f78f90..c2577ee 100644 (file)
--- a/tests/unit_tests/ipc/ut-socket.cpp
+++ b/tests/unit_tests/ipc/ut-socket.cpp
@@ -29,7 +29,7 @@
 
 #include <socket-test.hpp>
 
-using namespace vasum::ipc;
+using namespace ipc;
 
 BOOST_AUTO_TEST_SUITE(SocketSuite)
 

diff --git a/tests/unit_tests/server/ut-input-monitor.cpp b/tests/unit_tests/server/ut-input-monitor.cpp
index 454a307..22fba47 100644 (file)
--- a/tests/unit_tests/server/ut-input-monitor.cpp
+++ b/tests/unit_tests/server/ut-input-monitor.cpp
@@ -46,7 +46,7 @@
 
 
 using namespace vasum;
-using namespace vasum::utils;
+using namespace utils;
 
 namespace {
 

diff --git a/tests/unit_tests/server/ut-server.cpp b/tests/unit_tests/server/ut-server.cpp
index 8466f19..600b271 100644 (file)
--- a/tests/unit_tests/server/ut-server.cpp
+++ b/tests/unit_tests/server/ut-server.cpp
@@ -37,6 +37,11 @@
 #include <string>
 #include <future>
 
+using namespace utils;
+using namespace vasum;
+using namespace config;
+
+
 namespace {
 
 const std::string CONFIG_DIR = VSM_TEST_CONFIG_INSTALL_DIR "/server/ut-server";
@@ -48,7 +53,7 @@ const std::string ZONES_PATH = "/tmp/ut-zones"; // the same as in daemon.conf
 const bool AS_ROOT = true;
 
 struct Fixture {
-    vasum::utils::ScopedDir mZonesPathGuard;
+    utils::ScopedDir mZonesPathGuard;
 
     Fixture()
         : mZonesPathGuard(ZONES_PATH)
@@ -59,8 +64,8 @@ struct Fixture {
 
     void prepare()
     {
-        vasum::utils::ScopedGlibLoop loop;
-        vasum::ZonesManager manager(TEST_CONFIG_PATH);
+        ScopedGlibLoop loop;
+        ZonesManager manager(TEST_CONFIG_PATH);
         manager.createZone("zone1", TEMPLATE_NAME);
         manager.createZone("zone2", TEMPLATE_NAME);
         manager.restoreAll();
@@ -70,9 +75,6 @@ struct Fixture {
 
 BOOST_FIXTURE_TEST_SUITE(ServerSuite, Fixture)
 
-using namespace vasum;
-using namespace config;
-
 BOOST_AUTO_TEST_CASE(ConstructorDestructor)
 {
     std::unique_ptr<Server> s;

diff --git a/tests/unit_tests/server/ut-zone-provision.cpp b/tests/unit_tests/server/ut-zone-provision.cpp
index d6a5955..65a5b91 100644 (file)
--- a/tests/unit_tests/server/ut-zone-provision.cpp
+++ b/tests/unit_tests/server/ut-zone-provision.cpp
@@ -42,6 +42,7 @@
 #include <fcntl.h>
 
 using namespace vasum;
+using namespace utils;
 using namespace config;
 
 namespace fs = boost::filesystem;

diff --git a/tests/unit_tests/server/ut-zone.cpp b/tests/unit_tests/server/ut-zone.cpp
index 2aed285..755aa52 100644 (file)
--- a/tests/unit_tests/server/ut-zone.cpp
+++ b/tests/unit_tests/server/ut-zone.cpp
@@ -45,6 +45,7 @@
 #include <linux/if_bridge.h>
 #include <linux/if.h>
 
+using namespace utils;
 using namespace vasum;
 using namespace vasum::netdev;
 using namespace config;
@@ -63,9 +64,9 @@ const std::string BRIDGE_NAME = "brtest01";
 const std::string ZONE_NETDEV = "netdevtest01";
 
 struct Fixture {
-    utils::ScopedGlibLoop mLoop;
-    utils::ScopedDir mZonesPathGuard;
-    utils::ScopedDir mRunGuard;
+    ScopedGlibLoop mLoop;
+    ScopedDir mZonesPathGuard;
+    ScopedDir mRunGuard;
     std::string mBridgeName;
 
     Fixture()

diff --git a/tests/unit_tests/server/ut-zones-manager.cpp b/tests/unit_tests/server/ut-zones-manager.cpp
index e052117..f7a4351 100644 (file)
--- a/tests/unit_tests/server/ut-zones-manager.cpp
+++ b/tests/unit_tests/server/ut-zones-manager.cpp
@@ -37,7 +37,7 @@
 #endif //DBUS_CONNECTION
 #include "host-ipc-definitions.hpp"
 #include <api/messages.hpp>
-#include <epoll/thread-dispatcher.hpp>
+#include <ipc/epoll/thread-dispatcher.hpp>
 #include <ipc/client.hpp>
 #include "exception.hpp"
 
@@ -61,7 +61,7 @@
 
 using namespace vasum;
 using namespace config;
-using namespace vasum::utils;
+using namespace utils;
 #ifdef DBUS_CONNECTION
 using namespace dbus;
 #endif //DBUS_CONNECTION
@@ -599,7 +599,7 @@ public:
     }
 
 private:
-    epoll::ThreadDispatcher mDispatcher;
+    ipc::epoll::ThreadDispatcher mDispatcher;
     ipc::Client mClient;
 };
 
@@ -619,10 +619,10 @@ bool spinWaitFor(int timeoutMs, Predicate pred)
 } // namespace
 
 struct Fixture {
-    vasum::utils::ScopedGlibLoop mLoop;
+    ScopedGlibLoop mLoop;
 
-    utils::ScopedDir mZonesPathGuard;
-    utils::ScopedDir mRunGuard;
+    ScopedDir mZonesPathGuard;
+    ScopedDir mRunGuard;
 
     Fixture()
         : mZonesPathGuard(ZONES_PATH)

diff --git a/tests/unit_tests/socket_test_service/socket-test.cpp b/tests/unit_tests/socket_test_service/socket-test.cpp
index 2f163af..1ffc09e 100644 (file)
--- a/tests/unit_tests/socket_test_service/socket-test.cpp
+++ b/tests/unit_tests/socket_test_service/socket-test.cpp
@@ -36,7 +36,7 @@
 #include <memory>
 
 using namespace vasum::socket_test;
-using namespace vasum::ipc;
+using namespace ipc;
 using namespace logger;
 
 // NOTE this is a single-usage program, only meant to test vasum::ipc::Socket module.

diff --git a/tests/unit_tests/utils/scoped-daemon.cpp b/tests/unit_tests/utils/scoped-daemon.cpp
index 19f252c..6dbe93f 100644 (file)
--- a/tests/unit_tests/utils/scoped-daemon.cpp
+++ b/tests/unit_tests/utils/scoped-daemon.cpp
@@ -35,7 +35,6 @@
 #include <stdexcept>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -179,4 +178,3 @@ void ScopedDaemon::stop()
 
 
 } // namespace utils
-} // namespace vasum

diff --git a/tests/unit_tests/utils/scoped-daemon.hpp b/tests/unit_tests/utils/scoped-daemon.hpp
index 7d67c00..d263b4d 100644 (file)
--- a/tests/unit_tests/utils/scoped-daemon.hpp
+++ b/tests/unit_tests/utils/scoped-daemon.hpp
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -62,7 +61,6 @@ private:
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // UNIT_TESTS_UTILS_SCOPED_DAEMON_HPP

diff --git a/tests/unit_tests/utils/scoped-dir.cpp b/tests/unit_tests/utils/scoped-dir.cpp
index 48b354b..ddec9b6 100644 (file)
--- a/tests/unit_tests/utils/scoped-dir.cpp
+++ b/tests/unit_tests/utils/scoped-dir.cpp
@@ -29,7 +29,6 @@
 #include <boost/filesystem.hpp>
 
 
-namespace vasum {
 namespace utils {
 
 namespace fs = boost::filesystem;
@@ -67,4 +66,3 @@ void ScopedDir::remove()
 }
 
 } // namespace utils
-} // namespace vasum

diff --git a/tests/unit_tests/utils/scoped-dir.hpp b/tests/unit_tests/utils/scoped-dir.hpp
index c42dbe7..625954e 100644 (file)
--- a/tests/unit_tests/utils/scoped-dir.hpp
+++ b/tests/unit_tests/utils/scoped-dir.hpp
@@ -28,7 +28,6 @@
 #include <string>
 
 
-namespace vasum {
 namespace utils {
 
 
@@ -58,7 +57,6 @@ private:
 
 
 } // namespace utils
-} // namespace vasum
 
 
 #endif // UNIT_TESTS_UTILS_SCOPED_DIR_HPP

diff --git a/tests/unit_tests/utils/ut-callback-guard.cpp b/tests/unit_tests/utils/ut-callback-guard.cpp
index 524c7d5..557d8f0 100644 (file)
--- a/tests/unit_tests/utils/ut-callback-guard.cpp
+++ b/tests/unit_tests/utils/ut-callback-guard.cpp
@@ -32,10 +32,9 @@
 #include <future>
 #include <thread>
 
-
 BOOST_AUTO_TEST_SUITE(CallbackGuardSuite)
 
-using namespace vasum::utils;
+using namespace utils;
 
 const int unsigned TIMEOUT = 1000;
 

diff --git a/tests/unit_tests/utils/ut-counting-map.cpp b/tests/unit_tests/utils/ut-counting-map.cpp
index 04832db..55a0a55 100644 (file)
--- a/tests/unit_tests/utils/ut-counting-map.cpp
+++ b/tests/unit_tests/utils/ut-counting-map.cpp
@@ -30,7 +30,7 @@
 
 BOOST_AUTO_TEST_SUITE(CountingMapSuite)
 
-using namespace vasum::utils;
+using namespace utils;
 
 BOOST_AUTO_TEST_CASE(Counting)
 {

diff --git a/tests/unit_tests/utils/ut-fs.cpp b/tests/unit_tests/utils/ut-fs.cpp
index cbbe14b..2cc32d0 100644 (file)
--- a/tests/unit_tests/utils/ut-fs.cpp
+++ b/tests/unit_tests/utils/ut-fs.cpp
@@ -34,8 +34,7 @@
 #include <sys/mount.h>
 #include <boost/filesystem.hpp>
 
-using namespace vasum;
-using namespace vasum::utils;
+using namespace utils;
 
 namespace {
 

diff --git a/tests/unit_tests/utils/ut-glib-loop.cpp b/tests/unit_tests/utils/ut-glib-loop.cpp
index 467fbfb..fb0292e 100644 (file)
--- a/tests/unit_tests/utils/ut-glib-loop.cpp
+++ b/tests/unit_tests/utils/ut-glib-loop.cpp
@@ -32,8 +32,7 @@
 
 BOOST_AUTO_TEST_SUITE(GlibLoopSuite)
 
-using namespace vasum;
-using namespace vasum::utils;
+using namespace utils;
 
 
 namespace {

diff --git a/tests/unit_tests/utils/ut-paths.cpp b/tests/unit_tests/utils/ut-paths.cpp
index e14da13..00120e8 100644 (file)
--- a/tests/unit_tests/utils/ut-paths.cpp
+++ b/tests/unit_tests/utils/ut-paths.cpp
@@ -32,7 +32,7 @@
 
 BOOST_AUTO_TEST_SUITE(UtilsPathsSuite)
 
-using namespace vasum::utils;
+using namespace utils;
 
 BOOST_AUTO_TEST_CASE(CreateFilePath)
 {

diff --git a/tests/unit_tests/utils/ut-same-thread-guard.cpp b/tests/unit_tests/utils/ut-same-thread-guard.cpp
index 463c07d..f2ec471 100644 (file)
--- a/tests/unit_tests/utils/ut-same-thread-guard.cpp
+++ b/tests/unit_tests/utils/ut-same-thread-guard.cpp
@@ -33,7 +33,7 @@
 
 BOOST_AUTO_TEST_SUITE(SameThreadGuardSuite)
 
-using namespace vasum::utils;
+using namespace utils;
 
 BOOST_AUTO_TEST_CASE(Simple)
 {

diff --git a/tests/unit_tests/utils/ut-value-latch.cpp b/tests/unit_tests/utils/ut-value-latch.cpp
index 2b09967..aa5b3a0 100644 (file)
--- a/tests/unit_tests/utils/ut-value-latch.cpp
+++ b/tests/unit_tests/utils/ut-value-latch.cpp
@@ -33,7 +33,7 @@
 
 BOOST_AUTO_TEST_SUITE(ValueLatchSuite)
 
-using namespace vasum::utils;
+using namespace utils;
 
 namespace
 {
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(Timeout)
     ValueLatch<int> testLatch;
 
     BOOST_REQUIRE_EXCEPTION(testLatch.get(EXPECTED_TIMEOUT),
-                            vasum::UtilsException,
+                            UtilsException,
                             WhatEquals("Timeout occured"));
 }
 
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(MultipleSet)
 
     testLatch.set(3);
     BOOST_REQUIRE_EXCEPTION(testLatch.set(2),
-                            vasum::UtilsException,
+                            UtilsException,
                             WhatEquals("Cannot set value multiple times"));
 }
 
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(MultipleGet)
     testLatch.set(3);
     testLatch.get(TIMEOUT);
     BOOST_REQUIRE_EXCEPTION(testLatch.get(EXPECTED_TIMEOUT),
-                            vasum::UtilsException,
+                            UtilsException,
                             WhatEquals("Timeout occured"));
 }
 

diff --git a/tests/unit_tests/utils/ut-worker.cpp b/tests/unit_tests/utils/ut-worker.cpp
index da2a96d..52c14fd 100644 (file)
--- a/tests/unit_tests/utils/ut-worker.cpp
+++ b/tests/unit_tests/utils/ut-worker.cpp
@@ -33,9 +33,9 @@
 #include <thread>
 #include <atomic>
 
-BOOST_AUTO_TEST_SUITE(WorkerSuite)
+using namespace utils;
 
-using namespace vasum::utils;
+BOOST_AUTO_TEST_SUITE(WorkerSuite)
 
 const int unsigned TIMEOUT = 1000;