Major maintenance patch of the profile mode.

[thirdparty/gcc.git] / libstdc++-v3 / include / profile / impl / profiler_vector_size.h

diff --git a/libstdc++-v3/include/profile/impl/profiler_vector_size.h b/libstdc++-v3/include/profile/impl/profiler_vector_size.h
index 48376cda694bb3a6ea46f00a7f0e496686416243..ad43779025e3f5728717ead7ac2d14836a216aa4 100644 (file)
--- a/libstdc++-v3/include/profile/impl/profiler_vector_size.h
+++ b/libstdc++-v3/include/profile/impl/profiler_vector_size.h
@@ -53,43 +53,46 @@ namespace __gnu_profile
   { _GLIBCXX_PROFILE_DATA(_S_vector_size) = new __trace_vector_size(); }
 
   inline void
-  __trace_vector_size_report(FILE* __f, __warning_vector_t& __warnings)
-  {
-    if (_GLIBCXX_PROFILE_DATA(_S_vector_size))
-      {
-       _GLIBCXX_PROFILE_DATA(_S_vector_size)->__collect_warnings(__warnings);
-       _GLIBCXX_PROFILE_DATA(_S_vector_size)->__write(__f);
-      }
-  }
+  __trace_vector_size_free()
+  { delete _GLIBCXX_PROFILE_DATA(_S_vector_size); }
 
   inline void
-  __trace_vector_size_construct(const void* __obj, std::size_t __num)
+  __trace_vector_size_report(FILE* __f, __warning_vector_t& __warnings)
+  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_vector_size), __f, __warnings); }
+
+  inline __container_size_info*
+  __trace_vector_size_construct(std::size_t __num)
   {
     if (!__profcxx_init())
-      return;
+      return 0;
+
+    if (!__reentrance_guard::__get_in())
+      return 0;
 
-    _GLIBCXX_PROFILE_DATA(_S_vector_size)->__insert(__obj, __get_stack(),
-                                                   __num);
+    __reentrance_guard __get_out;
+    return _GLIBCXX_PROFILE_DATA(_S_vector_size)->
+      __insert(__get_stack(), __num);
   }
 
   inline void
-  __trace_vector_size_destruct(const void* __obj, std::size_t __num,
-                              std::size_t __inum)
+  __trace_vector_size_resize(__container_size_info* __obj_info,
+                            std::size_t __from, std::size_t __to)
   {
-    if (!__profcxx_init())
+    if (!__obj_info)
       return;
 
-    _GLIBCXX_PROFILE_DATA(_S_vector_size)->__destruct(__obj, __num, __inum);
+    __obj_info->__resize(__from, __to);
   }
 
   inline void
-  __trace_vector_size_resize(const void* __obj, std::size_t __from,
-                            std::size_t __to)
+  __trace_vector_size_destruct(__container_size_info* __obj_info,
+                              std::size_t __num, std::size_t __inum)
   {
-    if (!__profcxx_init())
+    if (!__obj_info)
       return;
 
-    _GLIBCXX_PROFILE_DATA(_S_vector_size)->__resize(__obj, __from, __to);
+    _GLIBCXX_PROFILE_DATA(_S_vector_size)->
+      __destruct(__obj_info, __num, __inum);
   }
 
 } // namespace __gnu_profile