[opt]build opt

.vscode/launch.json

@@ -5,7 +5,7 @@
             "name": "Debug",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/test",
+            "program": "${workspaceFolder}/proxyServerTcp",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

.vscode/tasks.json

@@ -9,15 +9,13 @@
                 "-std=c++14",
                 "-g",
                 "-o",
-                "test",
+                "proxyServerTcp",
                 "-I",
                 "include",
-                "-I",
-                "include/bolt",
-                "hv_utils.cpp",
-                "tcp_inbound.cpp",
-                "tcp_client.cpp",
-                "main.cpp",
+                // "-I",
+                // "include/bolt",
+                // "*.cpp",
+                "src/*.cpp",
                 "-lhv",
                 "-lspdlog"
                 

Dockerfile

@@ -50,7 +50,7 @@ WORKDIR /app
 COPY . .
 
 # Compile the C++ program
-RUN g++ -std=c++14 -g -o proxyServer hv_utils.cpp tcp_inbound.cpp main.cpp -I include -I include/bolt -lhv -lspdlog
+RUN g++ -std=c++14 -g -o proxyServerTcp src/*.cpp -I include -lhv -lspdlog
 
 RUN apt-get install -y tzdata
 
@@ -61,4 +61,4 @@ RUN dpkg-reconfigure --frontend noninteractive tzdata
 
 EXPOSE 8080
 # Run my_program when the container launches
-CMD ["./proxyServer"]
+CMD ["./proxyServerTcp"]

hv_utils.cpp → src/hv_utils.cpp

@@ -1,4 +1,4 @@
-#include "include/hv_utils.h"
+#include "hv_utils.h"
 
 int thread_num = 4;
 hloop_t** worker_loops = NULL;

main.cpp → src/main.cpp

@@ -129,8 +129,8 @@
 
 #include "hv/hloop.h"
 #include "hv/hthread.h"
-#include "include/hv_utils.h"
-#include "include/tcp_inbound.h"
+#include "hv_utils.h"
+#include "tcp_inbound.h"
 
 #include "spdlog/spdlog.h"
 #include "spdlog/async.h"

tcp_client.cpp → src/tcp_client.cpp

@@ -1,6 +1,6 @@
-#include "include/tcp_client.h"
+#include "tcp_client.h"
 #include "bolt/datagram.h"
-#include "include/tcp_client_map.h"
+#include "tcp_client_map.h"
 #include "spdlog/spdlog.h"
 #include <string>
 #include <time.h>

tcp_inbound.cpp → src/tcp_inbound.cpp

@@ -1,9 +1,8 @@
-#include "include/tcp_inbound.h"
-#include "include/conn_map.h"
-#include "include/tcp_client.h"
+#include "tcp_inbound.h"
+#include "conn_map.h"
+#include "tcp_client.h"
 #include "hv/hsocket.h"
 #include "hv/hthread.h"
-#include "hv/TcpClient.h"
 #include "spdlog/spdlog.h"
 #include <string>
 
@@ -42,7 +41,7 @@ void tcp_on_accept(hio_t* io, hevent_t* ev) {
             SOCKADDR_STR(hio_localaddr(io), localaddrstr),
             SOCKADDR_STR(hio_peeraddr(io), peeraddrstr));
 
-    ConnMap<hio_t*, TcpClientBolt>::getInstance().add(io, std::unique_ptr<TcpClientBolt>(new TcpClientBolt(io)));
+    ConnMap<hio_t*, TcpClientBolt>::getInstance().add(io, std::make_unique<TcpClientBolt>(io));
 
     hio_setcb_close(io, tcp_on_close);
     hio_setcb_read(io, tcp_on_recv);