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

no-copy socket read

Browse Source
This commit is contained in:
Matej Sekoranja
2011-08-28 10:10:56 +02:00
parent 872135a4b1
commit 44d092ffa7
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -472,11 +472,10 @@ namespace epics {
int requiredPosition = (currentStartPosition+requiredBytes);
while(_socketBuffer->getPosition()<requiredPosition) {
// read
// TODO wrap and do not copy !!!
char readBuffer[MAX_TCP_RECV];
size_t maxToRead = min(MAX_TCP_RECV,_socketBuffer->getRemaining());
ssize_t bytesRead = recv(_channel, readBuffer, maxToRead, 0);
_socketBuffer->put(readBuffer, 0, bytesRead);
int pos = _socketBuffer->getPosition();
ssize_t bytesRead = recv(_channel, (void*)(_socketBuffer->getArray()+pos),
_socketBuffer->getRemaining(), 0);
_socketBuffer->setPosition(pos+bytesRead);
if(bytesRead<=0) {

11
pvAccessApp/remote/blockingUDPTransport.cpp
View File

@@ -160,7 +160,6 @@ namespace epics {
// This function is always called from only one thread - this
// object's own thread.
char _readBuffer[MAX_UDP_RECV];
osiSockAddr fromAddress;
Transport::shared_pointer thisTransport = shared_from_this();
@@ -183,8 +182,8 @@ namespace epics {
socklen_t addrStructSize = sizeof(sockaddr);
int bytesRead = recvfrom(_channel, _readBuffer,
MAX_UDP_RECV, 0, (sockaddr*)&fromAddress,
int bytesRead = recvfrom(_channel, (void*)_receiveBuffer->getArray(),
_receiveBuffer->getRemaining(), 0, (sockaddr*)&fromAddress,
&addrStructSize);
if(bytesRead>0) {
@@ -203,11 +202,7 @@ namespace epics {
}
if(!ignore) {
// TODO do not copy.... wrap the buffer!!!
_receiveBuffer->put(_readBuffer, 0,
bytesRead <_receiveBuffer->getRemaining() ?
bytesRead : _receiveBuffer->getRemaining()
);
_receiveBuffer->setPosition(bytesRead);
_receiveBuffer->flip();