update

Author: jin1xiao3long2

include/Telemeter.hpp

@@ -44,10 +44,10 @@ const constexpr uint _permanent_thread_num_ = 3; //center的常驻线程数量
 //mirror的setting, POD type
 struct Setting
 {
-  int center_ip_;
-  //int backup_center_ip_;
   uint8_t mir_beat_interval_;
-  uint8_t //数据库ip?
+  uint8_t mir_report_interval_;
+  uint8_t class_cache_time_;
+  uint8_t class_interval_;
 };
 
 #endif
@@ -68,6 +68,13 @@ namespace telemeter
 #endif
 
 #ifdef SRC_MIRROR_H
+
+  Setting _set_cache_one = {600,1,60,600,55};
+  Setting _set_cache_two = {600,1,60,600,55};
+
+  Setting* setting = &_set_cache_one;
+  Setting* setting_copy = &_set_cache_two;
+
 #endif
 
 

include/mirror/Mirror.cpp

@@ -2,28 +2,35 @@
 
 
 void Mirror::start() {
-    //任务队列最大数量
+//任务队列最大数量
     pool_.setMaxQueueSize(30);
-    pool_.start(_permanent_thread_num_ + 5;)
-
-
-    //提交任务
+    //用std::hard_ware_concurrency()确定硬件支持的最大并发数量, 该数量 * 2为此程序运行时占用线程数
+    pool_.start(static_cast<int>(2 * std::thread::hardware_concurrency()));
+    auto thd_start = [&](const char* info){
+        std::clog << "thread start: " << info << std::endl;
+    };
 
-    this->pool_.run([this]() { read_config(); });
     //读取配置文件
+    this->pool_.run([this]() { read_config(); });
+    thd_start("read config");
+    //发送负载情况
     this->pool_.run([this]() { update_data_info(); });
-    //初始化数据库
-    this->pool_.run([this]() { update_data_info(); });
+    thd_start("update data info");
     //更新数据缓存
-    this->pool_.run([this]() { listen_cli_beat(); });
+    this->pool_.run([this]() { update_clis_data() });
+    thd_start("updae clients data")
+
     //建立cli链接
+    this->pool_.run([this]() { listen_cli_beat(); });
+    thd_start("listen clients beat");
 
     //输出日志
 }
 
 void Mirror::read_config() {
-//json格式
-    static std::string config_file_path{"CenterConfig.txt"};
+
+//    后可以考虑使用json格式
+    static std::string config_file_path{"MirrorConfig.txt"};
     static std::ifstream in{config_file_path, std::ios::in};
     Setting set{};
     memset(&set, 0, sizeof(Setting));
@@ -47,6 +54,8 @@ void Mirror::read_config() {
             else if (line.find("cli_class") != std::string::npos)
                 set.mir_max_disbeat_time_ = std::stoi(
                         std::string(line.find_first_of('[') + 1, line.find_first_of(']')));
+            else if(line.find("class_interval") != std::string::bois)
+                set.class_interval_ = std::stoi( std::string(line.find_first_of('[') + 1, line.find_first_of(']')));
         }
     };
 
@@ -223,3 +232,5 @@ void Mirror::update_clis_data() {
     }
 }
 
+
+

include/mirror/Mirror.hpp

@@ -1,3 +1,6 @@
+#ifndef SRC_MIRROR_H
+#define SRC_MIRROR_H
+
 #include "muduo/base/ThreadPool.h"
 #include "muduo/net/InetAddress.h"
 #include "muduo/net/TcpServer.h"
@@ -14,12 +17,6 @@
 
 class Mirror
 {
-    class setting{
-        unsigned next_read_this_file_interval;
-        unsigned mir_heart_beat_interval;
-        unsigned mir_load_report_interval;
-        unsigned cli_class_info_cache_time;
-    };
   private:
   DetailLoadState load_;
   std::queue<Message> messages_;
@@ -31,6 +28,11 @@ class Mirror
   muduo::net::EventLoop loop_;
   muduo::net::TcpServer server_;
   muduo::ThreadPool pool_;
+
+//  数据库配置相关，仅在程序开始时使用
+  const std::string db_dsn = "MariaDB-server";
+  const std::string db_name = "root";
+  const std::string db_passwd = "root";
 private:
     //mirror start:
 
@@ -56,3 +58,5 @@ class Mirror
     void start();
 
 };
+
+#endif //SRC_MIRROR_H

include/mirror/MirrorConfig.txt

@@ -1,4 +1,4 @@
-next_read: [600]s //多少秒之后重新读取配置文件, 需要不停机调试则尽量缩短, 但不建议小于30(半分钟)
+next_read_interval: [600]s //多少秒之后重新读取配置文件, 需要不停机调试则尽量缩短, 但不建议小于30(半分钟)
 mir_heart_beat_interval: [1]s    //心跳的间隔
 mir_load_report_interval: [60]   //多少个心跳包后更新负载情况
 cli_class_info_cache_time: [600]s //课程信息在cli断联后缓存时间, 如果内存紧张可以适当缩短