sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #15622: Remove global symbols: Avoid using the global namespace if possible

Browse Source 
fb434159d1 Remove global symbols: Avoid using the global namespace if possible (practicalswift)

Pull request description:

  Remove global symbols: Avoid using the global namespace if possible.

  Partially resolves #15612 ("Reduce the number of global symbols used").

  Change in global symbols as reported by `nm bitcoind` before vs after:

  ```
  $ diff -u <(nm src/bitcoind-before | c++filt | grep -E '^[0-9a-f]+ [A-Z] ' | cut -f3- -d' ' | sort -u) \
            <(nm src/bitcoind-after  | c++filt | grep -E '^[0-9a-f]+ [A-Z] ' | cut -f3- -d' ' | sort -u) \
            | grep -E '^[+-][^+-]'
  -boundSockets
  -cs_warnings
  -eventHTTP
  -fFeeEstimatesInitialized
  -fLargeWorkForkFound
  -fLargeWorkInvalidChainFound
  -pathHandlers
  -strMiscWarning[abi:cxx11]
  -threadHTTP
  ```

ACKs for commit fb4341:

Tree-SHA512: d2f78f6188a992b0e0de8d107e2c494cfa0faa2de4fda634a1d3606d6515633bec86289cf2a2e78ffe467b17b795e2243cc459fb44e0dfe2fc69899506ff61c9
This commit is contained in:
MarcoFalke 2019-05-25 18:37:04 -04:00 committed by Pasta
parent 1c7188fab1
commit 74a2557245
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/httpserver.cpp
View File

@ -143,15 +143,15 @@ struct HTTPPathHandler
//! libevent event loop //! libevent event loop
static struct event_base* eventBase = nullptr; static struct event_base* eventBase = nullptr;
//! HTTP server //! HTTP server
struct evhttp* eventHTTP = nullptr; static struct evhttp* eventHTTP = nullptr;
//! List of subnets to allow RPC connections from //! List of subnets to allow RPC connections from
static std::vector<CSubNet> rpc_allow_subnets; static std::vector<CSubNet> rpc_allow_subnets;
//! Work queue for handling longer requests off the event loop thread //! Work queue for handling longer requests off the event loop thread
static WorkQueue<HTTPClosure>* workQueue = nullptr; static WorkQueue<HTTPClosure>* workQueue = nullptr;
//! Handlers for (sub)paths //! Handlers for (sub)paths
std::vector<HTTPPathHandler> pathHandlers; static std::vector<HTTPPathHandler> pathHandlers;
//! Bound listening sockets //! Bound listening sockets
std::vector<evhttp_bound_socket *> boundSockets; static std::vector<evhttp_bound_socket *> boundSockets;
/** Check if a network address is allowed to access the HTTP server */ /** Check if a network address is allowed to access the HTTP server */
static bool ClientAllowed(const CNetAddr& netaddr) static bool ClientAllowed(const CNetAddr& netaddr)
@ -428,7 +428,7 @@ bool UpdateHTTPServerLogging(bool enable) {
#endif #endif
} }
std::thread threadHTTP; static std::thread threadHTTP;
static std::vector<std::thread> g_thread_http_workers; static std::vector<std::thread> g_thread_http_workers;
void StartHTTPServer() void StartHTTPServer()

2
src/init.cpp
View File

@ -104,7 +104,7 @@
#include <zmq/zmqrpc.h> #include <zmq/zmqrpc.h>
#endif #endif
bool fFeeEstimatesInitialized = false; static bool fFeeEstimatesInitialized = false;
static const bool DEFAULT_PROXYRANDOMIZE = true; static const bool DEFAULT_PROXYRANDOMIZE = true;
static const bool DEFAULT_REST_ENABLE = false; static const bool DEFAULT_REST_ENABLE = false;
static const bool DEFAULT_STOPAFTERBLOCKIMPORT = false; static const bool DEFAULT_STOPAFTERBLOCKIMPORT = false;

8
src/warnings.cpp
View File

@ -9,10 +9,10 @@
#include <warnings.h> #include <warnings.h>
#include <hash.h> #include <hash.h>
CCriticalSection cs_warnings; static RecursiveMutex cs_warnings;
std::string strMiscWarning GUARDED_BY(cs_warnings); static std::string strMiscWarning GUARDED_BY(cs_warnings);
bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false; static bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false;
bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false; static bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false;
void SetMiscWarning(const std::string& strWarning) void SetMiscWarning(const std::string& strWarning)
{ {