-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp index ee5ea18..992cb8c 100644 --- a/x11/ipc/server/ocopserver.cpp +++ b/x11/ipc/server/ocopserver.cpp @@ -28,13 +28,13 @@ OCopServer::~OCopServer() { } void OCopServer::init() { /* * we set SIGPIPE to SIG_IGN * to get EPIPE on reads ;) */ - qWarning("SIGPIPE to be ignored"); +// qWarning("SIGPIPE to be ignored"); signal(SIGPIPE, SIG_IGN ); /* * initialize some variables */ m_server = 0l; @@ -118,13 +118,13 @@ void OCopServer::newOnServer() { * we got a successfull new connection * be happy * set SocketNotifier * connect it * and a OCOPClient */ - qWarning("Heureka new connection %d", fd ); +// qWarning("Heureka new connection %d", fd ); registerClient( fd ); } int OCopServer::accept() { /* @@ -191,14 +191,14 @@ void OCopServer::newOnClient( int fd ) { * dispatching it not */ OCOPPacket packet( head.type, channel, func, data ); dispatch( packet, fd ); }else{ - qWarning("magic does not match"); - qWarning("magic %d", head.magic ); +// qWarning("magic does not match"); +// qWarning("magic %d", head.magic ); } } void OCopServer::registerClient( int fd ) { if (m_clients.contains(fd) ) return; @@ -206,13 +206,13 @@ void OCopServer::registerClient( int fd ) { connect(notify, SIGNAL(activated(int) ), this, SLOT(newOnClient(int) ) ); OCOPClient client; client.fd = fd; client.notify = notify; m_clients.insert( client.fd, client ); - qWarning("clients are up to %d", m_clients.count() ); +// qWarning("clients are up to %d", m_clients.count() ); }; void OCopServer::deregisterClient(int fd ) { QMap<int, OCOPClient>::Iterator it = m_clients.find( fd ); if (it != m_clients.end() ) { /* * TIME_ME @@ -226,54 +226,54 @@ void OCopServer::deregisterClient(int fd ) { QMap<QCString, QValueList<int> >::Iterator it2; repeatIt: for ( it2 = m_channels.begin(); it2 != m_channels.end(); ++it2 ) { /* * The channel contains this fd */ - qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); +// qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); if ( it2.data().contains( fd ) ) { qWarning("contains"); QValueList<int> array = it2.data(); /* * remove channel or just replace */ if ( array.count() == 1 || array.count() == 0) { - qWarning("Invalidate!"); +// qWarning("Invalidate!"); /* is the list now invalidatet? */ m_channels.remove( it2 ); /* That is the first go to of my life * but Iterator remove( Iterator ) * does not exist * it2 = --it2; * does not work reliable too * so the only way is to reiterate :( */ goto repeatIt; }else{ - qWarning("removing count %d %d",fd, array.count() ); +// qWarning("removing count %d %d",fd, array.count() ); QValueList<int>::Iterator it3 = array.find( fd ); it3 = array.remove( it3 ); QCString key = it2.key().copy(); it2 = m_channels.replace( key, array ); } } } // off all channels OCOPClient client = it.data(); delete client.notify; m_clients.remove(fd ); close(fd ); } - qWarning("clients are now at %d", m_clients.count() ); -}; +// qWarning("clients are now at %d", m_clients.count() ); +} /** * this function will evaluate * the package and then do the appropriate thins */ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { - qWarning("packet.type() == %d", packet.type() ); +// qWarning("packet.type() == %d", packet.type() ); switch( packet.type() ) { case OCOPPacket::Register: registerClient(sourceFD ); break; case OCOPPacket::Unregister: deregisterClient(sourceFD ); @@ -297,13 +297,13 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { case OCOPPacket::Return: break; /* not implemented :( */ case OCOPPacket::Signal: break; case OCOPPacket::IsRegistered: - qWarning("Server:IsRegistered %s", packet.channel().data() ); +// qWarning("Server:IsRegistered %s", packet.channel().data() ); isRegistered( packet.channel(), sourceFD ); break; }; } void OCopServer::errorOnServer() { /* @@ -330,23 +330,23 @@ void OCopServer::addChannel( const QCString& channel, QMap<QCString, QValueList<int> >::Iterator it; it = m_channels.find( channel ); if ( it != m_channels.end() ) { /* could be empty */ QValueList<int> list = it.data(); list.append( fd ); - qWarning("count is now in addChannel %d %s", list.count(), channel.data() ); + qWarning("Server:count is now in addChannel %d %s", list.count(), channel.data() ); it = m_channels.replace( channel, list ); }else { QValueList<int> ints; ints.append( fd ); m_channels.insert( channel, ints ); } }; void OCopServer::delChannel( const QCString& channel, int fd ) { - qWarning("remove %s, %d", channel.data(), fd ); +// qWarning("remove %s, %d", channel.data(), fd ); if (!m_channels.contains( channel ) ) return; QMap<QCString, QValueList<int> >::Iterator it; it = m_channels.find( channel ); @@ -358,17 +358,17 @@ void OCopServer::delChannel( const QCString& channel, QValueList<int> ints = it.data(); QValueList<int>::Iterator rem = ints.find( fd ); rem = ints.remove( rem ); QCString str = it.key().copy(); m_channels.replace( str, ints ); } - qWarning(" channel count is now %d", ints.count() ); +// qWarning(" channel count is now %d", ints.count() ); } } void OCopServer::isRegistered( const QCString& channel, int fd) { - qWarning("Server:isRegistered %s", channel.data() ); +// qWarning("Server:isRegistered %s", channel.data() ); OCOPHead head; QCString func(2); memset(&head, 0, sizeof(head ) ); head.magic = 47; head.type = OCOPPacket::IsRegistered; @@ -376,16 +376,16 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { head.funclen = func.size(); head.datalen = 0; if ( isChannelRegistered( channel ) ) { //is registered func[0] = 1; - qWarning("Server:Channel is Registered %d", head.chlen); +// qWarning("Server:Channel is Registered %d", head.chlen); }else{ func[0] = 0; - qWarning("Server:Channel is NotRegistered"); +// qWarning("Server:Channel is NotRegistered"); } /** * write the head * and then channel * success/failure inside func @@ -400,13 +400,13 @@ QValueList<int> OCopServer::clients( const QCString& channel ) { void OCopServer::call( const OCOPPacket& p, int ) { QValueList<int> cli = clients( p.channel() ); QValueList<int>::Iterator it; OCOPHead head = p.head(); for (it = cli.begin(); it != cli.end(); ++it ) { - qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); +// qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); write( (*it), &head, sizeof(head ) ); /* expl. shared! */ write( (*it), p.channel().data(), p.channel().size() ); write( (*it), p.header().data(), p.header().size() ); write( (*it), p.content().data(), p.content().size() ); }; |