Resubmission of native memory allocation info surfacing in Observatory. Fixed crashing tests and st…

runtime/vm/malloc_hooks.cc

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #if defined(DART_USE_TCMALLOC) && !defined(PRODUCT) &&                         \
     !defined(TARGET_ARCH_DBC) && !defined(HOST_OS_FUCHSIA)
 
 #include "vm/malloc_hooks.h"
@@ skipping 143 matching lines @@
   Sample* sample_;
   uword address_;
   intptr_t allocation_size_;
 
   // The number of frames that are generated by the malloc hooks and collection
   // of the stack trace. These frames are ignored when collecting the stack
   // trace for a memory allocation. If this number is incorrect, some tests in
   // malloc_hook_tests.cc might fail, particularily
   // StackTraceMallocHookLengthTest. If this value is updated, please make sure
   // that the MallocHooks test cases pass on all platforms.
+#if defined(DEBUG) && defined(HOST_ARCH_X64)
   static const intptr_t kSkipCount = 6;
+#elif defined(DEBUG) && defined(HOST_ARCH_IA32)
+  static const intptr_t kSkipCount = 5;
+#elif !(defined(PRODUCT) || defined(DEBUG)) &&                                 \
+    (defined(HOST_ARCH_X64) || defined(HOST_ARCH_IA32))
+  static const intptr_t kSkipCount = 5;
+#else
+#error Previously unsupported MallocHooks configuration. New kSkipCount may    \
+         need to be added.
+#endif

[siva, 2017/03/24 22:51:00]

Adding such target #ifs in a common file just makes the code hard to read. Can
this be abstracted into target specific files.

[bkonyi, 2017/03/27 17:50:25]

Done.

 };
 
 
 // Custom key/value trait specifically for address/size pairs. Unlike
 // RawPointerKeyValueTrait, the default value is -1 as 0 can be a valid entry.
 class AddressKeyValueTrait : public AllStatic {
  public:
   typedef const void* Key;
   typedef AllocationInfo* Value;
 
@@ skipping 261 matching lines @@
   }
 
   MallocLocker ml(MallocHooksState::malloc_hook_mutex(),
                   MallocHooksState::malloc_hook_mutex_owner());
   // Now that we hold the lock, check to make sure everything is still active.
   if ((ptr != NULL) && MallocHooksState::Active()) {
     AllocationInfo* allocation_info = NULL;
     if (MallocHooksState::address_map()->Lookup(ptr, &allocation_info)) {
       MallocHooksState::DecrementHeapAllocatedMemoryInBytes(
           allocation_info->allocation_size());
-      ASSERT(MallocHooksState::address_map()->Remove(ptr));
+      bool result = MallocHooksState::address_map()->Remove(ptr);
+      ASSERT(result);
       delete allocation_info;
     }
   }
 }
 
 }  // namespace dart
 
 #endif  // defined(DART_USE_TCMALLOC) && !defined(PRODUCT) &&
         // !defined(TARGET_ARCH_DBC) && !defined(HOST_OS_FUCHSIA)