fix bug: addtional introduced packages maybe cause core dump when sta…

…rting pika in centos
OpenAtomFoundation · May 18, 2024 · 43bd1ab · 43bd1ab
1 parent a583036
commit 43bd1ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/net/include/thread_pool.h b/src/net/include/thread_pool.h
@@ -8,23 +8,22 @@
 
 #include <pthread.h>
 #include <atomic>
-#include <queue>
 #include <string>
 
 #include "net/include/net_define.h"
 #include "net/include/random.h"
 #include "pstd/include/pstd_mutex.h"
-
+ 
 namespace net {
 
 using TaskFunc = void (*)(void*);
 
-struct Task {
- Task() = default;
- TaskFunc func = nullptr;
- void* arg = nullptr;
- Task(TaskFunc _func, void* _arg) : func(_func), arg(_arg) {}
-};
+// struct Task {
+//  Task() = default;
+//  TaskFunc func = nullptr;
+//  void* arg = nullptr;
+//  Task(TaskFunc _func, void* _arg) : func(_func), arg(_arg) {}
+// };
 
 struct TimeTask {
  uint64_t exec_time;
@@ -122,15 +121,15 @@ class ThreadPool : public pstd::noncopyable {
 
  size_t worker_num_;
  std::string thread_pool_name_;
- std::queue<Task> queue_;
- std::priority_queue<TimeTask> time_queue_;
+ // std::queue<TimeTask> queue_;
+ // std::priority_queue<TimeTask> time_queue_;
  std::vector<Worker*> workers_;
  std::atomic<bool> running_;
  std::atomic<bool> should_stop_;
 
  pstd::Mutex mu_;
  pstd::CondVar rsignal_;
- pstd::CondVar wsignal_;
+ // pstd::CondVar wsignal_;
 };
 
 } // namespace net

diff --git a/src/net/src/thread_pool.cc b/src/net/src/thread_pool.cc
@@ -78,7 +78,7 @@ int ThreadPool::stop_thread_pool() {
  if (running_.load()) {
  should_stop_.store(true);
  rsignal_.notify_all();
- wsignal_.notify_all();
+ // wsignal_.notify_all();
  for (const auto worker : workers_) {
  res = worker->stop();
  if (res != 0) {

diff --git a/tests/integration/start_codis.sh b/tests/integration/start_codis.sh
@@ -46,6 +46,7 @@ echo 'startup codis dashboard and codis proxy'
 sleep 20
 
 # if start failed, maybe for your struct/class that be defined NOT be used
+# or addtional introduced packages
 echo 'assign codis slots to groups and resync groups'
 ./bin/codis-admin --dashboard=$CODIS_DASHBOARD_ADDR --create-group --gid=1
 ./bin/codis-admin --dashboard=$CODIS_DASHBOARD_ADDR --create-group --gid=2