update base

Core/base/debug/backtrace.h

@@ -21,7 +21,7 @@ namespace {
         void** current;
         void** end;
     };
-
+#if OS_ANDROID
     static _Unwind_Reason_Code unwindCallback(struct _Unwind_Context* context, void* arg)
     {
         BacktraceState* state = static_cast<BacktraceState*>(arg);
@@ -35,6 +35,7 @@ namespace {
         }
         return _URC_NO_REASON;
     }
+#endif
 
 }
 namespace base {

Core/base/debug/memory_debug.cc

@@ -4,7 +4,7 @@
 #include "base/debug/memory_tracker.h"
 
 #if DEBUG_MEMORY
-void * operator new (size_t size, const char* file, int line) {
+void * operator new (size_t size, const char* file, int line) noexcept {
     if(0 == size){
         return NULL;
     }
@@ -13,7 +13,7 @@ void * operator new (size_t size, const char* file, int line) {
     return p;
 }
 
-void * operator new [](size_t size, const char* file, int line) {
+void * operator new [](size_t size, const char* file, int line) noexcept {
     void *p = ::operator new(size);
     base::MemoryTracker::Instance()->AddMemInfo(reinterpret_cast<intptr_t>(p), file, line);
     return p;
@@ -31,4 +31,4 @@ void operator delete[](void * pointer, const char* file, int line) noexcept{
     ::operator delete(pointer);
 }
 
-#endif
+#endif

Core/base/debug/memory_debug.h

@@ -8,8 +8,8 @@
 
 #if DEBUG_MEMORY
 
-void * operator new (size_t size, const char* file, int line) ;
-void * operator new [](size_t size, const char* file, int line) ;
+void * operator new (size_t size, const char* file, int line) noexcept;
+void * operator new [](size_t size, const char* file, int line) noexcept;
 void operator delete (void * pointer, const char* file, int line) noexcept;
 void operator delete[](void * pointer, const char* file, int line) noexcept;
 
@@ -37,4 +37,4 @@ void operator delete[](void * pointer, const char* file, int line) noexcept;
             delete[] ptr; \
 
 #endif
-#endif
+#endif

Core/base/io_buffer.cc

@@ -1,7 +1,7 @@
 #include "base/io_buffer.h"
 
 namespace base {
-IOBuffer::IOBuffer(size_t size) {
+IOBuffer::IOBuffer(int size) {
   data_ = new char[size];
 }
 
@@ -12,7 +12,7 @@ IOBuffer::~IOBuffer() {
   data_ = nullptr;
 }
 
-IOBufferWithSize::IOBufferWithSize(size_t size) : IOBuffer(size), size_(size) {}
+IOBufferWithSize::IOBufferWithSize(int size) : IOBuffer(size), size_(size) {}
 
 GrowableIOBuffer::GrowableIOBuffer() : IOBuffer(), capacity_(0), offset_(0) {}
 

Core/base/io_buffer.h

@@ -7,7 +7,7 @@
 namespace base {
 class IOBuffer : public base::RefCountPtr<IOBuffer> {
  public:
-  IOBuffer(size_t size);
+  IOBuffer(int size);
   IOBuffer() : data_(NULL) {}
   virtual ~IOBuffer();
   char* data() { return data_; }
@@ -19,13 +19,13 @@ class IOBuffer : public base::RefCountPtr<IOBuffer> {
 
 class IOBufferWithSize : public IOBuffer {
  public:
-  explicit IOBufferWithSize(size_t size);
+  explicit IOBufferWithSize(int size);
   virtual ~IOBufferWithSize() {}
 
-  size_t size() const { return size_; }
+  int size() const { return size_; }
 
  protected:
-  size_t size_;
+  int size_;
 };
 
 class StringIOBuffer : public IOBuffer {
@@ -45,7 +45,7 @@ class StringIOBuffer : public IOBuffer {
 
 class DrainableIOBuffer : public IOBuffer {
  public:
-  DrainableIOBuffer(IOBuffer* base, size_t size)
+  DrainableIOBuffer(IOBuffer* base, int size)
       : IOBuffer(base->data()), base_(base), size_(size), used_(0) {}
 
   virtual ~DrainableIOBuffer() { data_ = nullptr; }
@@ -62,8 +62,8 @@ class DrainableIOBuffer : public IOBuffer {
  private:
   base::ScopedRefPtr<IOBuffer> base_;
 
-  size_t size_;
-  size_t used_;
+  int size_;
+  int used_;
 };
 
 class GrowableIOBuffer : public IOBuffer {

Core/base/poller/poller.h

@@ -30,7 +30,7 @@ class Poller {
 
   virtual void RemoveFileDescriptor(int fd) = 0;
 
-  virtual void Poll(int timeout) = 0;
+  virtual void Poll(int64_t timeout) = 0;
 
  protected:
   ScopedPtrMap<int, FileDescriptor> file_descriptors_;

Core/base/poller/select_poller.cc

@@ -13,7 +13,7 @@ SelectPoller::~SelectPoller() {}
 
 void SelectPoller::WatchFileDescriptor(FileDescriptor* descriptor) {
   int fd = descriptor->fd();
-  int event = descriptor->event();
+
   auto iter = file_descriptors_.find(fd);
   if (iter != file_descriptors_.end()) {
     return;
@@ -41,7 +41,7 @@ void SelectPoller::RemoveFileDescriptor(int fd) {
   fd_set_.erase(fd);
 }
 
-void SelectPoller::Poll(int timeout) {
+void SelectPoller::Poll(int64_t timeout) {
   struct timeval tv = {0, 0};
   struct timeval* ptv = &tv;
 

Core/base/poller/select_poller.h

@@ -18,7 +18,7 @@ class SelectPoller : public Poller {
 
   virtual void RemoveFileDescriptor(int fd);
 
-  virtual void Poll(int timeout);
+  virtual void Poll(int64_t timeout);
 
  private:
   void ResetFileDescriptor();

Core/base/rand_util.cc

@@ -9,7 +9,7 @@ void RandomBuffer(char* buffer, size_t length) {
   if (!seeded) {
     seeded = true;
     // could fread from /dev/random
-    srand(time(NULL));
+    srand((unsigned)time(NULL));
   }
   size_t i;
   for (i = 0; i < length; i++) {

Core/base/scoped_vector.h

@@ -29,7 +29,7 @@ class ScopedVector {
 
     bool empty() { return vector_.empty(); }
 
-    T* operator[] (int index) {
+    T* operator[] (size_t index) {
         return vector_[index];
     }
 
@@ -43,7 +43,7 @@ class ScopedVector {
         vector_.pop_back();
     }
 
-    T* at(int n) {
+    T* at(size_t n) {
         return vector_.at(n);
     }
 

Core/base/threading/message_pump_io_posix.cc

@@ -66,7 +66,10 @@ void MessagePumpIOPosix::Run(Delegate* delegate) {
 
 void MessagePumpIOPosix::OnFileCanRead(int fd) {
   char buf;
-  int nread = read(fd, &buf, 1);
+  size_t nread = read(fd, &buf, 1);
+  if(nread != 1) {
+    DLOG(ERROR) <<"MessagePumpIOPosix Read Error";
+  }
 }
 
 void MessagePumpIOPosix::OnFileCanWrite(int fd) {}