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

#4549 Fix grpc package sizes.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-02-21 11:01:39 +01:00
parent 8167d9f700
commit 26c8da692a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/GrpcInterface/RiaGrpcCaseService.cpp
View File

@ -266,10 +266,10 @@ void RiaActiveCellInfoStateHandler::assignCellCenter( rips::Vec3d*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
grpc::Status RiaActiveCellInfoStateHandler::assignCellCentersReply( rips::CellCenters* reply ) grpc::Status RiaActiveCellInfoStateHandler::assignCellCentersReply( rips::CellCenters* reply )
{ {
const size_t packageSize = RiaGrpcServiceInterface::numberOfMessagesForByteCount( sizeof( rips::CellCenters ) ); const size_t packageSize = RiaGrpcServiceInterface::numberOfDataUnitsInPackage( sizeof( rips::Vec3d ) );
size_t packageIndex = 0u; size_t indexInPackage = 0u;
reply->mutable_centers()->Reserve( (int)packageSize ); reply->mutable_centers()->Reserve( (int)packageSize );
for ( ; packageIndex < packageSize && m_currentCellIdx < m_activeCellInfo->reservoirCellCount(); ++packageIndex ) for ( ; indexInPackage < packageSize && m_currentCellIdx < m_activeCellInfo->reservoirCellCount(); ++indexInPackage )
{ {
rips::Vec3d singleCellCenter; rips::Vec3d singleCellCenter;
grpc::Status singleCellCenterStatus = assignNextActiveCellCenter( &singleCellCenter ); grpc::Status singleCellCenterStatus = assignNextActiveCellCenter( &singleCellCenter );
@ -283,7 +283,7 @@ grpc::Status RiaActiveCellInfoStateHandler::assignCellCentersReply( rips::CellCe
break; break;
} }
} }
if ( packageIndex > 0u ) if ( indexInPackage > 0u )
{ {
return Status::OK; return Status::OK;
} }
@ -350,10 +350,10 @@ void RiaActiveCellInfoStateHandler::assignCellCorners( rips::CellCorners*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Status RiaActiveCellInfoStateHandler::assignCellCornersReply( rips::CellCornersArray* reply ) Status RiaActiveCellInfoStateHandler::assignCellCornersReply( rips::CellCornersArray* reply )
{ {
const size_t packageSize = RiaGrpcServiceInterface::numberOfMessagesForByteCount( sizeof( rips::CellCornersArray ) ); const size_t packageSize = RiaGrpcServiceInterface::numberOfDataUnitsInPackage( sizeof( rips::CellCorners ) );
size_t packageIndex = 0u; size_t indexInPackage = 0u;
reply->mutable_cells()->Reserve( (int)packageSize ); reply->mutable_cells()->Reserve( (int)packageSize );
for ( ; packageIndex < packageSize && m_currentCellIdx < m_activeCellInfo->reservoirCellCount(); ++packageIndex ) for ( ; indexInPackage < packageSize && m_currentCellIdx < m_activeCellInfo->reservoirCellCount(); ++indexInPackage )
{ {
rips::CellCorners singleCellCorners; rips::CellCorners singleCellCorners;
grpc::Status singleCellCornersStatus = assignNextActiveCellCorners( &singleCellCorners ); grpc::Status singleCellCornersStatus = assignNextActiveCellCorners( &singleCellCorners );
@ -367,7 +367,7 @@ Status RiaActiveCellInfoStateHandler::assignCellCornersReply( rips::CellCornersA
break; break;
} }
} }
if ( packageIndex > 0u ) if ( indexInPackage > 0u )
{ {
return Status::OK; return Status::OK;
} }
@ -640,10 +640,10 @@ grpc::Status RiaSelectedCellsStateHandler::assignReply( rips::SelectedCells* rep
} }
} }
const size_t packageSize = RiaGrpcServiceInterface::numberOfMessagesForByteCount( sizeof( rips::SelectedCells ) ); const size_t packageSize = RiaGrpcServiceInterface::numberOfDataUnitsInPackage( sizeof( rips::SelectedCell ) );
size_t packageIndex = 0u; size_t indexInPackage = 0u;
reply->mutable_cells()->Reserve( (int)packageSize ); reply->mutable_cells()->Reserve( (int)packageSize );
for ( ; packageIndex < packageSize && m_currentItem < eclipseItems.size(); ++packageIndex ) for ( ; indexInPackage < packageSize && m_currentItem < eclipseItems.size(); ++indexInPackage )
{ {
rips::SelectedCell singleSelectedCell; rips::SelectedCell singleSelectedCell;
grpc::Status singleSelectedCellStatus = assignNextSelectedCell( &singleSelectedCell, eclipseItems ); grpc::Status singleSelectedCellStatus = assignNextSelectedCell( &singleSelectedCell, eclipseItems );
@ -658,7 +658,7 @@ grpc::Status RiaSelectedCellsStateHandler::assignReply( rips::SelectedCells* rep
} }
} }
if ( packageIndex > 0u ) if ( indexInPackage > 0u )
{ {
return Status::OK; return Status::OK;
} }

16
ApplicationCode/GrpcInterface/RiaGrpcGridService.cpp
View File

@ -79,10 +79,10 @@ grpc::Status RiaCellCenterStateHandler::init( const rips::GridRequest* request )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
grpc::Status RiaCellCenterStateHandler::assignReply( rips::CellCenters* reply ) grpc::Status RiaCellCenterStateHandler::assignReply( rips::CellCenters* reply )
{ {
const size_t packageSize = RiaGrpcServiceInterface::numberOfMessagesForByteCount( sizeof( rips::CellCenters ) ); const size_t packageSize = RiaGrpcServiceInterface::numberOfDataUnitsInPackage( sizeof( rips::Vec3d ) );
size_t packageIndex = 0u; size_t indexInPackage = 0u;
reply->mutable_centers()->Reserve( (int)packageSize ); reply->mutable_centers()->Reserve( (int)packageSize );
for ( ; packageIndex < packageSize && m_currentCellIdx < m_grid->cellCount(); ++packageIndex ) for ( ; indexInPackage < packageSize && m_currentCellIdx < m_grid->cellCount(); ++indexInPackage )
{ {
cvf::Vec3d center = m_grid->cell( m_currentCellIdx ).center(); cvf::Vec3d center = m_grid->cell( m_currentCellIdx ).center();
@ -94,7 +94,7 @@ grpc::Status RiaCellCenterStateHandler::assignReply( rips::CellCenters* reply )
cellCenter->set_z( center.z() ); cellCenter->set_z( center.z() );
m_currentCellIdx++; m_currentCellIdx++;
} }
if ( packageIndex > 0u ) if ( indexInPackage > 0u )
{ {
return Status::OK; return Status::OK;
} }
@ -113,12 +113,12 @@ void setCornerValues( rips::Vec3d* out, const cvf::Vec3d& in )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
grpc::Status RiaCellCenterStateHandler::assignCornersReply( rips::CellCornersArray* reply ) grpc::Status RiaCellCenterStateHandler::assignCornersReply( rips::CellCornersArray* reply )
{ {
const size_t packageSize = RiaGrpcServiceInterface::numberOfMessagesForByteCount( sizeof( rips::CellCornersArray ) ); const size_t packageSize = RiaGrpcServiceInterface::numberOfDataUnitsInPackage( sizeof( rips::CellCorners ) );
size_t packageIndex = 0u; size_t indexInPackage = 0u;
reply->mutable_cells()->Reserve( (int)packageSize ); reply->mutable_cells()->Reserve( (int)packageSize );
cvf::Vec3d cornerVerts[8]; cvf::Vec3d cornerVerts[8];
for ( ; packageIndex < packageSize && m_currentCellIdx < m_grid->cellCount(); ++packageIndex ) for ( ; indexInPackage < packageSize && m_currentCellIdx < m_grid->cellCount(); ++indexInPackage )
{ {
m_grid->cellCornerVertices( m_currentCellIdx, cornerVerts ); m_grid->cellCornerVertices( m_currentCellIdx, cornerVerts );
for ( cvf::Vec3d& corner : cornerVerts ) for ( cvf::Vec3d& corner : cornerVerts )
@ -138,7 +138,7 @@ grpc::Status RiaCellCenterStateHandler::assignCornersReply( rips::CellCornersArr
m_currentCellIdx++; m_currentCellIdx++;
} }
if ( packageIndex > 0u ) if ( indexInPackage > 0u )
{ {
return Status::OK; return Status::OK;
} }