OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
ApplicationCode/SocketInterface/RiaSocketDataTransfer.cpp
View File

@@ -2,74 +2,78 @@
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSocketDataTransfer.h"
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RiaSocketDataTransfer::writeBlockDataToSocket(QTcpSocket* socket, const char* data, quint64 bytesToWrite, QStringList& errorMessages)
bool RiaSocketDataTransfer::writeBlockDataToSocket( QTcpSocket* socket,
const char* data,
quint64 bytesToWrite,
QStringList& errorMessages )
{
quint64 bytesWritten = 0;
quint64 maxBlockSize = maximumValueCountInBlock() * sizeof(double);
quint64 maxBlockSize = maximumValueCountInBlock() * sizeof( double );
while (bytesWritten < bytesToWrite)
while ( bytesWritten < bytesToWrite )
{
quint64 byteCountToWrite = qMin(bytesToWrite - bytesWritten, maxBlockSize);
quint64 byteCountToWrite = qMin( bytesToWrite - bytesWritten, maxBlockSize );
qint64 actuallyBytesWritten = socket->write(data + bytesWritten, byteCountToWrite);
if (actuallyBytesWritten < 0)
qint64 actuallyBytesWritten = socket->write( data + bytesWritten, byteCountToWrite );
if ( actuallyBytesWritten < 0 )
{
errorMessages.push_back("Error detected when writing data, error string from socket");
errorMessages.push_back(socket->errorString());
errorMessages.push_back( "Error detected when writing data, error string from socket" );
errorMessages.push_back( socket->errorString() );
return false;
}
bytesWritten += actuallyBytesWritten;
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RiaSocketDataTransfer::readBlockDataFromSocket(QTcpSocket* socket, char* data, quint64 bytesToRead, QStringList& errorMessages)
bool RiaSocketDataTransfer::readBlockDataFromSocket( QTcpSocket* socket,
char* data,
quint64 bytesToRead,
QStringList& errorMessages )
{
quint64 bytesRead = 0;
quint64 maxBlockSize = maximumValueCountInBlock() * sizeof(double);
quint64 maxBlockSize = maximumValueCountInBlock() * sizeof( double );
while (bytesRead < bytesToRead)
while ( bytesRead < bytesToRead )
{
if (socket->bytesAvailable())
if ( socket->bytesAvailable() )
{
quint64 byteCountToRead = bytesToRead - bytesRead;
byteCountToRead = qMin(byteCountToRead, maxBlockSize);
byteCountToRead = qMin( byteCountToRead, maxBlockSize );
qint64 actuallyBytesRead = socket->read(data + bytesRead, byteCountToRead);
if (actuallyBytesRead < 0)
qint64 actuallyBytesRead = socket->read( data + bytesRead, byteCountToRead );
if ( actuallyBytesRead < 0 )
{
errorMessages.push_back("Error detected when reading data, error string from socket");
errorMessages.push_back(socket->errorString());
errorMessages.push_back( "Error detected when reading data, error string from socket" );
errorMessages.push_back( socket->errorString() );
return false;
}
@@ -77,15 +81,15 @@ bool RiaSocketDataTransfer::readBlockDataFromSocket(QTcpSocket* socket, char* da
bytesRead += actuallyBytesRead;
#ifdef octave_oct_h
//octave_stdout << "Byte read " << bytesRead << " of a total of "<< bytesToRead << "\n";
// octave_stdout << "Byte read " << bytesRead << " of a total of "<< bytesToRead << "\n";
#endif
}
else
{
if (!socket->waitForReadyRead())
if ( !socket->waitForReadyRead() )
{
errorMessages.push_back("Waited for data for %1 milli seconds.");
errorMessages.push_back(socket->errorString());
errorMessages.push_back( "Waited for data for %1 milli seconds." );
errorMessages.push_back( socket->errorString() );
return false;
}
@@ -95,18 +99,15 @@ bool RiaSocketDataTransfer::readBlockDataFromSocket(QTcpSocket* socket, char* da
#ifdef octave_oct_h
OCTAVE_QUIT;
#endif
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
size_t RiaSocketDataTransfer::maximumValueCountInBlock()
{
return 20000;
}