epics/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

cleanup prints

Browse Source
This commit is contained in:
Michael Davidsaver
2017-11-01 15:56:35 -05:00
parent 09c4ab882b
commit 6d466bb847
7 changed files with 7 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
p2pApp/chancache.cpp
View File

@ -1,6 +1,7 @@
#include <stdio.h>
#include <epicsAtomic.h>
#include <errlog.h>
#include <pv/epicsException.h>
#include <pv/serverContext.h>
@ -25,7 +26,6 @@ ChannelCacheEntry::ChannelCacheEntry(ChannelCache* c, const std::string& n)
ChannelCacheEntry::~ChannelCacheEntry()
{
// Should *not* be holding cache->cacheLock
std::cout<<"Destroy client channel for '"<<channelName<<"'\n";
if(channel.get())
channel->destroy(); // calls channelStateChange() w/ DESTROY
epicsAtomicDecrSizeT(&num_instances);
@ -50,14 +50,6 @@ ChannelCacheEntry::CRequester::~CRequester()
epicsAtomicDecrSizeT(&num_instances);
}
void
ChannelCacheEntry::CRequester::message(std::string const & message, pvd::MessageType messageType)
{
ChannelCacheEntry::shared_pointer chan(this->chan);
if(chan)
std::cout<<"message to client about '"<<chan->channelName<<"' : "<<message<<"\n";
}
// for ChannelRequester
void
ChannelCacheEntry::CRequester::channelCreated(const pvd::Status& status,
@ -72,9 +64,6 @@ ChannelCacheEntry::CRequester::channelStateChange(pva::Channel::shared_pointer c
if(!chan)
return;
std::cout<<"Chan change '"<<chan->channelName<<"' is "
<<pva::Channel::ConnectionStateNames[connectionState]<<"\n";
{
Guard G(chan->cache->cacheLock);
@ -102,8 +91,6 @@ ChannelCacheEntry::CRequester::channelStateChange(pva::Channel::shared_pointer c
pva::ChannelRequester::shared_pointer req(chan->requester.lock());
if(req)
req->channelStateChange(*it, connectionState);
else
std::cout<<"GWChannel w/ dead requester\n";
}
}

3
p2pApp/chancache.h
View File

@ -62,7 +62,6 @@ struct epicsShareClass MonitorCacheEntry : public epics::pvData::MonitorRequeste
virtual void unlisten(epics::pvData::MonitorPtr const & monitor);
virtual std::string getRequesterName();
virtual void message(std::string const & message, epics::pvData::MessageType messageType);
};
struct epicsShareClass MonitorUser : public epics::pvData::Monitor
@ -101,7 +100,6 @@ struct epicsShareClass MonitorUser : public epics::pvData::Monitor
virtual void release(epics::pvData::MonitorElementPtr const & monitorElement);
virtual std::string getRequesterName();
virtual void message(std::string const & message, epics::pvData::MessageType messageType);
};
struct epicsShareClass ChannelCacheEntry
@ -142,7 +140,6 @@ struct epicsShareClass ChannelCacheEntry
ChannelCacheEntry::weak_pointer chan;
// for Requester
virtual std::string getRequesterName();
virtual void message(std::string const & message, epics::pvData::MessageType messageType);
// for ChannelRequester
virtual void channelCreated(const epics::pvData::Status& status,
epics::pvAccess::Channel::shared_pointer const & channel);

14
p2pApp/channel.cpp
View File

@ -38,12 +38,6 @@ GWChannel::getRequesterName()
return "GWChannel";
}
void
GWChannel::message(std::string const & message, pvd::MessageType messageType)
{
std::cout<<"message to client about '"<<entry->channelName<<"' : "<<message<<"\n";
}
void
GWChannel::destroy()
{}
@ -85,7 +79,6 @@ GWChannel::getField(pva::GetFieldRequester::shared_pointer const & requester,
std::string const & subField)
{
//TODO: cache for top level field?
std::cout<<"getField for "<<entry->channelName<<" '"<<subField<<"'\n";
entry->channel->getField(requester, subField);
}
@ -159,7 +152,6 @@ GWChannel::createMonitor(
pvd::MonitorRequester::shared_pointer const & monitorRequester,
pvd::PVStructure::shared_pointer const & pvRequest)
{
std::cout<<__PRETTY_FUNCTION__<<"\n";
ChannelCacheEntry::pvrequest_t ser;
// serialize request struct to string using host byte order (only used for local comparison)
pvd::serializeToVector(pvRequest.get(), EPICS_BYTE_ORDER, ser);
@ -193,10 +185,6 @@ GWChannel::createMonitor(
M = entry->channel->createMonitor(ment, pvRequest);
}
ment->mon = M;
std::cout<<"Monitor cache "<<entry->channelName<<" Miss\n";
} else {
std::cout<<"Monitor cache "<<entry->channelName<<" Hit\n";
}
}
@ -213,7 +201,7 @@ GWChannel::createMonitor(
} catch(std::exception& e) {
mon.reset();
std::cerr<<"Exception in "<<__PRETTY_FUNCTION__<<"\n"
std::cerr<<"Exception in GWChannel::createMonitor()\n"
"is "<<e.what()<<"\n";
startresult = pvd::Status(pvd::Status::STATUSTYPE_FATAL, "Error during GWChannel setup");
}

1
p2pApp/channel.h
View File

@ -27,7 +27,6 @@ struct epicsShareClass GWChannel : public epics::pvAccess::Channel
// for Requester
virtual std::string getRequesterName();
virtual void message(std::string const & message, epics::pvData::MessageType messageType);
// for Destroyable
virtual void destroy();

16
p2pApp/moncache.cpp
View File

@ -1,5 +1,6 @@
#include <epicsAtomic.h>
#include <errlog.h>
#define epicsExportSharedSymbols
#include "helper.h"
@ -91,8 +92,6 @@ MonitorCacheEntry::monitorConnect(pvd::Status const & status,
pvd::MonitorRequester::shared_pointer req((*it)->req);
if(req) {
req->monitorConnect(startresult, *it, structure);
} else {
std::cout<<"Dead requester in monitorConnect()\n";
}
}
}
@ -222,7 +221,6 @@ MonitorCacheEntry::unlisten(pvd::MonitorPtr const & monitor)
}
if(M) {
M->destroy();
std::cout<<__PRETTY_FUNCTION__<<" destroy client monitor\n";
}
FOREACH(interested_t::vector_type::iterator, it, end, tonotify) {
MonitorUser *usr = it->get();
@ -238,12 +236,6 @@ MonitorCacheEntry::getRequesterName()
return "MonitorCacheEntry";
}
void
MonitorCacheEntry::message(std::string const & message, pvd::MessageType messageType)
{
std::cout<<"message to Monitor cache entry about '"<<chan->channelName<<"' : "<<message<<"\n";
}
MonitorUser::MonitorUser(const MonitorCacheEntry::shared_pointer &e)
:entry(e)
,initial(true)
@ -382,9 +374,3 @@ MonitorUser::getRequesterName()
{
return "MonitorCacheEntry";
}
void
MonitorUser::message(std::string const & message, pvd::MessageType messageType)
{
std::cout<<"message to Monitor cache client : "<<message<<"\n";
}

15
p2pApp/server.cpp
View File

@ -103,20 +103,13 @@ GWServerChannelProvider::createChannel(std::string const & channelName,
return ret; // ignored by caller
}
void GWServerChannelProvider::destroy()
{
std::cout<<"GWServer destory request\n";
}
void GWServerChannelProvider::destroy() {}
GWServerChannelProvider::GWServerChannelProvider(const pva::ChannelProvider::shared_pointer& prov)
:cache(prov)
{
std::cout<<"GW Server ctor\n";
}
GWServerChannelProvider::~GWServerChannelProvider()
{
std::cout<<"GW Server dtor\n";
}
{}
GWServerChannelProvider::~GWServerChannelProvider() {}
void ServerConfig::drop(const char *client, const char *channel)
{

3
testApp/utilities.cpp
View File

@ -355,9 +355,6 @@ pva::MonitorElementPtr TestPVMonitor::poll()
buffer.pop_front();
}
testDiag("TestPVMonitor::poll %p %p", this, ret.get());
if(ret)
std::cout<<"# XXXZ "<<*ret->changedBitSet<<" "
<<*ret->overrunBitSet<<"\n";
return ret;
}