some changes to zmq files

This commit is contained in:
Michel van Kessel
2020-12-06 21:54:21 +01:00
parent 801cc40710
commit 21b81d1d59
7 changed files with 24 additions and 22 deletions

View File

@@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "zmqabstractnotifier.h"
#include "util.h"
#include <zmq/zmqabstractnotifier.h>
#include <util.h>
CZMQAbstractNotifier::~CZMQAbstractNotifier()

View File

@@ -5,7 +5,7 @@
#ifndef BITCOIN_ZMQ_ZMQABSTRACTNOTIFIER_H
#define BITCOIN_ZMQ_ZMQABSTRACTNOTIFIER_H
#include "zmqconfig.h"
#include <zmq/zmqconfig.h>
class CBlockIndex;
class CZMQAbstractNotifier;

View File

@@ -6,7 +6,7 @@
#define BITCOIN_ZMQ_ZMQCONFIG_H
#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
#include <config/bitcoin-config.h>
#endif
#include <stdarg.h>
@@ -16,8 +16,8 @@
#include <zmq.h>
#endif
#include "primitives/block.h"
#include "primitives/transaction.h"
#include <primitives/block.h>
#include <primitives/transaction.h>
void zmqError(const char *str);

View File

@@ -2,13 +2,13 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "zmqnotificationinterface.h"
#include "zmqpublishnotifier.h"
#include <zmq/zmqnotificationinterface.h>
#include <zmq/zmqpublishnotifier.h>
#include "version.h"
#include "main.h"
#include "streams.h"
#include "util.h"
#include <version.h>
#include <main.h>
#include <streams.h>
#include <util.h>
void zmqError(const char *str)
{
@@ -31,7 +31,7 @@ CZMQNotificationInterface::~CZMQNotificationInterface()
CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const std::map<std::string, std::string> &args)
{
CZMQNotificationInterface* notificationInterface = NULL;
CZMQNotificationInterface* notificationInterface = nullptr;
std::map<std::string, CZMQNotifierFactory> factories;
std::list<CZMQAbstractNotifier*> notifiers;
@@ -62,7 +62,7 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const
if (!notificationInterface->Initialize())
{
delete notificationInterface;
notificationInterface = NULL;
notificationInterface = nullptr;
}
}
@@ -145,6 +145,7 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB
{
for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )
{
CZMQAbstractNotifier *notifier = *i;
if (notifier->NotifyTransaction(tx))
{
@@ -152,6 +153,7 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB
}
else
{
notifier->Shutdown();
i = notifiers.erase(i);
}

View File

@@ -5,7 +5,7 @@
#ifndef BITCOIN_ZMQ_ZMQNOTIFICATIONINTERFACE_H
#define BITCOIN_ZMQ_ZMQNOTIFICATIONINTERFACE_H
#include "validationinterface.h"
#include <validationinterface.h>
#include <string>
#include <map>

View File

@@ -2,11 +2,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "chainparams.h"
#include "zmqpublishnotifier.h"
#include "main.h"
#include "util.h"
#include "rpc/server.h"
#include <chainparams.h>
#include <zmq/zmqpublishnotifier.h>
#include <main.h>
#include <util.h>
#include <rpc/server.h>
static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;

View File

@@ -5,14 +5,14 @@
#ifndef BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H
#define BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H
#include "zmqabstractnotifier.h"
#include <zmq/zmqabstractnotifier.h>
class CBlockIndex;
class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
{
private:
uint32_t nSequence; //!< upcounting per message sequence number
uint32_t nSequence; //! upcounting per message sequence number
public: