Remove some unnecessary use of streams.

Remove some lingering uses of signed heap sizes.

Author: rmacnak

vm/heap.cc

@@ -551,7 +551,7 @@ bool Heap::ScavengePointer(Object* ptr) {
     new_target = ForwardingTarget(old_target);
   } else {
     // Target is now known to be reachable. Move it to to-space.
-    intptr_t size = old_target->HeapSize();
+    size_t size = old_target->HeapSize();
 
     uword new_target_addr;
     if (old_target->Addr() < survivor_end_) {
@@ -611,7 +611,7 @@ bool Heap::ScavengeClass(intptr_t cid) {
   }
 
   // Target is now known to be reachable. Move it to to-space.
-  intptr_t size = old_target->HeapSize();
+  size_t size = old_target->HeapSize();
 
   uword new_target_addr;
   if (old_target->Addr() < survivor_end_) {
@@ -810,7 +810,7 @@ bool Heap::SweepRegion(Region* region) {
     HeapObject obj = HeapObject::FromAddr(scan);
     if (obj->is_marked()) {
       obj->set_is_marked(false);
-      intptr_t size = obj->HeapSize();
+      size_t size = obj->HeapSize();
       old_size_ += size;
       scan += size;
     } else {

vm/os_android.cc

@@ -67,8 +67,7 @@ void OS::Print(const char* format, ...) {
   va_list args;
 
   va_start(args, format);
-  vfprintf(stdout, format, args);
-  fflush(stdout);
+  vdprintf(STDOUT_FILENO, format, args);
   va_end(args);
 
   va_start(args, format);
@@ -80,8 +79,7 @@ void OS::PrintErr(const char* format, ...) {
   va_list args;
 
   va_start(args, format);
-  vfprintf(stderr, format, args);
-  fflush(stderr);
+  vdprintf(STDERR_FILENO, format, args);
   va_end(args);
 
   va_start(args, format);

vm/os_fuchsia.cc

@@ -43,22 +43,17 @@ intptr_t OS::NumberOfAvailableProcessors() {
   return zx_system_get_num_cpus();
 }
 
-static void VFPrint(FILE* stream, const char* format, va_list args) {
-  vfprintf(stream, format, args);
-  fflush(stream);
-}
-
 void OS::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stdout, format, args);
+  vdprintf(STDOUT_FILENO, format, args);
   va_end(args);
 }
 
 void OS::PrintErr(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stderr, format, args);
+  vdprintf(STDERR_FILENO, format, args);
   va_end(args);
 }
 

vm/os_linux.cc

@@ -70,22 +70,17 @@ intptr_t OS::NumberOfAvailableProcessors() {
   return sysconf(_SC_NPROCESSORS_ONLN);
 }
 
-static void VFPrint(FILE* stream, const char* format, va_list args) {
-  vfprintf(stream, format, args);
-  fflush(stream);
-}
-
 void OS::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stdout, format, args);
+  vdprintf(STDOUT_FILENO, format, args);
   va_end(args);
 }
 
 void OS::PrintErr(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stderr, format, args);
+  vdprintf(STDERR_FILENO, format, args);
   va_end(args);
 }
 

vm/os_macos.cc

@@ -45,22 +45,17 @@ intptr_t OS::NumberOfAvailableProcessors() {
   return sysconf(_SC_NPROCESSORS_ONLN);
 }
 
-static void VFPrint(FILE* stream, const char* format, va_list args) {
-  vfprintf(stream, format, args);
-  fflush(stream);
-}
-
 void OS::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stdout, format, args);
+  vdprintf(STDOUT_FILENO, format, args);
   va_end(args);
 }
 
 void OS::PrintErr(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  VFPrint(stderr, format, args);
+  vdprintf(STDERR_FILENO, format, args);
   va_end(args);
 }
 

vm/virtual_memory_posix.cc

@@ -7,8 +7,10 @@
 
 #include "vm/virtual_memory.h"
 
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #if defined(OS_ANDROID) || defined(OS_LINUX)
 #include <sys/prctl.h>
@@ -20,21 +22,21 @@
 namespace psoup {
 
 MappedMemory MappedMemory::MapReadOnly(const char* filename) {
-  FILE* file = fopen(filename, "r");
-  if (file == nullptr) {
+  int fd = open(filename, O_RDONLY | O_CLOEXEC);
+  if (fd < 0) {
     FATAL("Failed to open '%s'\n", filename);
   }
   struct stat st;
-  if (fstat(fileno(file), &st) != 0) {
+  if (fstat(fd, &st) != 0) {
     FATAL("Failed to stat '%s'\n", filename);
   }
-  intptr_t size = st.st_size;
+  size_t size = st.st_size;
   void* address = mmap(nullptr, size, PROT_READ, MAP_FILE | MAP_PRIVATE,
-                       fileno(file), 0);
+                       fd, 0);
   if (address == MAP_FAILED) {
     FATAL("Failed to mmap '%s'\n", filename);
   }
-  int result = fclose(file);
+  int result = close(fd);
   ASSERT(result == 0);
 
   return MappedMemory(address, size);