From c59715f687ddb9e9b962afb3d04ad2b17537ae94 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 9 Sep 2015 18:22:16 -0400 Subject: [PATCH] cleanup commented code blocks --- src/remote/codec.cpp | 99 ------------------------ src/remoteClient/clientContextImpl.cpp | 100 ------------------------- 2 files changed, 199 deletions(-) diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp index 592b70d..ebdadae 100644 --- a/src/remote/codec.cpp +++ b/src/remote/codec.cpp @@ -1019,101 +1019,7 @@ namespace epics { std::size_t elementCount, std::size_t elementSize) { return false; - // _socketBuffer == existingBuffer -/* - std::size_t bytesToBeDeserialized = elementCount*elementSize; - - // TODO check if bytesToDeserialized < threshold that direct pays off? - - _directPayloadRead = bytesToBeDeserialized; - _directBuffer = deserializeTo; - - while (true) - { - // retrieve what's already in buffers - size_t availableBytes = min(_directPayloadRead, _socketBuffer->getRemaining()); - existingBuffer->getArray(_directBuffer, availableBytes); - _directPayloadRead -= availableBytes; - - if (_directPayloadRead == 0) - return true; - - _directBuffer += availableBytes; - - // subtract what was already processed - size_t pos = _socketBuffer->getPosition(); - _storedPayloadSize -= pos -_storedPosition; - _storedPosition = pos; - - // no more data and we have some payload left => read buffer - if (likely(_storedPayloadSize > 0)) - { - size_t bytesToRead = std::min(_directPayloadRead, _storedPayloadSize); - processReadIntoDirectBuffer(bytesToRead); -// std::cout << "d: " << bytesToRead << std::endl; - _storedPayloadSize -= bytesToRead; - _directPayloadRead -= bytesToRead; - } - - if (_directPayloadRead == 0) - return true; - - _stage = PROCESS_HEADER; - processReadCached(true, UNDEFINED_STAGE, _directPayloadRead); - - _storedPosition = _socketBuffer->getPosition(); - _storedLimit = _socketBuffer->getLimit(); - _socketBuffer->setLimit( - min(_storedPosition + _storedPayloadSize, _storedLimit) - ); - - } - - return true; -*/ } -/* - void AbstractCodec::processReadIntoDirectBuffer(size_t bytesToRead) - { - while (bytesToRead > 0) - { - ssize_t bytesRead = recv(_channel, _directBuffer, bytesToRead, 0); - - // std::cout << "d: " << bytesRead << std::endl; - - if(unlikely(bytesRead<=0)) - { - - if (bytesRead<0) - { - int socketError = SOCKERRNO; - - // interrupted or timeout - if (socketError == EINTR || - socketError == EAGAIN || - socketError == EWOULDBLOCK) - continue; - } - - // error (disconnect, end-of-stream) detected - close(); - - THROW_BASE_EXCEPTION("bytesRead < 0"); - - return; - } - - bytesToRead -= bytesRead; - _directBuffer += bytesRead; - - } - } -*/ - - - - - // // // BlockingAbstractCodec @@ -1228,11 +1134,6 @@ namespace epics { bac->processWrite(); } catch (connection_closed_exception &cce) { // noop - /* - LOG(logLevelDebug, - "connection closed by remote host while in sendThread at %s:%d: %s", - __FILE__, __LINE__, e.what()); - */ } catch (std::exception &e) { LOG(logLevelWarn, "an exception caught while in sendThread at %s:%d: %s", diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index fc6e92c..ffe72bb 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -2160,106 +2160,6 @@ namespace epics { } } - /* - virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) { - - bool notify = false; - - { - Lock guard(m_mutex); - - // if in overrun mode, check if some is free - if (m_overrunInProgress) - { - MonitorElementPtr newElement = m_monitorQueue.getFree(); - if (newElement.get() != 0) - { - // take new, put current in use - PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr; - copyUnchecked(pvStructure, newElement->pvStructurePtr); - - BitSetUtil::compress(m_monitorElement->changedBitSet, pvStructure); - BitSetUtil::compress(m_monitorElement->overrunBitSet, pvStructure); - m_monitorQueue.setUsed(m_monitorElement); - - m_monitorElement = newElement; - notify = true; - - m_overrunInProgress = false; - } - } - } - - if (notify) - { - EXCEPTION_GUARD(m_callback->monitorEvent(shared_from_this())); - } - - { - Lock guard(m_mutex); - - // setup current fields - PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr; - BitSet::shared_pointer changedBitSet = m_monitorElement->changedBitSet; - BitSet::shared_pointer overrunBitSet = m_monitorElement->overrunBitSet; - - // special treatment if in overrun state - if (m_overrunInProgress) - { - // lazy init - if (m_bitSet1.get() == 0) m_bitSet1.reset(new BitSet(changedBitSet->size())); - if (m_bitSet2.get() == 0) m_bitSet2.reset(new BitSet(overrunBitSet->size())); - - m_bitSet1->deserialize(payloadBuffer, transport.get()); - pvStructure->deserialize(payloadBuffer, transport.get(), m_bitSet1.get()); - m_bitSet2->deserialize(payloadBuffer, transport.get()); - - // OR local overrun - // TODO this does not work perfectly if bitSet is compressed !!! - // uncompressed bitSets should be used !!! - overrunBitSet->or_and(*(changedBitSet.get()), *(m_bitSet1.get())); - - // OR remove change - *(changedBitSet.get()) |= *(m_bitSet1.get()); - - // OR remote overrun - *(overrunBitSet.get()) |= *(m_bitSet2.get()); - } - else - { - // deserialize changedBitSet and data, and overrun bit set - changedBitSet->deserialize(payloadBuffer, transport.get()); - pvStructure->deserialize(payloadBuffer, transport.get(), changedBitSet.get()); - overrunBitSet->deserialize(payloadBuffer, transport.get()); - } - - // prepare next free (if any) - MonitorElementPtr newElement = m_monitorQueue.getFree(); - if (newElement.get() == 0) { - m_overrunInProgress = true; - return; - } - - // if there was overrun in progress we manipulated bitSets... compress them - if (m_overrunInProgress) { - BitSetUtil::compress(changedBitSet, pvStructure); - BitSetUtil::compress(overrunBitSet, pvStructure); - - m_overrunInProgress = false; - } - - copyUnchecked(pvStructure, newElement->pvStructurePtr); - - m_monitorQueue.setUsed(m_monitorElement); - - m_monitorElement = newElement; - } - - EXCEPTION_GUARD(m_callback->monitorEvent(shared_from_this())); - - } - */ - virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) {