adjust common includes

zlight · Dec 30, 2018 · 2c4717e · 2c4717e
1 parent 3042a05
commit 2c4717e
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 26 deletions.
diff --git a/src/net4cxx/common/common.h b/src/net4cxx/common/common.h
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <array>
 #include <exception>
+#include <iostream>
 #include <list>
 #include <map>
 #include <memory>
@@ -66,6 +67,7 @@
 #endif
 
 
+#include <boost/algorithm/string.hpp>
 #include <boost/any.hpp>
 #include <boost/optional.hpp>
 #include <boost/regex.hpp>

diff --git a/src/net4cxx/common/compress/gzip.cpp b/src/net4cxx/common/compress/gzip.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/common/compress/gzip.h"
-#include <boost/algorithm/string.hpp>
 #include <boost/endian/conversion.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/net4cxx/common/compress/gzip.h b/src/net4cxx/common/compress/gzip.h
@@ -9,7 +9,6 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <boost/optional.hpp>
 #include "net4cxx/common/compress/zlib.h"
 #include "net4cxx/common/utilities/errors.h"
 

diff --git a/src/net4cxx/common/configuration/options.h b/src/net4cxx/common/configuration/options.h
@@ -6,9 +6,7 @@
 #define NET4CXX_COMMON_CONFIGURATION_OPTIONS_H
 
 #include "net4cxx/common/common.h"
-#include <iostream>
 #include <boost/function.hpp>
-#include <boost/optional.hpp>
 #include <boost/program_options.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
 #include "net4cxx/common/utilities/errors.h"

diff --git a/src/net4cxx/common/crypto/hashlib.h b/src/net4cxx/common/crypto/hashlib.h
@@ -6,7 +6,6 @@
 #define NET4CXX_COMMON_CRYPTO_HASHLIB_H
 
 #include "net4cxx/common/common.h"
-
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <boost/mpl/string.hpp>

diff --git a/src/net4cxx/common/debugging/watcher.h b/src/net4cxx/common/debugging/watcher.h
@@ -44,6 +44,30 @@ class NET4CXX_COMMON_API Watcher {
 
     void del(const char *key);
 
+    int get(const char *key) const {
+        std::lock_guard<std::mutex> lock(_lock);
+        return _objs.at(key);
+    }
+
+    int get(const char *key, int defValue) const {
+        std::lock_guard<std::mutex> lock(_lock);
+        auto iter = _objs.find(key);
+        return iter != _objs.end() ? iter->second : defValue;
+    }
+
+    template <typename FuncT>
+    void getAll(FuncT func) const {
+        std::lock_guard<std::mutex> lock(_lock);
+        for (auto &kv: _objs) {
+            func(kv.first, kv.second);
+        }
+    }
+
+    int getCount() const {
+        std::lock_guard<std::mutex> lock(_lock);
+        return _objs.size();
+    }
+
     void addSetCallback(const char *key, const SetCallback &callback);
 
     void addIncCallback(const char *key, const IncCallback &callback);

diff --git a/src/net4cxx/common/email/utils.cpp b/src/net4cxx/common/email/utils.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/common/email/utils.h"
-#include <boost/algorithm/string.hpp>
 #include "net4cxx/common/utilities/strutil.h"
 
 

diff --git a/src/net4cxx/common/httputils/cookie.h b/src/net4cxx/common/httputils/cookie.h
@@ -6,7 +6,6 @@
 #define NET4CXX_COMMON_HTTPUTILS_COOKIE_H
 
 #include "net4cxx/common/common.h"
-#include <boost/algorithm/string.hpp>
 #include "net4cxx/common/utilities/errors.h"
 
 NS_BEGIN

diff --git a/src/net4cxx/common/httputils/urlparse.cpp b/src/net4cxx/common/httputils/urlparse.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/common/httputils/urlparse.h"
-#include <boost/algorithm/string.hpp>
 #include "net4cxx/common/utilities/errors.h"
 #include "net4cxx/common/utilities/strutil.h"
 

diff --git a/src/net4cxx/common/logging/attributes.cpp b/src/net4cxx/common/logging/attributes.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/common/logging/attributes.h"
-#include <boost/algorithm/string.hpp>
 
 
 NS_BEGIN

diff --git a/src/net4cxx/common/logging/sinks.cpp b/src/net4cxx/common/logging/sinks.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/common/logging/sinks.h"
-#include <boost/algorithm/string.hpp>
 #include <boost/core/null_deleter.hpp>
 #include "net4cxx/common/logging/logging.h"
 

diff --git a/src/net4cxx/common/logging/sinks.h b/src/net4cxx/common/logging/sinks.h
@@ -8,8 +8,6 @@
 #include "net4cxx/common/common.h"
 #include <boost/log/sinks.hpp>
 #include <boost/log/utility/functional.hpp>
-#include <boost/optional.hpp>
-#include <boost/variant.hpp>
 #include "net4cxx/common/logging/attributes.h"
 
 NS_BEGIN

diff --git a/src/net4cxx/common/serialization/archive.h b/src/net4cxx/common/serialization/archive.h
@@ -6,7 +6,6 @@
 #define NET4CXX_COMMON_SERIALIZATION_ARCHIVE_H
 
 #include "net4cxx/common/common.h"
-#include <boost/optional.hpp>
 #include "net4cxx/common/utilities/errors.h"
 
 NS_BEGIN

diff --git a/src/net4cxx/common/utilities/strutil.h b/src/net4cxx/common/utilities/strutil.h
@@ -6,7 +6,6 @@
 #define NET4CXX_COMMON_UTILITIES_STRUTIL_H
 
 #include "net4cxx/common/common.h"
-#include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
 

diff --git a/src/net4cxx/common/utilities/util.h b/src/net4cxx/common/utilities/util.h
@@ -6,7 +6,6 @@
 #define NET4CXX_COMMON_UTILITIES_UTIL_H
 
 #include "net4cxx/common/common.h"
-#include <boost/algorithm/string.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 

diff --git a/src/net4cxx/core/network/base.h b/src/net4cxx/core/network/base.h
@@ -9,7 +9,6 @@
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include <boost/algorithm/string.hpp>
 #include "net4cxx/common/utilities/errors.h"
 #include "net4cxx/common/utilities/messagebuffer.h"
 

diff --git a/src/net4cxx/core/network/defer.h b/src/net4cxx/core/network/defer.h
@@ -6,9 +6,6 @@
 #define NET4CXX_CORE_NETWORK_DEFER_H
 
 #include "net4cxx/common/common.h"
-#include <boost/any.hpp>
-#include <boost/optional.hpp>
-#include <boost/variant.hpp>
 #include "net4cxx/common/debugging/assert.h"
 #include "net4cxx/common/debugging/watcher.h"
 #include "net4cxx/core/network/base.h"

diff --git a/src/net4cxx/core/network/endpoints.cpp b/src/net4cxx/core/network/endpoints.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/core/network/endpoints.h"
-#include <boost/algorithm/string.hpp>
 #include "net4cxx/common/utilities/strutil.h"
 #include "net4cxx/core/network/defer.h"
 #include "net4cxx/core/network/reactor.h"

diff --git a/src/net4cxx/plugins/websocket/protocol.h b/src/net4cxx/plugins/websocket/protocol.h
@@ -7,8 +7,6 @@
 
 #include "net4cxx/plugins/websocket/base.h"
 #include <boost/logic/tribool.hpp>
-#include <boost/optional.hpp>
-#include <boost/regex.hpp>
 #include "net4cxx/common/debugging/watcher.h"
 #include "net4cxx/common/httputils/urlparse.h"
 #include "net4cxx/core/network/protocol.h"

diff --git a/src/net4cxx/plugins/websocket/util.h b/src/net4cxx/plugins/websocket/util.h
@@ -6,8 +6,6 @@
 #define NET4CXX_PLUGINS_WEBSOCKET_UTIL_H
 
 #include "net4cxx/plugins/websocket/base.h"
-#include <boost/optional.hpp>
-#include <boost/regex.hpp>
 #include "net4cxx/common/configuration/json.h"
 #include "net4cxx/common/httputils/urlparse.h"
 #include "net4cxx/common/utilities/util.h"

diff --git a/src/net4cxx/shared/bootstrap/bootstrapper.cpp b/src/net4cxx/shared/bootstrap/bootstrapper.cpp
@@ -2,8 +2,8 @@
 // Created by yuwenyong.vincent on 2018/10/5.
 //
 
-#include <net4cxx/shared/global/constants.h>
 #include "net4cxx/shared/bootstrap/bootstrapper.h"
+#include "net4cxx/shared/global/constants.h"
 #include "net4cxx/common/configuration/options.h"
 #include "net4cxx/common/debugging/assert.h"
 #include "net4cxx/common/debugging/crashreport.h"

diff --git a/src/net4cxx/shared/global/loggers.cpp b/src/net4cxx/shared/global/loggers.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "net4cxx/shared/global/loggers.h"
-#include <boost/regex.hpp>
 
 
 NS_BEGIN
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     //
     #include "net4cxx/common/email/utils.h"
-    #include <boost/algorithm/string.hpp>
     #include "net4cxx/common/utilities/strutil.h"
@@ Expand Down @@