summaryrefslogtreecommitdiffstats
path: root/o3d/command_buffer/service
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/command_buffer/service')
-rw-r--r--o3d/command_buffer/service/cross/buffer_rpc.cc36
-rw-r--r--o3d/command_buffer/service/cross/buffer_rpc_test.cc14
-rw-r--r--o3d/command_buffer/service/cross/cmd_buffer_engine.cc19
-rw-r--r--o3d/command_buffer/service/cross/cmd_buffer_engine_test.cc21
-rw-r--r--o3d/command_buffer/service/cross/cmd_parser.cc2
-rw-r--r--o3d/command_buffer/service/cross/cmd_parser_test.cc6
-rw-r--r--o3d/command_buffer/service/cross/mocks.h5
7 files changed, 54 insertions, 49 deletions
diff --git a/o3d/command_buffer/service/cross/buffer_rpc.cc b/o3d/command_buffer/service/cross/buffer_rpc.cc
index c09f526..668cc32 100644
--- a/o3d/command_buffer/service/cross/buffer_rpc.cc
+++ b/o3d/command_buffer/service/cross/buffer_rpc.cc
@@ -49,33 +49,33 @@ BufferRPCImpl::ReturnValue BufferRPCImpl::DoCall(int message_id,
size_t handle_count) {
switch (message_id) {
case INIT_CONNECTION: {
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
handler_->InitConnection();
return 0;
}
case CLOSE_CONNECTION:
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
handler_->CloseConnection();
return 0;
case REGISTER_SHARED_MEMORY: {
DCHECK_EQ(sizeof(size_t), size); // NOLINT
- DCHECK_EQ(1, handle_count);
+ DCHECK_EQ(1u, handle_count);
RPCShmHandle buffer = static_cast<RPCShmHandle>(handles[0]);
return handler_->RegisterSharedMemory(buffer,
*static_cast<const size_t *>(data));
}
case UNREGISTER_SHARED_MEMORY: {
DCHECK_EQ(sizeof(unsigned int), size); // NOLINT
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, handle_count);
unsigned int shm_id = *(static_cast<const unsigned int *>(data));
handler_->UnregisterSharedMemory(shm_id);
return 0;
}
case SET_COMMAND_BUFFER: {
DCHECK_EQ(sizeof(SetCommandBufferStruct), size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, handle_count);
const SetCommandBufferStruct *params =
static_cast<const SetCommandBufferStruct *>(data);
handler_->SetCommandBuffer(params->shm_id,
@@ -86,30 +86,30 @@ BufferRPCImpl::ReturnValue BufferRPCImpl::DoCall(int message_id,
}
case PUT: {
DCHECK_EQ(sizeof(CommandBufferOffset), size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, handle_count);
CommandBufferOffset offset =
*(static_cast<const CommandBufferOffset *>(data));
handler_->Put(offset);
return 0;
}
case GET:
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
return handler_->Get();
case GET_TOKEN:
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
return handler_->GetToken();
case WAIT_GET_CHANGES: {
DCHECK_EQ(sizeof(CommandBufferOffset), size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, handle_count);
CommandBufferOffset current_value =
*(static_cast<const CommandBufferOffset *>(data));
return handler_->WaitGetChanges(current_value);
}
case SIGNAL_GET_CHANGES: {
DCHECK_EQ(sizeof(SignalGetChangesStruct), size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, handle_count);
const SignalGetChangesStruct *params =
static_cast<const SignalGetChangesStruct *>(data);
handler_->SignalGetChanges(params->current_value,
@@ -117,13 +117,13 @@ BufferRPCImpl::ReturnValue BufferRPCImpl::DoCall(int message_id,
return 0;
}
case GET_STATUS: {
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
return handler_->GetStatus();
}
case GET_PARSE_ERROR: {
- DCHECK_EQ(0, size);
- DCHECK_EQ(0, handle_count);
+ DCHECK_EQ(0u, size);
+ DCHECK_EQ(0u, handle_count);
return handler_->GetParseError();
}
default:
diff --git a/o3d/command_buffer/service/cross/buffer_rpc_test.cc b/o3d/command_buffer/service/cross/buffer_rpc_test.cc
index a0afd7b..721b20b 100644
--- a/o3d/command_buffer/service/cross/buffer_rpc_test.cc
+++ b/o3d/command_buffer/service/cross/buffer_rpc_test.cc
@@ -79,7 +79,7 @@ TEST_F(BufferRPCImplTest, TestRegisterSharedMemory) {
EXPECT_CALL(buffer_sync_mock(), RegisterSharedMemory(shm, size))
.WillOnce(Return(1234));
RPCHandle handles[1] = {shm};
- EXPECT_EQ(1234, buffer_rpc_impl()->DoCall(
+ EXPECT_EQ(1234u, buffer_rpc_impl()->DoCall(
BufferRPCImpl::REGISTER_SHARED_MEMORY, &size, sizeof(size), handles, 1));
}
@@ -115,7 +115,7 @@ TEST_F(BufferRPCImplTest, TestPut) {
// properly forwarded.
TEST_F(BufferRPCImplTest, TestGet) {
EXPECT_CALL(buffer_sync_mock(), Get()).WillOnce(Return(9375));
- EXPECT_EQ(9375, buffer_rpc_impl()->DoCall(BufferRPCImpl::GET, NULL, 0, NULL,
+ EXPECT_EQ(9375u, buffer_rpc_impl()->DoCall(BufferRPCImpl::GET, NULL, 0, NULL,
0));
}
@@ -123,7 +123,7 @@ TEST_F(BufferRPCImplTest, TestGet) {
// properly forwarded.
TEST_F(BufferRPCImplTest, TestGetToken) {
EXPECT_CALL(buffer_sync_mock(), GetToken()).WillOnce(Return(1618));
- EXPECT_EQ(1618, buffer_rpc_impl()->DoCall(BufferRPCImpl::GET_TOKEN, NULL, 0,
+ EXPECT_EQ(1618u, buffer_rpc_impl()->DoCall(BufferRPCImpl::GET_TOKEN, NULL, 0,
NULL, 0));
}
@@ -133,7 +133,7 @@ TEST_F(BufferRPCImplTest, TestWaitGetChanges) {
CommandBufferOffset value = 339;
EXPECT_CALL(buffer_sync_mock(), WaitGetChanges(value))
.WillOnce(Return(16180));
- EXPECT_EQ(16180, buffer_rpc_impl()->DoCall(BufferRPCImpl::WAIT_GET_CHANGES,
+ EXPECT_EQ(16180u, buffer_rpc_impl()->DoCall(BufferRPCImpl::WAIT_GET_CHANGES,
&value, sizeof(value), NULL, 0));
}
@@ -152,7 +152,8 @@ TEST_F(BufferRPCImplTest, TestSignalGetChanges) {
TEST_F(BufferRPCImplTest, TestGetStatus) {
EXPECT_CALL(buffer_sync_mock(), GetStatus())
.WillOnce(Return(BufferSyncInterface::kParseError));
- EXPECT_EQ(BufferSyncInterface::kParseError,
+ EXPECT_EQ(static_cast<BufferRPCImpl::ReturnValue>(
+ BufferSyncInterface::kParseError),
buffer_rpc_impl()->DoCall(BufferRPCImpl::GET_STATUS, NULL, 0, NULL,
0));
}
@@ -162,7 +163,8 @@ TEST_F(BufferRPCImplTest, TestGetStatus) {
TEST_F(BufferRPCImplTest, TestGetParseError) {
EXPECT_CALL(buffer_sync_mock(), GetParseError())
.WillOnce(Return(BufferSyncInterface::kParseOutOfBounds));
- EXPECT_EQ(BufferSyncInterface::kParseOutOfBounds,
+ EXPECT_EQ(static_cast<BufferRPCImpl::ReturnValue>(
+ BufferSyncInterface::kParseOutOfBounds),
buffer_rpc_impl()->DoCall(BufferRPCImpl::GET_PARSE_ERROR, NULL, 0,
NULL, 0));
}
diff --git a/o3d/command_buffer/service/cross/cmd_buffer_engine.cc b/o3d/command_buffer/service/cross/cmd_buffer_engine.cc
index b39f993..9637206 100644
--- a/o3d/command_buffer/service/cross/cmd_buffer_engine.cc
+++ b/o3d/command_buffer/service/cross/cmd_buffer_engine.cc
@@ -129,12 +129,13 @@ void CommandBufferEngine::Put(CommandBufferOffset offset) {
}
}
-// Retrieves the get value. This returns -1 if there is no current parser.
+// Retrieves the get value. This returns kInvalidCommandBufferOffset
+// if there is no current parser.
CommandBufferOffset CommandBufferEngine::Get() {
if (parser_.get()) {
return parser_->get();
} else {
- return -1;
+ return kInvalidCommandBufferOffset;
}
}
@@ -143,9 +144,10 @@ unsigned int CommandBufferEngine::GetToken() {
return token_;
}
-// Executes commands until get is different from the value passed in. It will
-// return immediately if the get value is already different, or if the engine
-// is not in the kParsing status, or if the buffer is empty. It will return -1
+// Executes commands until get is different from the value passed
+// in. It will return immediately if the get value is already
+// different, or if the engine is not in the kParsing status, or if
+// the buffer is empty. It will return kInvalidCommandBufferOffset
// if there is no current buffer.
CommandBufferOffset CommandBufferEngine::WaitGetChanges(
CommandBufferOffset current_value) {
@@ -157,7 +159,7 @@ CommandBufferOffset CommandBufferEngine::WaitGetChanges(
}
return parser_->get();
} else {
- return -1;
+ return kInvalidCommandBufferOffset;
}
}
@@ -279,10 +281,11 @@ bool CommandBufferEngine::DoWork() {
}
// Signals that get has changed, sending a RPC message back to the client. It
-// will send -1 if there is no current buffer.
+// will send kInvalidCommandBufferOffset if there is no current buffer.
void CommandBufferEngine::DoSignalChangedGet(int rpc_message_id) {
DCHECK(client_rpc_);
- CommandBufferOffset get = parser_.get() ? parser_->get() : -1;
+ CommandBufferOffset get = parser_.get() ? parser_->get() :
+ kInvalidCommandBufferOffset;
client_rpc_->SendCall(rpc_message_id, &get, sizeof(get), NULL, 0);
}
diff --git a/o3d/command_buffer/service/cross/cmd_buffer_engine_test.cc b/o3d/command_buffer/service/cross/cmd_buffer_engine_test.cc
index 5e06153..7f32b3a 100644
--- a/o3d/command_buffer/service/cross/cmd_buffer_engine_test.cc
+++ b/o3d/command_buffer/service/cross/cmd_buffer_engine_test.cc
@@ -135,31 +135,31 @@ TEST_F(CommandBufferEngineTest, TestInitialization) {
EXPECT_TRUE(engine()->parser() == NULL);
EXPECT_EQ(BufferSyncInterface::kNotConnected, engine()->GetStatus());
EXPECT_EQ(BufferSyncInterface::kParseNoError, engine()->GetParseError());
- EXPECT_EQ(-1, engine()->Get());
- EXPECT_EQ(0, engine()->GetToken());
+ EXPECT_EQ(kInvalidCommandBufferOffset, engine()->Get());
+ EXPECT_EQ(0u, engine()->GetToken());
engine()->InitConnection();
EXPECT_EQ(BufferSyncInterface::kNoBuffer, engine()->GetStatus());
EXPECT_EQ(BufferSyncInterface::kParseNoError, engine()->GetParseError());
- EXPECT_EQ(-1, engine()->Get());
+ EXPECT_EQ(kInvalidCommandBufferOffset, engine()->Get());
CommandBufferEntry *entries = InitCommandBuffer(25, 5);
ASSERT_TRUE(entries != NULL);
EXPECT_EQ(BufferSyncInterface::kParsing, engine()->GetStatus());
EXPECT_EQ(BufferSyncInterface::kParseNoError, engine()->GetParseError());
- EXPECT_EQ(5, engine()->Get());
+ EXPECT_EQ(5u, engine()->Get());
EXPECT_TRUE(engine()->parser() != NULL);
engine()->set_token(5678);
- EXPECT_EQ(5678, engine()->GetToken());
+ EXPECT_EQ(5678u, engine()->GetToken());
engine()->CloseConnection();
DestroyCommandBuffer();
EXPECT_EQ(BufferSyncInterface::kNotConnected, engine()->GetStatus());
EXPECT_EQ(BufferSyncInterface::kParseNoError, engine()->GetParseError());
- EXPECT_EQ(-1, engine()->Get());
+ EXPECT_EQ(kInvalidCommandBufferOffset, engine()->Get());
EXPECT_TRUE(engine()->parser() == NULL);
}
@@ -296,7 +296,7 @@ TEST_F(CommandBufferEngineTest, TestCommandWrapping) {
1,
2,
args1);
- DCHECK_EQ(10, put);
+ DCHECK_EQ(10u, put);
put = 0;
CommandBufferEntry args2[2];
@@ -373,7 +373,7 @@ TEST_F(CommandBufferEngineTest, TestSetBufferAndClose) {
engine()->SetCommandBuffer(shm_id, 0, kShmSize, 0);
EXPECT_EQ(BufferSyncInterface::kParsing, engine()->GetStatus());
EXPECT_EQ(BufferSyncInterface::kParseNoError, engine()->GetParseError());
- EXPECT_EQ(0, engine()->Get());
+ EXPECT_EQ(0u, engine()->Get());
// Destroy the old command buffer.
DestroyCommandBuffer();
@@ -491,7 +491,6 @@ TEST_F(CommandBufferEngineTest, TestNonRecoverableError) {
2,
args1);
- CommandBufferOffset fail_get = put;
CommandHeader header;
header.size = 3;
header.command = 4;
@@ -559,7 +558,7 @@ TEST_F(CommandBufferEngineTest, TestDoWork) {
while (engine()->HasWork()) {
EXPECT_TRUE(engine()->DoWork());
}
- EXPECT_EQ(0, process_mock()->message_count());
+ EXPECT_EQ(0u, process_mock()->message_count());
EXPECT_FALSE(process_mock()->would_have_blocked());
Mock::VerifyAndClearExpectations(process_mock());
@@ -583,7 +582,7 @@ TEST_F(CommandBufferEngineTest, TestDoWork) {
args1);
CommandBufferEntry args2[2];
- args2[0].value_uint32 = 5;
+ args2[0].value_uint32 = 5u;
args2[1].value_float = 6.f;
put += AddCommandWithExpect(entries + put,
BufferSyncInterface::kParseNoError,
diff --git a/o3d/command_buffer/service/cross/cmd_parser.cc b/o3d/command_buffer/service/cross/cmd_parser.cc
index 843d0b8..ffe1d09 100644
--- a/o3d/command_buffer/service/cross/cmd_parser.cc
+++ b/o3d/command_buffer/service/cross/cmd_parser.cc
@@ -49,7 +49,7 @@ CommandParser::CommandParser(void *shm_address,
// check proper alignments.
DCHECK_EQ(0, (reinterpret_cast<intptr_t>(shm_address)) % 4);
DCHECK_EQ(0, offset % 4);
- DCHECK_EQ(0, size % 4);
+ DCHECK_EQ(0u, size % 4);
// check that the command buffer fits into the memory buffer.
DCHECK_GE(shm_size, offset + size);
char * buffer_begin = static_cast<char *>(shm_address) + offset;
diff --git a/o3d/command_buffer/service/cross/cmd_parser_test.cc b/o3d/command_buffer/service/cross/cmd_parser_test.cc
index 3d50d8a..ae48a9b 100644
--- a/o3d/command_buffer/service/cross/cmd_parser_test.cc
+++ b/o3d/command_buffer/service/cross/cmd_parser_test.cc
@@ -96,8 +96,8 @@ class CommandParserTest : public testing::Test {
// Tests initialization conditions.
TEST_F(CommandParserTest, TestInit) {
scoped_ptr<CommandParser> parser(MakeParser(10));
- EXPECT_EQ(0, parser->get());
- EXPECT_EQ(0, parser->put());
+ EXPECT_EQ(0u, parser->get());
+ EXPECT_EQ(0u, parser->put());
EXPECT_TRUE(parser->IsEmpty());
}
@@ -227,7 +227,7 @@ TEST_F(CommandParserTest, TestWrap) {
param.value_int32 = 5;
AddDoCommandExpect(BufferSyncInterface::kParseNoError, 3, 1, &param);
- DCHECK_EQ(5, put);
+ DCHECK_EQ(5u, put);
put = 0;
parser->set_put(put);
EXPECT_EQ(put, parser->put());
diff --git a/o3d/command_buffer/service/cross/mocks.h b/o3d/command_buffer/service/cross/mocks.h
index dbd4c62..3135249 100644
--- a/o3d/command_buffer/service/cross/mocks.h
+++ b/o3d/command_buffer/service/cross/mocks.h
@@ -90,8 +90,8 @@ class AsyncAPIMock : public AsyncAPIInterface {
unsigned int arg_count,
const void* _args) {
DCHECK(engine_);
- DCHECK_EQ(1, command);
- DCHECK_EQ(1, arg_count);
+ DCHECK_EQ(1u, command);
+ DCHECK_EQ(1u, arg_count);
const CommandBufferEntry* args =
static_cast<const CommandBufferEntry*>(_args);
engine_->set_token(args[0].value_uint32);
@@ -133,6 +133,7 @@ class RPCProcessMock : public RPCProcessInterface {
bool AddMessage() {
++message_count_;
+ return true;
}
bool would_have_blocked() { return would_have_blocked_; }
generated by cgit v1.1 at 2025-03-05 04:18:38 +0000