Commit de2ba9ec authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

release 1.3.1 for update

parent 0f11037f
......@@ -5,7 +5,7 @@
# your package manager, read subproject/README-nlohmann-json.md
#
project('caserver', 'cpp', version : '1.3.0',
project('caserver', 'cpp', version : '1.3.1',
default_options : ['c_std=c17', 'cpp_std=c++17'])
project_description = 'modular c++ server exposing Tango, EPICS and more control systems to clients anywhere'
......
......@@ -298,7 +298,6 @@ void CaCuTangoReadImpl::m_process_single(const CuData& da, const std::string& ch
}
void CaCuTangoReadImpl::unsubscribe(const string &src, const string &cha, int fd) {
printf("u received %s %s %d\n", src.c_str(), cha.c_str(), fd);
const int refcnt = m_unref(src, cha);
if(fd > -1 && refcnt >= 0) // if invoked from onXmit, fd will be -1
onUpdate(CaGenMsgBuilder(fd, "unsubscribe request received", false).set("method", "u").set("_class_", "u").set("total_refcnt", refcnt).set("channel", cha).set("src", src).msg());
......@@ -420,11 +419,11 @@ void CaCuTangoReadImpl::onUpdate(const CuData &data) {
cuprintf("[0x%lx] CaCuTangoReadImpl::onUpdate: fd %d is all set\n", pthread_self(), fd);
d->listener->onImplDataReady(d->sylinks.take_data(fd), std::list<std::string>(), std::list<int>{fd});
}
std::map<int, std::list<string> > su = d->sylinks.stillUnset();
printf("FDs still unset: { ");
for(std::map<int, std::list<std::string> > ::const_iterator it = su.begin(); it != su.end(); ++it)
printf(" %d, ", it->first);
printf(" } \n");
// std::map<int, std::list<string> > su = d->sylinks.stillUnset();
// printf("FDs still unset: { ");
// for(std::map<int, std::list<std::string> > ::const_iterator it = su.begin(); it != su.end(); ++it)
// printf(" %d, ", it->first);
// printf(" } \n");
}
d->listener->pluginOperation(CaPluHooks::hook.modules.tango_read.update, CuData("src", src).set("class", data["_class_"].s()));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment