Fixed compilation issues

Author: =

capio/common/requests.hpp

@@ -1,29 +1,29 @@
 #ifndef CAPIO_COMMON_REQUESTS_HPP
 #define CAPIO_COMMON_REQUESTS_HPP
 
-constexpr const int CAPIO_REQUEST_ACCESS              = 0;
-constexpr const int CAPIO_REQUEST_CLONE               = 1;
-constexpr const int CAPIO_REQUEST_CLOSE               = 2;
-constexpr const int CAPIO_REQUEST_CREATE              = 3;
-constexpr const int CAPIO_REQUEST_CREATE_EXCLUSIVE    = 4;
-constexpr const int CAPIO_REQUEST_DUP                 = 5;
-constexpr const int CAPIO_REQUEST_EXIT_GROUP          = 6;
-constexpr const int CAPIO_REQUEST_FSTAT               = 7;
-constexpr const int CAPIO_REQUEST_GETDENTS            = 8;
-constexpr const int CAPIO_REQUEST_GETDENTS64          = 9;
-constexpr const int CAPIO_REQUEST_HANDSHAKE_NAMED     = 10;
-constexpr const int CAPIO_REQUEST_MKDIR               = 11;
-constexpr const int CAPIO_REQUEST_OPEN                = 12;
-constexpr const int CAPIO_REQUEST_READ                = 13;
-constexpr const int CAPIO_REQUEST_RENAME              = 14;
-constexpr const int CAPIO_REQUEST_SEEK                = 15;
-constexpr const int CAPIO_REQUEST_SEEK_DATA           = 16;
-constexpr const int CAPIO_REQUEST_SEEK_END            = 17;
-constexpr const int CAPIO_REQUEST_SEEK_HOLE           = 18;
-constexpr const int CAPIO_REQUEST_STAT                = 19;
-constexpr const int CAPIO_REQUEST_UNLINK              = 20;
-constexpr const int CAPIO_REQUEST_WRITE               = 21;
-constexpr const int CAPIO_REQUEST_RMDIR               = 22;
+constexpr const int CAPIO_REQUEST_ACCESS           = 0;
+constexpr const int CAPIO_REQUEST_CLONE            = 1;
+constexpr const int CAPIO_REQUEST_CLOSE            = 2;
+constexpr const int CAPIO_REQUEST_CREATE           = 3;
+constexpr const int CAPIO_REQUEST_CREATE_EXCLUSIVE = 4;
+constexpr const int CAPIO_REQUEST_DUP              = 5;
+constexpr const int CAPIO_REQUEST_EXIT_GROUP       = 6;
+constexpr const int CAPIO_REQUEST_FSTAT            = 7;
+constexpr const int CAPIO_REQUEST_GETDENTS         = 8;
+constexpr const int CAPIO_REQUEST_GETDENTS64       = 9;
+constexpr const int CAPIO_REQUEST_HANDSHAKE_NAMED  = 10;
+constexpr const int CAPIO_REQUEST_MKDIR            = 11;
+constexpr const int CAPIO_REQUEST_OPEN             = 12;
+constexpr const int CAPIO_REQUEST_READ             = 13;
+constexpr const int CAPIO_REQUEST_RENAME           = 14;
+constexpr const int CAPIO_REQUEST_SEEK             = 15;
+constexpr const int CAPIO_REQUEST_SEEK_DATA        = 16;
+constexpr const int CAPIO_REQUEST_SEEK_END         = 17;
+constexpr const int CAPIO_REQUEST_SEEK_HOLE        = 18;
+constexpr const int CAPIO_REQUEST_STAT             = 19;
+constexpr const int CAPIO_REQUEST_UNLINK           = 20;
+constexpr const int CAPIO_REQUEST_WRITE            = 21;
+constexpr const int CAPIO_REQUEST_RMDIR            = 22;
 
 constexpr const int CAPIO_NR_REQUESTS = 24;
 

capio/server/include/remote/requests.hpp

@@ -1,8 +1,8 @@
 #ifndef CAPIO_REMOTE_REQUESTS_HPP
 #define CAPIO_REMOTE_REQUESTS_HPP
 
-#include "storage/manager.hpp"
 #include "common/requests.hpp"
+#include "storage/manager.hpp"
 #include "utils/location.hpp"
 
 extern StorageManager *storage_manager;

capio/server/include/utils/location.hpp

@@ -4,8 +4,8 @@
 #include <mutex>
 #include <thread>
 
-#include "utils/types.hpp"
 #include "remote/backend.hpp"
+#include "utils/types.hpp"
 
 extern Backend *backend;
 extern char *node_name;

capio/server/include/utils/signals.hpp

@@ -3,9 +3,9 @@
 
 #include <csignal>
 
-#include "remote/backend.hpp"
 #include "client/manager.hpp"
 #include "client/request.hpp"
+#include "remote/backend.hpp"
 
 extern ClientManager *client_manager;
 extern StorageManager *storage_manager;

capio/tests/unit/server/src/client_manager.cpp

@@ -2,7 +2,7 @@
 #define CAPIO_CLIENT_MANAGER_HPP
 #include <gtest/gtest.h>
 
-#include <client-manager/client_manager.hpp>
+#include <client/manager.hpp>
 
 extern ClientManager *client_manager;
 

capio/tests/unit/server/src/main.cpp

@@ -4,12 +4,16 @@ char *node_name;
 
 #include "capiocl.hpp"
 #include "capiocl/engine.h"
-#include "client-manager/client_manager.hpp"
+#include "client/manager.hpp"
 #include "common/constants.hpp"
 #include "storage/manager.hpp"
 #include "utils/capiocl_adapter.hpp"
 #include "utils/location.hpp"
 
+CSFilesSentMap_t files_sent;
+CSClientsRemotePendingNFilesMap_t clients_remote_pending_nfiles;
+std::mutex nfiles_mutex;
+
 capiocl::engine::Engine *capio_cl_engine = nullptr;
 StorageManager *storage_manager          = nullptr;
 ClientManager *client_manager            = nullptr;