moving threadpool (#9)

* moving threadpool

* moving threadpool

* Adding checks

* adding a check for 0

* compilation fix

Author: MelamudMichael

lib/include/up-client-zenoh-cpp/message/messageBuilder.h

@@ -27,14 +27,15 @@
 
 #include <cstdint>
 #include <cstring>
-#include <up-cpp/tools/base64.h>
+#include <up-cpp/utils/base64.h>
 #include <up-cpp/transport/datamodel/UPayload.h>
 #include <up-cpp/transport/datamodel/UAttributes.h>
 #include <up-client-zenoh-cpp/message/messageCommon.h>
 #include <up-core-api/ustatus.pb.h>
 #include <up-core-api/uri.pb.h>
 
 using namespace uprotocol::utransport;
+using namespace uprotocol::utils;
 using namespace uprotocol::v1;
 
 class MessageBuilder 

lib/include/up-client-zenoh-cpp/message/messageParser.h

@@ -28,14 +28,15 @@
 #include <unordered_map>
 #include <vector>
 #include <up-client-zenoh-cpp/message/messageCommon.h>
-#include <up-cpp/tools/base64.h>
+#include <up-cpp/utils/base64.h>
 #include <up-cpp/transport/datamodel/UPayload.h>
 #include <up-cpp/transport/datamodel/UAttributes.h>
 #include <up-core-api/uri.pb.h>
 
 using namespace uprotocol::utransport;
 using namespace uprotocol::v1;
-using namespace uprotocol::tools;
+using namespace uprotocol::utils;
+
 struct TLV {
     Tag type;
     size_t length;

lib/include/up-client-zenoh-cpp/rpc/zenohRpcClient.h

@@ -26,13 +26,14 @@
 #define _ZENOH_RPC_CLIENT_H_
 
 #include <up-cpp/rpc/RpcClient.h>
-#include <up-client-zenoh-cpp/utils/ThreadPool.h>
-#include <zenoh.h>
+#include <up-cpp/utils/ThreadPool.h>
 #include <up-core-api/ustatus.pb.h>
 #include <up-core-api/uri.pb.h>
+#include <zenoh.h>
 
 using namespace std;
 using namespace uprotocol::utransport;
+using namespace uprotocol::utils;
 using namespace uprotocol::v1;
 
 class ZenohRpcClient : public RpcClient {
@@ -85,7 +86,8 @@ class ZenohRpcClient : public RpcClient {
         std::shared_ptr<ThreadPool> threadPool_;
 
         static constexpr auto requestTimeoutMs_ = 5000;
-        static constexpr auto threadPoolSize_ = size_t(10);
+        static constexpr auto queueSize_ = size_t(20);
+        static constexpr auto maxNumOfCuncurrentRequests_ = size_t(2);
 
 };
 

lib/include/up-client-zenoh-cpp/utils/ConcurrentCyclicQueue.h

@@ -23,14 +23,14 @@
  */
 
 #include <up-client-zenoh-cpp/message/messageBuilder.h>
-#include <up-cpp/tools/base64.h>
+#include <up-cpp/utils/base64.h>
 #include <up-cpp/uuid/serializer/UuidSerializer.h>
 #include <up-cpp/uri/serializer/LongUriSerializer.h>
 #include <spdlog/spdlog.h>
 
 using namespace uprotocol::uri;
 using namespace uprotocol::uuid;
-using namespace uprotocol::tools;
+using namespace uprotocol::utils;
 
 std::vector<uint8_t> MessageBuilder::buildHeader(const UAttributes &attributes) {
 
@@ -161,7 +161,7 @@ size_t MessageBuilder::calculateSize(const UAttributes &attributes) noexcept {
     }
 
     if (attributes.sink().has_value()) {    
-        updateSize(uprotocol::tools::Base64::encode(LongUriSerializer::serialize(attributes.sink().value())), msgSize);
+        updateSize(Base64::encode(LongUriSerializer::serialize(attributes.sink().value())), msgSize);
     }
 
     if (attributes.plevel().has_value()) {

lib/include/up-client-zenoh-cpp/utils/ThreadPool.h

@@ -23,7 +23,7 @@
  */
 
 #include <up-client-zenoh-cpp/message/messageParser.h>
-#include <up-cpp/tools/base64.h>
+#include <up-cpp/utils/base64.h>
 #include <up-cpp/transport/datamodel/UPayload.h>
 #include <up-cpp/transport/datamodel/UAttributes.h>
 #include <up-cpp/uri/serializer/LongUriSerializer.h>
@@ -34,7 +34,7 @@
 using namespace uprotocol::utransport;
 using namespace uprotocol::v1;
 using namespace uprotocol::uuid;
-using namespace uprotocol::tools;
+using namespace uprotocol::utils;
 
 std::optional<std::unordered_map<Tag,TLV>> MessageParser::getAllTlv(const uint8_t *data, 
                                                                     size_t size) noexcept {