Switch to standard integer types in gpu/.

gpu/command_buffer/client/cmd_buffer_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the implementation of the command buffer helper class.
 
 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "gpu/command_buffer/common/buffer.h"
 #include "gpu/command_buffer/common/command_buffer.h"
@@ skipping 43 matching lines @@
 void CommandBufferHelper::CalcImmediateEntries(int waiting_count) {
   DCHECK_GE(waiting_count, 0);
 
   // Check if usable & allocated.
   if (!usable() || !HaveRingBuffer()) {
     immediate_entry_count_ = 0;
     return;
   }
 
   // Get maximum safe contiguous entries.
-  const int32 curr_get = get_offset();
+  const int32_t curr_get = get_offset();
   if (curr_get > put_) {
     immediate_entry_count_ = curr_get - put_ - 1;
   } else {
     immediate_entry_count_ =
         total_entry_count_ - put_ - (curr_get == 0 ? 1 : 0);
   }
 
   // Limit entry count to force early flushing.
   if (flush_automatically_) {
-    int32 limit =
+    int32_t limit =
         total_entry_count_ /
         ((curr_get == last_put_sent_) ? kAutoFlushSmall : kAutoFlushBig);
 
-    int32 pending =
+    int32_t pending =
         (put_ + total_entry_count_ - last_put_sent_) % total_entry_count_;
 
     if (pending > 0 && pending >= limit) {
       // Time to force flush.
       immediate_entry_count_ = 0;
     } else {
       // Limit remaining entries, but not lower than waiting_count entries to
       // prevent deadlock when command size is greater than the flush limit.
       limit -= pending;
       limit = limit < waiting_count ? waiting_count : limit;
       immediate_entry_count_ =
           immediate_entry_count_ > limit ? limit : immediate_entry_count_;
     }
   }
 }
 
 bool CommandBufferHelper::AllocateRingBuffer() {
   if (!usable()) {
     return false;
   }
 
   if (HaveRingBuffer()) {
     return true;
   }
 
-  int32 id = -1;
+  int32_t id = -1;
   scoped_refptr<Buffer> buffer =
       command_buffer_->CreateTransferBuffer(ring_buffer_size_, &id);
   if (id < 0) {
     ClearUsable();
     DCHECK(error::IsError(command_buffer()->GetLastError()));
     return false;
   }
 
   ring_buffer_ = buffer;
   ring_buffer_id_ = id;
@@ skipping 16 matching lines @@
     ring_buffer_ = nullptr;
   }
 }
 
 void CommandBufferHelper::FreeRingBuffer() {
   CHECK((put_ == get_offset()) ||
       error::IsError(command_buffer_->GetLastState().error));
   FreeResources();
 }
 
-bool CommandBufferHelper::Initialize(int32 ring_buffer_size) {
+bool CommandBufferHelper::Initialize(int32_t ring_buffer_size) {
   ring_buffer_size_ = ring_buffer_size;
   return AllocateRingBuffer();
 }
 
 CommandBufferHelper::~CommandBufferHelper() {
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
   FreeResources();
 }
 
-bool CommandBufferHelper::WaitForGetOffsetInRange(int32 start, int32 end) {
+bool CommandBufferHelper::WaitForGetOffsetInRange(int32_t start, int32_t end) {
   DCHECK(start >= 0 && start <= total_entry_count_);
   DCHECK(end >= 0 && end <= total_entry_count_);
   if (!usable()) {
     return false;
   }
   command_buffer_->WaitForGetOffsetInRange(start, end);
   return command_buffer_->GetLastError() == gpu::error::kNoError;
 }
 
 void CommandBufferHelper::Flush() {
@@ skipping 52 matching lines @@
 
   CalcImmediateEntries(0);
 
   return true;
 }
 
 // Inserts a new token into the command stream. It uses an increasing value
 // scheme so that we don't lose tokens (a token has passed if the current token
 // value is higher than that token). Calls Finish() if the token value wraps,
 // which will be rare.
-int32 CommandBufferHelper::InsertToken() {
+int32_t CommandBufferHelper::InsertToken() {
   AllocateRingBuffer();
   if (!usable()) {
     return token_;
   }
   DCHECK(HaveRingBuffer());
   // Increment token as 31-bit integer. Negative values are used to signal an
   // error.
   token_ = (token_ + 1) & 0x7FFFFFFF;
   cmd::SetToken* cmd = GetCmdSpace<cmd::SetToken>();
   if (cmd) {
     cmd->Init(token_);
     if (token_ == 0) {
       TRACE_EVENT0("gpu", "CommandBufferHelper::InsertToken(wrapped)");
       // we wrapped
       Finish();
       DCHECK_EQ(token_, last_token_read());
     }
   }
   return token_;
 }
 
 // Waits until the current token value is greater or equal to the value passed
 // in argument.
-void CommandBufferHelper::WaitForToken(int32 token) {
+void CommandBufferHelper::WaitForToken(int32_t token) {
   if (!usable() || !HaveRingBuffer()) {
     return;
   }
   // Return immediately if corresponding InsertToken failed.
   if (token < 0)
     return;
   if (token > token_) return;  // we wrapped
   if (last_token_read() >= token)
     return;
   Flush();
   command_buffer_->WaitForTokenInRange(token, token_);
 }
 
 // Waits for available entries, basically waiting until get >= put + count + 1.
 // It actually waits for contiguous entries, so it may need to wrap the buffer
 // around, adding a noops. Thus this function may change the value of put_. The
 // function will return early if an error occurs, in which case the available
 // space may not be available.
-void CommandBufferHelper::WaitForAvailableEntries(int32 count) {
+void CommandBufferHelper::WaitForAvailableEntries(int32_t count) {
   AllocateRingBuffer();
   if (!usable()) {
     return;
   }
   DCHECK(HaveRingBuffer());
   DCHECK(count < total_entry_count_);
   if (put_ + count > total_entry_count_) {
     // There's not enough room between the current put and the end of the
     // buffer, so we need to wrap. We will add noops all the way to the end,
     // but we need to make sure get wraps first, actually that get is 1 or
     // more (since put will wrap to 0 after we add the noops).
     DCHECK_LE(1, put_);
-    int32 curr_get = get_offset();
+    int32_t curr_get = get_offset();
     if (curr_get > put_ || curr_get == 0) {
       TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries");
       Flush();
       if (!WaitForGetOffsetInRange(1, put_))
         return;
       curr_get = get_offset();
       DCHECK_LE(curr_get, put_);
       DCHECK_NE(0, curr_get);
     }
     // Insert Noops to fill out the buffer.
-    int32 num_entries = total_entry_count_ - put_;
+    int32_t num_entries = total_entry_count_ - put_;
     while (num_entries > 0) {
-      int32 num_to_skip = std::min(CommandHeader::kMaxSize, num_entries);
+      int32_t num_to_skip = std::min(CommandHeader::kMaxSize, num_entries);
       cmd::Noop::Set(&entries_[put_], num_to_skip);
       put_ += num_to_skip;
       num_entries -= num_to_skip;
     }
     put_ = 0;
   }
 
   // Try to get 'count' entries without flushing.
   CalcImmediateEntries(count);
   if (immediate_entry_count_ < count) {
     // Try again with a shallow Flush().
     Flush();
     CalcImmediateEntries(count);
     if (immediate_entry_count_ < count) {
       // Buffer is full.  Need to wait for entries.
       TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries1");
       if (!WaitForGetOffsetInRange((put_ + count + 1) % total_entry_count_,
                                    put_))
         return;
       CalcImmediateEntries(count);
       DCHECK_GE(immediate_entry_count_, count);
     }
   }
 }
 
-int32 CommandBufferHelper::GetTotalFreeEntriesNoWaiting() const {
-  int32 current_get_offset = get_offset();
+int32_t CommandBufferHelper::GetTotalFreeEntriesNoWaiting() const {
+  int32_t current_get_offset = get_offset();
   if (current_get_offset > put_) {
     return current_get_offset - put_ - 1;
   } else {
     return current_get_offset + total_entry_count_ - put_ -
            (current_get_offset == 0 ? 1 : 0);
   }
 }
 
 bool CommandBufferHelper::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* pmd) {
   if (!HaveRingBuffer())
     return true;
 
-  const uint64 tracing_process_id =
+  const uint64_t tracing_process_id =
       base::trace_event::MemoryDumpManager::GetInstance()
           ->GetTracingProcessId();
 
   base::trace_event::MemoryAllocatorDump* dump =
       pmd->CreateAllocatorDump(base::StringPrintf(
           "gpu/command_buffer_memory/buffer_%d", ring_buffer_id_));
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   ring_buffer_size_);
   dump->AddScalar("free_size",
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   GetTotalFreeEntriesNoWaiting() * sizeof(CommandBufferEntry));
   auto guid = GetBufferGUIDForTracing(tracing_process_id, ring_buffer_id_);
   const int kImportance = 2;
   pmd->CreateSharedGlobalAllocatorDump(guid);
   pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
 
   return true;
 }
 
 }  // namespace gpu