mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
removed debug info
This commit is contained in:
parent
79e676edbe
commit
2e7398ac9b
@ -1,83 +1,83 @@
|
||||
#include <QMap>
|
||||
|
||||
#include "RsGxsUpdateBroadcast.h"
|
||||
#include "gui/notifyqt.h"
|
||||
|
||||
#include <retroshare/rsgxsifacehelper.h>
|
||||
|
||||
//#define DEBUG_GXS_BROADCAST 1
|
||||
|
||||
// previously gxs allowed only one event consumer to poll for changes
|
||||
// this required a single broadcast instance per service
|
||||
// now the update notify works through rsnotify and notifyqt
|
||||
// so the single instance per service is not really needed anymore
|
||||
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*> updateBroadcastMap;
|
||||
|
||||
RsGxsUpdateBroadcast::RsGxsUpdateBroadcast(RsGxsIfaceHelper *ifaceImpl) :
|
||||
QObject(NULL), mIfaceImpl(ifaceImpl)
|
||||
{
|
||||
connect(NotifyQt::getInstance(), SIGNAL(gxsChange(RsGxsChanges)), this, SLOT(onChangesReceived(RsGxsChanges)));
|
||||
}
|
||||
|
||||
void RsGxsUpdateBroadcast::cleanup()
|
||||
{
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*>::iterator it;
|
||||
for (it = updateBroadcastMap.begin(); it != updateBroadcastMap.end(); ++it) {
|
||||
delete(it.value());
|
||||
}
|
||||
|
||||
updateBroadcastMap.clear();
|
||||
}
|
||||
|
||||
RsGxsUpdateBroadcast *RsGxsUpdateBroadcast::get(RsGxsIfaceHelper *ifaceImpl)
|
||||
{
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*>::iterator it = updateBroadcastMap.find(ifaceImpl);
|
||||
if (it != updateBroadcastMap.end()) {
|
||||
return it.value();
|
||||
}
|
||||
|
||||
RsGxsUpdateBroadcast *updateBroadcast = new RsGxsUpdateBroadcast(ifaceImpl);
|
||||
updateBroadcastMap.insert(ifaceImpl, updateBroadcast);
|
||||
|
||||
return updateBroadcast;
|
||||
}
|
||||
|
||||
void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes)
|
||||
{
|
||||
#ifndef DEBUG_GXS_BROADCAST
|
||||
std::cerr << "onChangesReceived()" << std::endl;
|
||||
|
||||
{
|
||||
std::cerr << "Received changes for service " << (void*)changes.mService << ", expecting service " << (void*)mIfaceImpl->getTokenService() << std::endl;
|
||||
for(std::list<RsGxsGroupId>::const_iterator it(changes.mGrps.begin());it!=changes.mGrps.end();++it)
|
||||
std::cerr << "[GRP CHANGE] grp id: " << *it << std::endl;
|
||||
for(std::list<RsGxsGroupId>::const_iterator it(changes.mGrpsMeta.begin());it!=changes.mGrpsMeta.end();++it)
|
||||
std::cerr << "[GRP CHANGE] grp meta: " << *it << std::endl;
|
||||
for(std::map<RsGxsGroupId,std::vector<RsGxsMessageId> >::const_iterator it(changes.mMsgs.begin());it!=changes.mMsgs.end();++it)
|
||||
for(uint32_t i=0;i<it->second.size();++i)
|
||||
std::cerr << "[MSG CHANGE] grp id: " << it->first << ". Msg ID " << it->second[i] << std::endl;
|
||||
for(std::map<RsGxsGroupId,std::vector<RsGxsMessageId> >::const_iterator it(changes.mMsgsMeta.begin());it!=changes.mMsgsMeta.end();++it)
|
||||
for(uint32_t i=0;i<it->second.size();++i)
|
||||
std::cerr << "[MSG CHANGE] grp id: " << it->first << ". Msg Meta " << it->second[i] << std::endl;
|
||||
}
|
||||
#endif
|
||||
if(changes.mService != mIfaceImpl->getTokenService())
|
||||
{
|
||||
// std::cerr << "(EE) Incorrect service. Dropping." << std::endl;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (!changes.mMsgs.empty() || !changes.mMsgsMeta.empty())
|
||||
{
|
||||
emit msgsChanged(changes.mMsgs, changes.mMsgsMeta);
|
||||
}
|
||||
|
||||
if (!changes.mGrps.empty() || !changes.mGrpsMeta.empty())
|
||||
{
|
||||
emit grpsChanged(changes.mGrps, changes.mGrpsMeta);
|
||||
}
|
||||
|
||||
emit changed();
|
||||
}
|
||||
#include <QMap>
|
||||
|
||||
#include "RsGxsUpdateBroadcast.h"
|
||||
#include "gui/notifyqt.h"
|
||||
|
||||
#include <retroshare/rsgxsifacehelper.h>
|
||||
|
||||
//#define DEBUG_GXS_BROADCAST 1
|
||||
|
||||
// previously gxs allowed only one event consumer to poll for changes
|
||||
// this required a single broadcast instance per service
|
||||
// now the update notify works through rsnotify and notifyqt
|
||||
// so the single instance per service is not really needed anymore
|
||||
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*> updateBroadcastMap;
|
||||
|
||||
RsGxsUpdateBroadcast::RsGxsUpdateBroadcast(RsGxsIfaceHelper *ifaceImpl) :
|
||||
QObject(NULL), mIfaceImpl(ifaceImpl)
|
||||
{
|
||||
connect(NotifyQt::getInstance(), SIGNAL(gxsChange(RsGxsChanges)), this, SLOT(onChangesReceived(RsGxsChanges)));
|
||||
}
|
||||
|
||||
void RsGxsUpdateBroadcast::cleanup()
|
||||
{
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*>::iterator it;
|
||||
for (it = updateBroadcastMap.begin(); it != updateBroadcastMap.end(); ++it) {
|
||||
delete(it.value());
|
||||
}
|
||||
|
||||
updateBroadcastMap.clear();
|
||||
}
|
||||
|
||||
RsGxsUpdateBroadcast *RsGxsUpdateBroadcast::get(RsGxsIfaceHelper *ifaceImpl)
|
||||
{
|
||||
QMap<RsGxsIfaceHelper*, RsGxsUpdateBroadcast*>::iterator it = updateBroadcastMap.find(ifaceImpl);
|
||||
if (it != updateBroadcastMap.end()) {
|
||||
return it.value();
|
||||
}
|
||||
|
||||
RsGxsUpdateBroadcast *updateBroadcast = new RsGxsUpdateBroadcast(ifaceImpl);
|
||||
updateBroadcastMap.insert(ifaceImpl, updateBroadcast);
|
||||
|
||||
return updateBroadcast;
|
||||
}
|
||||
|
||||
void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes)
|
||||
{
|
||||
#ifdef DEBUG_GXS_BROADCAST
|
||||
std::cerr << "onChangesReceived()" << std::endl;
|
||||
|
||||
{
|
||||
std::cerr << "Received changes for service " << (void*)changes.mService << ", expecting service " << (void*)mIfaceImpl->getTokenService() << std::endl;
|
||||
for(std::list<RsGxsGroupId>::const_iterator it(changes.mGrps.begin());it!=changes.mGrps.end();++it)
|
||||
std::cerr << "[GRP CHANGE] grp id: " << *it << std::endl;
|
||||
for(std::list<RsGxsGroupId>::const_iterator it(changes.mGrpsMeta.begin());it!=changes.mGrpsMeta.end();++it)
|
||||
std::cerr << "[GRP CHANGE] grp meta: " << *it << std::endl;
|
||||
for(std::map<RsGxsGroupId,std::vector<RsGxsMessageId> >::const_iterator it(changes.mMsgs.begin());it!=changes.mMsgs.end();++it)
|
||||
for(uint32_t i=0;i<it->second.size();++i)
|
||||
std::cerr << "[MSG CHANGE] grp id: " << it->first << ". Msg ID " << it->second[i] << std::endl;
|
||||
for(std::map<RsGxsGroupId,std::vector<RsGxsMessageId> >::const_iterator it(changes.mMsgsMeta.begin());it!=changes.mMsgsMeta.end();++it)
|
||||
for(uint32_t i=0;i<it->second.size();++i)
|
||||
std::cerr << "[MSG CHANGE] grp id: " << it->first << ". Msg Meta " << it->second[i] << std::endl;
|
||||
}
|
||||
#endif
|
||||
if(changes.mService != mIfaceImpl->getTokenService())
|
||||
{
|
||||
// std::cerr << "(EE) Incorrect service. Dropping." << std::endl;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (!changes.mMsgs.empty() || !changes.mMsgsMeta.empty())
|
||||
{
|
||||
emit msgsChanged(changes.mMsgs, changes.mMsgsMeta);
|
||||
}
|
||||
|
||||
if (!changes.mGrps.empty() || !changes.mGrpsMeta.empty())
|
||||
{
|
||||
emit grpsChanged(changes.mGrps, changes.mGrpsMeta);
|
||||
}
|
||||
|
||||
emit changed();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user