fix: remove new/delete in net

src/net/examples/binlog_parser_test.cc

@@ -16,7 +16,7 @@ int main(int argc, char* argv[]) {
   std::string ip(argv[1]);
   int port = atoi(argv[2]);
 
-  NetCli* rcli = NewRedisCli();
+  std::unique_ptr<NetCli> rcli(NewRedisCli());
   rcli->set_connect_timeout(3000);
 
   Status s = rcli->Connect(ip, port, "127.0.0.1");

src/net/examples/http_server.cc

@@ -96,8 +96,8 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* my_conn_factory = new MyConnFactory();
-  ServerThread* st = NewDispatchThread(port, 4, my_conn_factory, 1000);
+  std::unique_ptr<ConnFactory> my_conn_factory = std::make_unique<MyConnFactory>();
+  std::unique_ptr<ServerThread> st(NewDispatchThread(port, 4, my_conn_factory.get(), 1000));
 
   if (st->StartThread() != 0) {
     printf("StartThread error happened!\n");
@@ -109,8 +109,5 @@ int main(int argc, char* argv[]) {
   }
   st->StopThread();
 
-  delete st;
-  delete my_conn_factory;
-
   return 0;
 }

src/net/examples/https_server.cc

@@ -97,8 +97,8 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* my_conn_factory = new MyConnFactory();
-  ServerThread* st = NewDispatchThread(port, 4, my_conn_factory, 1000);
+  std::unique_ptr<ConnFactory> my_conn_factory = std::make_unique<MyConnFactory>();
+  std::unique_ptr<ServerThread> st(NewDispatchThread(port, 4, my_conn_factory.get(), 1000));
 
 #if __ENABLE_SSL
   if (st->EnableSecurity("/complete_path_to/host.crt", "/complete_path_to/host.key") != 0) {
@@ -117,8 +117,5 @@ int main(int argc, char* argv[]) {
   }
   st->StopThread();
 
-  delete st;
-  delete my_conn_factory;
-
   return 0;
 }

src/net/examples/mydispatch_srv.cc

@@ -75,8 +75,8 @@ static void SignalSetup() {
 
 int main() {
   SignalSetup();
-  ConnFactory* my_conn_factory = new MyConnFactory();
-  ServerThread* st = NewDispatchThread(9211, 10, my_conn_factory, 1000);
+  std::unique_ptr<ConnFactory> my_conn_factory = std::make_unique<MyConnFactory>();
+  std::unique_ptr<ServerThread> st(NewDispatchThread(9211, 10, my_conn_factory.get(), 1000));
 
   if (st->StartThread() != 0) {
     printf("StartThread error happened!\n");
@@ -88,8 +88,5 @@ int main() {
   }
   st->StopThread();
 
-  delete st;
-  delete my_conn_factory;
-
   return 0;
 }

src/net/examples/myholy_srv.cc

@@ -80,9 +80,9 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* conn_factory = new MyConnFactory();
+  std::unique_ptr<ConnFactory> conn_factory = std::make_unique<MyConnFactory>();
 
-  ServerThread* my_thread = NewHolyThread(my_port, conn_factory);
+  std::unique_ptr<ServerThread> my_thread(NewHolyThread(my_port, conn_factory.get()));
   if (my_thread->StartThread() != 0) {
     printf("StartThread error happened!\n");
     exit(-1);
@@ -93,8 +93,5 @@ int main(int argc, char* argv[]) {
   }
   my_thread->StopThread();
 
-  delete my_thread;
-  delete conn_factory;
-
   return 0;
 }

src/net/examples/myholy_srv_chandle.cc

@@ -107,7 +107,7 @@ int main(int argc, char* argv[]) {
   MyConnFactory conn_factory;
   MyServerHandle handle;
 
-  ServerThread* my_thread = NewHolyThread(my_port, &conn_factory, 1000, &handle);
+  std::unique_ptr<ServerThread> my_thread(NewHolyThread(my_port, &conn_factory, 1000, &handle));
   if (my_thread->StartThread() != 0) {
     printf("StartThread error happened!\n");
     exit(-1);
@@ -118,7 +118,5 @@ int main(int argc, char* argv[]) {
   }
   my_thread->StopThread();
 
-  delete my_thread;
-
   return 0;
 }

src/net/examples/myproto_cli.cc

@@ -2,6 +2,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <memory>
 
 #include "myproto.pb.h"
 #include "net/include/net_cli.h"
@@ -18,7 +19,7 @@ int main(int argc, char* argv[]) {
   std::string ip(argv[1]);
   int port = atoi(argv[2]);
 
-  NetCli* cli = NewPbCli();
+  std::unique_ptr<NetCli> cli(NewPbCli());
 
   Status s = cli->Connect(ip, port);
   if (!s.ok()) {
@@ -48,6 +49,5 @@ int main(int argc, char* argv[]) {
   }
   cli->Close();
 
-  delete cli;
   return 0;
 }

src/net/examples/myredis_cli.cc

@@ -29,7 +29,7 @@ MyConn::MyConn(int fd, const std::string& ip_port, Thread* thread, void* worker_
   // Handle worker_specific_data ...
 }
 
-ClientThread* client;
+std::unique_ptr<ClientThread> client;
 int sendto_port;
 int MyConn::DealMessage(const RedisCmdArgsType& argv, std::string* response) {
   sleep(1);
@@ -95,10 +95,11 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* conn_factory = new MyConnFactory();
+  std::unique_ptr<ConnFactory> conn_factory = std::make_unique<MyConnFactory>();
+  //"handle" will be deleted within "client->StopThread()"
   ClientHandle* handle = new ClientHandle();
 
-  client = new ClientThread(conn_factory, 3000, 60, handle, nullptr);
+  client = std::make_unique<ClientThread>(conn_factory.get(), 3000, 60, handle, nullptr);
 
   if (client->StartThread() != 0) {
     printf("StartThread error happened!\n");
@@ -107,11 +108,10 @@ int main(int argc, char* argv[]) {
   running.store(true);
   while (running.load()) {
     sleep(1);
-    DoCronWork(client, sendto_port);
+    DoCronWork(client.get(), sendto_port);
   }
 
   client->StopThread();
-  delete client;
-  delete conn_factory;
+  client.reset();
   return 0;
 }

src/net/examples/myredis_srv.cc

@@ -96,9 +96,10 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* conn_factory = new MyConnFactory();
+  std::unique_ptr<ConnFactory> conn_factory = std::make_unique<MyConnFactory>();
 
-  ServerThread* my_thread = new HolyThread(my_port, conn_factory, 1000, nullptr, false);
+  std::unique_ptr<ServerThread> my_thread =
+      std::make_unique<HolyThread>(my_port, conn_factory.get(), 1000, nullptr, false);
   if (my_thread->StartThread() != 0) {
     printf("StartThread error happened!\n");
     exit(-1);
@@ -109,8 +110,5 @@ int main(int argc, char* argv[]) {
   }
   my_thread->StopThread();
 
-  delete my_thread;
-  delete conn_factory;
-
   return 0;
 }

src/net/examples/performance/client.cc

@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
   std::string ip(argv[1]);
   int port = atoi(argv[2]);
 
-  NetCli* cli = NewPbCli();
+  std::unique_ptr<NetCli> cli(NewPbCli());
 
   Status s = cli->Connect(ip, port);
   if (!s.ok()) {
@@ -44,6 +44,5 @@ int main(int argc, char* argv[]) {
   }
   cli->Close();
 
-  delete cli;
   return 0;
 }

src/net/examples/performance/server.cc

@@ -84,7 +84,7 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ServerThread* st_thread = NewDispatchThread(ip, port, 24, &conn_factory, 1000);
+  std::unique_ptr<ServerThread> st_thread(NewDispatchThread(ip, port, 24, &conn_factory, 1000));
   st_thread->StartThread();
   uint64_t st, ed;
 
@@ -99,7 +99,5 @@ int main(int argc, char* argv[]) {
   }
   st_thread->StopThread();
 
-  delete st_thread;
-
   return 0;
 }

src/net/examples/redis_cli_test.cc

@@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
   ret = net::SerializeRedisCommand(vec, &str);
   printf("   2. Serialize by vec return %d, (%s)\n", ret, str.c_str());
 
-  NetCli* rcli = NewRedisCli();
+  std::unique_ptr<NetCli> rcli(NewRedisCli());
   rcli->set_connect_timeout(3000);
 
   // redis v3.2+ protect mode will block other ip

src/net/examples/redis_parser_test.cc

@@ -15,7 +15,7 @@ int main(int argc, char* argv[]) {
   std::string ip(argv[1]);
   int port = atoi(argv[2]);
 
-  NetCli* rcli = NewRedisCli();
+  std::unique_ptr<NetCli> rcli(NewRedisCli());
   rcli->set_connect_timeout(3000);
 
   Status s = rcli->Connect(ip, port, "127.0.0.1");

src/net/examples/simple_http_server.cc

@@ -76,8 +76,8 @@ int main(int argc, char* argv[]) {
 
   SignalSetup();
 
-  ConnFactory* my_conn_factory = new MyConnFactory();
-  ServerThread* st = NewDispatchThread(port, 4, my_conn_factory, 1000);
+  std::unique_ptr<ConnFactory> my_conn_factory = std::make_unique<MyConnFactory>();
+  std::unique_ptr<ServerThread> st(NewDispatchThread(port, 4, my_conn_factory.get(), 1000));
 
   if (st->StartThread() != 0) {
     printf("StartThread error happened!\n");
@@ -89,8 +89,5 @@ int main(int argc, char* argv[]) {
   }
   st->StopThread();
 
-  delete st;
-  delete my_conn_factory;
-
   return 0;
 }

src/net/include/net_cli.h

@@ -6,8 +6,8 @@
 #ifndef NET_INCLUDE_NET_CLI_H_
 #define NET_INCLUDE_NET_CLI_H_
 
+#include <memory>
 #include <string>
-
 #include "pstd/include/pstd_status.h"
 
 using pstd::Status;
@@ -47,7 +47,7 @@ class NetCli {
 
  private:
   struct Rep;
-  Rep* rep_;
+  std::shared_ptr<Rep> rep_;
   int set_tcp_nodelay();
 
   NetCli(const NetCli&);

src/net/include/server_thread.h

@@ -188,7 +188,7 @@ class ServerThread : public Thread {
    */
   int port_ = -1;
   std::set<std::string> ips_;
-  std::vector<ServerSocket*> server_sockets_;
+  std::vector<std::shared_ptr<ServerSocket>> server_sockets_;
   std::set<int32_t> server_fds_;
 
   virtual int InitHandle();

src/net/src/dispatch_thread.cc

@@ -20,9 +20,8 @@ DispatchThread::DispatchThread(int port, int work_num, ConnFactory* conn_factory
       last_thread_(0),
       work_num_(work_num),
       queue_limit_(queue_limit) {
-  worker_thread_ = new WorkerThread*[work_num_];
   for (int i = 0; i < work_num_; i++) {
-    worker_thread_[i] = new WorkerThread(conn_factory, this, queue_limit, cron_interval);
+    worker_thread_.emplace_back(std::make_shared<WorkerThread>(conn_factory, this, queue_limit, cron_interval));
   }
 }
 
@@ -32,9 +31,9 @@ DispatchThread::DispatchThread(const std::string& ip, int port, int work_num, Co
       last_thread_(0),
       work_num_(work_num),
       queue_limit_(queue_limit) {
-  worker_thread_ = new WorkerThread*[work_num_];
+
   for (int i = 0; i < work_num_; i++) {
-    worker_thread_[i] = new WorkerThread(conn_factory, this, queue_limit, cron_interval);
+    worker_thread_.emplace_back(std::make_shared<WorkerThread>(conn_factory, this, queue_limit, cron_interval));
   }
 }
 
@@ -44,17 +43,15 @@ DispatchThread::DispatchThread(const std::set<std::string>& ips, int port, int w
       last_thread_(0),
       work_num_(work_num),
       queue_limit_(queue_limit) {
-  worker_thread_ = new WorkerThread*[work_num_];
+
   for (int i = 0; i < work_num_; i++) {
-    worker_thread_[i] = new WorkerThread(conn_factory, this, queue_limit, cron_interval);
+    worker_thread_.emplace_back(std::make_shared<WorkerThread>(conn_factory, this, queue_limit, cron_interval));
+
   }
 }
 
 DispatchThread::~DispatchThread() {
-  for (int i = 0; i < work_num_; i++) {
-    delete worker_thread_[i];
-  }
-  delete[] worker_thread_;
+
 }
 
 int DispatchThread::StartThread() {
@@ -129,7 +126,7 @@ std::shared_ptr<NetConn> DispatchThread::MoveConnOut(int fd) {
 }
 
 void DispatchThread::MoveConnIn(std::shared_ptr<NetConn> conn, const NotifyType& type) {
-  WorkerThread* worker_thread = worker_thread_[last_thread_];
+  std::shared_ptr<WorkerThread> worker_thread = worker_thread_[last_thread_];
   bool success = worker_thread->MoveConnIn(conn, type, true);
   if (success) {
     last_thread_ = (last_thread_ + 1) % work_num_;
@@ -155,7 +152,7 @@ void DispatchThread::HandleNewConn(const int connfd, const std::string& ip_port)
   int next_thread = last_thread_;
   bool find = false;
   for (int cnt = 0; cnt < work_num_; cnt++) {
-    WorkerThread* worker_thread = worker_thread_[next_thread];
+    std::shared_ptr<WorkerThread> worker_thread = worker_thread_[next_thread];
     find = worker_thread->MoveConnIn(ti, false);
     if (find) {
       last_thread_ = (next_thread + 1) % work_num_;

src/net/src/dispatch_thread.h

@@ -65,7 +65,7 @@ class DispatchThread : public ServerThread {
   /*
    * This is the work threads
    */
-  WorkerThread** worker_thread_;
+  std::vector<std::shared_ptr<WorkerThread>> worker_thread_;
   int queue_limit_;
   std::map<WorkerThread*, void*> localdata_;