Skip to content

U
uniset2
Commit d4c0defa authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Небольшие исправления типа ssize_t --> size_t

parent 19d7c730
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 29 deletions
extensions/UDPExchange/UDPExchange.cc
View file @ d4c0defa
......@@ -259,8 +259,8 @@ void UDPExchange::send()
/*
if( udp->isPending(ost::Socket::pendingOutput) )
{
ssize_t ret = udp->send((char*)(&h),sizeof(h));
if( ret<(ssize_t)sizeof(h) )
size_t ret = udp->send((char*)(&h),sizeof(h));
if( ret<(size_t)sizeof(h) )
{
cerr << myname << "(send data header): ret=" << ret << " sizeof=" << sizeof(h) << endl;
return;
......@@ -274,8 +274,8 @@ void UDPExchange::send()
// while( !udp->isPending(ost::Socket::pendingOutput) )
// msleep(30);
cout << myname << "(send): " << (*it) << endl;
ssize_t ret = udp->send((char*)(&(*it)),sizeof(UniSetUDP::UDPData));
if( ret<(ssize_t)sizeof(UniSetUDP::UDPData) )
size_t ret = udp->send((char*)(&(*it)),sizeof(UniSetUDP::UDPData));
if( ret<(size_t)sizeof(UniSetUDP::UDPData) )
{
cerr << myname << "(send data): ret=" << ret << " sizeof=" << sizeof(UniSetUDP::UDPData) << endl;
break;
......
extensions/UDPExchange/UDPNReceiver.cc
View file @ d4c0defa
......@@ -89,8 +89,9 @@ void UDPNReceiver::recv()
UniSetUDP::UDPMessage pack;
if( udp->isInputReady(recvTimeout) )
{
ssize_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
if( ret<(ssize_t)sizeof(pack.msg) )
/*
size_t ret = udp->UDPReceive::receive(&h,sizeof(h));
if( ret<(size_t)sizeof(h) )
{
cerr << myname << "(receive): ret=" << ret << " sizeof=" << sizeof(pack.msg) << endl;
return;
......@@ -115,19 +116,17 @@ void UDPNReceiver::recv()
{
for( int i=0; i<h.dcount;i++ )
{
ssize_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret < (ssize_t)sizeof(d) )
size_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret < (size_t)sizeof(d) )
return;
}
return;
}
#endif
#if 0
//cout << "***** request: " << udp->UDPSocket::getIPV4Peer() << endl;
for( int i=0; i<100;i++ )
{
ssize_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret<(ssize_t)sizeof(d) )
size_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret<(size_t)sizeof(d) )
{
cerr << myname << "(receive data " << i << "): ret=" << ret << " sizeof=" << sizeof(d) << endl;
break;
......
extensions/UDPExchange/UDPReceiver.cc
View file @ d4c0defa
......@@ -285,8 +285,8 @@ void UDPReceiver::recv()
{
if( udp->isInputReady(recvTimeout) )
{
ssize_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
if( ret < sizeof(UniSetUDP::UDPHeader) )
size_t ret = udp->UDPReceive::receive(&h,sizeof(h));
if( ret < sizeof(h) )
{
cerr << myname << "(receive): FAILED header ret=" << ret << " sizeof=" << sizeof(UniSetUDP::UDPHeader) << endl;
return;
......@@ -305,16 +305,26 @@ void UDPReceiver::recv()
/*
if( labs(pack.msg.header.num - pnum) > 1 )
{
cerr << "************ FAILED! ORDER PACKETS! recv.num=" << pack.msg.header.num
<< " num=" << pnum << endl;
for( int i=0; i<h.dcount;i++ )
{
size_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret < sizeof(d) )
return;
}
return;
}
pnum = pack.msg.header.num;
*/
{
uniset_mutex_lock l(packMutex);
// qpack[pack.msg.header.num] = pack;
qpack.push(pack);
size_t ret = udp->UDPReceive::receive(&d,sizeof(d));
if( ret < sizeof(d) )
{
cerr << myname << "(receive data " << i << "): ret=" << ret << " sizeof=" << sizeof(d) << endl;
break;
}
cout << myname << "(receive data " << i << "): " << d << endl;
}
return;
......
extensions/UDPExchange/UDPSender.cc
View file @ d4c0defa
......@@ -223,8 +223,8 @@ void UDPSender::send()
h.procID = getId();
h.dcount = mypack.size();
// receive
ssize_t ret = udp->send((char*)(&h),sizeof(h));
if( ret<(ssize_t)sizeof(h) )
size_t ret = udp->send((char*)(&h),sizeof(h));
if( ret<(size_t)sizeof(h) )
{
cerr << myname << "(send data header): ret=" << ret << " sizeof=" << sizeof(h) << endl;
return;
......@@ -235,8 +235,8 @@ void UDPSender::send()
for( ; it!=mypack.dlist.end(); ++it )
{
cout << myname << "(send): " << (*it) << endl;
ssize_t ret = udp->send((char*)(&(*it)),sizeof(*it));
if( ret<(ssize_t)sizeof(*it) )
size_t ret = udp->send((char*)(&(*it)),sizeof(*it));
if( ret<(size_t)sizeof(*it) )
{
cerr << myname << "(send data): ret=" << ret << " sizeof=" << sizeof(*it) << endl;
break;
......
extensions/UDPExchange/UNetReceiver.cc
View file @ d4c0defa
......@@ -268,14 +268,14 @@ bool UNetReceiver::recv()
if( !udp->isInputReady(recvTimeout) )
return false;
ssize_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
size_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
if( ret < sizeof(UniSetUDP::UDPHeader) )
{
dlog[Debug::CRIT] << myname << "(receive): FAILED header ret=" << ret << " sizeof=" << sizeof(UniSetUDP::UDPHeader) << endl;
return false;
}
ssize_t sz = pack.msg.header.dcount * sizeof(UniSetUDP::UDPData) + sizeof(UniSetUDP::UDPHeader);
size_t sz = pack.msg.header.dcount * sizeof(UniSetUDP::UDPData) + sizeof(UniSetUDP::UDPHeader);
if( ret < sz )
{
dlog[Debug::CRIT] << myname << "(receive): FAILED data ret=" << ret << " sizeof=" << sz
......
extensions/UDPExchange/UNetSender.cc
View file @ d4c0defa
......@@ -143,7 +143,7 @@ void UNetSender::real_send()
if( !udp->isPending(ost::Socket::pendingOutput) )
return;
ssize_t ret = udp->send( (char*)&(mypack.msg),sz);
size_t ret = udp->send( (char*)&(mypack.msg),sz);
if( ret < sz )
dlog[Debug::CRIT] << myname << "(send): FAILED ret=" << ret << " < sizeof=" << sz << endl;
}
......
extensions/UNet2/UNetReceiver.cc
View file @ d4c0defa
......@@ -268,14 +268,14 @@ bool UNetReceiver::recv()
if( !udp->isInputReady(recvTimeout) )
return false;
ssize_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
size_t ret = udp->UDPReceive::receive(&(pack.msg),sizeof(pack.msg));
if( ret < sizeof(UniSetUDP::UDPHeader) )
{
dlog[Debug::CRIT] << myname << "(receive): FAILED header ret=" << ret << " sizeof=" << sizeof(UniSetUDP::UDPHeader) << endl;
return false;
}
ssize_t sz = pack.msg.header.dcount * sizeof(UniSetUDP::UDPData) + sizeof(UniSetUDP::UDPHeader);
size_t sz = pack.msg.header.dcount * sizeof(UniSetUDP::UDPData) + sizeof(UniSetUDP::UDPHeader);
if( ret < sz )
{
dlog[Debug::CRIT] << myname << "(receive): FAILED data ret=" << ret << " sizeof=" << sz
......
extensions/UNet2/UNetSender.cc
View file @ d4c0defa
......@@ -143,7 +143,7 @@ void UNetSender::real_send()
if( !udp->isPending(ost::Socket::pendingOutput) )
return;
ssize_t ret = udp->send( (char*)&(mypack.msg),sz);
size_t ret = udp->send( (char*)&(mypack.msg),sz);
if( ret < sz )
dlog[Debug::CRIT] << myname << "(send): FAILED ret=" << ret << " < sizeof=" << sz << endl;
}
......
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