Merge pull request markparticle#22 from markparticle/dev_mark

🐛 avoid shock
zhuiqiubiye · Jul 4, 2020 · 1e580bf · 1e580bf
2 parents 0377228 + 65585a7
commit 1e580bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/code/http/httpresponse.cpp b/code/http/httpresponse.cpp
@@ -26,6 +26,7 @@ const unordered_map<string, string> HttpResponse::SUFFIX_TYPE = {
     { ".gz",    "application/x-gzip" },
     { ".tar",   "application/x-tar" },
     { ".css",   "text/css "},
+    { ".js",    "text/javascript "},
 };
 
 const unordered_map<int, string> HttpResponse::CODE_STATUS = {

diff --git a/code/log/blockqueue.h b/code/log/blockqueue.h
@@ -83,7 +83,7 @@ void BlockDeque<T>::Close() {
 
 template<class T>
 void BlockDeque<T>::flush() {
-    condConsumer_.notify_all();
+    condConsumer_.notify_one();
 };
 
 template<class T>
@@ -123,7 +123,7 @@ void BlockDeque<T>::push_back(const T &item) {
         condProducer_.wait(locker);
     }
     deq_.push_back(item);
-    condConsumer_.notify_all();
+    condConsumer_.notify_one();
 }
 
 template<class T>
@@ -133,7 +133,7 @@ void BlockDeque<T>::push_front(const T &item) {
         condProducer_.wait(locker);
     }
     deq_.push_front(item);
-    condConsumer_.notify_all();
+    condConsumer_.notify_one();
 }
 
 template<class T>
@@ -159,7 +159,7 @@ bool BlockDeque<T>::pop(T &item) {
     }
     item = deq_.front();
     deq_.pop_front();
-    condProducer_.notify_all();
+    condProducer_.notify_one();
     return true;
 }
 
@@ -177,7 +177,7 @@ bool BlockDeque<T>::pop(T &item, int timeout) {
     }
     item = deq_.front();
     deq_.pop_front();
-    condProducer_.notify_all();
+    condProducer_.notify_one();
     return true;
 }
 

diff --git a/code/pool/threadpool.h b/code/pool/threadpool.h
@@ -54,7 +54,7 @@ class ThreadPool {
             std::lock_guard<std::mutex> locker(pool_->mtx);
             pool_->tasks.emplace(std::forward<F>(task));
         }
-        pool_->cond.notify_all();
+        pool_->cond.notify_one();
     }
 
 private:

diff --git a/readme.assest/压力测试.png b/readme.assest/压力测试.png