[multiple changes]

2015-10-20  Philippe Gil  <gil@adacore.com>

	* g-debpoo.ads (Dump): NEW print Debug_Pool statistics & main
	contributors.
	(Dump_Stdout): NEW print to stdout Debug_Pool statistics &
	main contributors.
	(Reset): NEW reset counters to 0.
	(Get_Size): NEW return size allocated at parameter.
	(High_Water_Mark): NEW.
	(Current_Water_Mark): NEW.
	(System_Memory_Debug_Pool): NEW tell Debug_Pools that
	System.Memory uses it.
	* g-debpoo.adb (Traceback_Htable_Elem): add Frees, Total_Frees
	components.
	(Find_Or_Create_Traceback): don't manage in System.Memory
	Debug_Pool Deallocate Traceback's.
	(Validity): add optional Handled table when System.Memory asked
	for Allow_Unhandled_Memory.
	(Allocate): handle Allocate reentrancy occuring when System.Memory
	uses Debug_Pools.
	(Deallocate): handle when Allow_Unhandled_Memory
	is set deallocation of unhandled memory. Dont't check
	Size_In_Storage_Elements if equal to Storage_Count'Last. update
	Frees, Total_Frees new components.

2015-10-20  Eric Botcazou  <ebotcazou@adacore.com>

	* fe.h: Minor tweak.

From-SVN: r229036

gcc/ada/ChangeLog

+2015-10-20  Philippe Gil  <gil@adacore.com>
+
+	* g-debpoo.ads (Dump): NEW print Debug_Pool statistics & main
+	contributors.
+	(Dump_Stdout): NEW print to stdout Debug_Pool statistics &
+	main contributors.
+	(Reset): NEW reset counters to 0.
+	(Get_Size): NEW return size allocated at parameter.
+	(High_Water_Mark): NEW.
+	(Current_Water_Mark): NEW.
+	(System_Memory_Debug_Pool): NEW tell Debug_Pools that
+	System.Memory uses it.
+	* g-debpoo.adb (Traceback_Htable_Elem): add Frees, Total_Frees
+	components.
+	(Find_Or_Create_Traceback): don't manage in System.Memory
+	Debug_Pool Deallocate Traceback's.
+	(Validity): add optional Handled table when System.Memory asked
+	for Allow_Unhandled_Memory.
+	(Allocate): handle Allocate reentrancy occuring when System.Memory
+	uses Debug_Pools.
+	(Deallocate): handle when Allow_Unhandled_Memory
+	is set deallocation of unhandled memory. Dont't check
+	Size_In_Storage_Elements if equal to Storage_Count'Last. update
+	Frees, Total_Frees new components.
+
+2015-10-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* fe.h: Minor tweak.
+
 2015-10-20  Vincent Celier  <celier@adacore.com>
 
 	* sem_cat.adb (Check_Categorization_Dependencies): Do nothing

gcc/ada/fe.h

@@ -6,7 +6,7 @@
  *                                                                          *
  *                              C Header File                               *
  *                                                                          *
- *          Copyright (C) 1992-2014, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2015, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -39,6 +39,10 @@
 extern "C" {
 #endif
 
+/* atree: */
+
+#define Serious_Errors_Detected atree__serious_errors_detected
+
 /* comperr: */
 
 #define Compiler_Abort comperr__compiler_abort
@@ -77,10 +81,6 @@ extern Boolean Is_Entity_Name		(Node_Id);
 #define Get_Attribute_Definition_Clause einfo__get_attribute_definition_clause
 extern Node_Id Get_Attribute_Definition_Clause (Entity_Id, char);
 
-/* atree: */
-
-#define Serious_Errors_Detected atree__serious_errors_detected
-
 /* errout: */
 
 #define Error_Msg_N               errout__error_msg_n

gcc/ada/g-debpoo.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -254,6 +254,71 @@ package GNAT.Debug_Pools is
    --  deallocation of that memory chunk, its current status (allocated or
    --  logically freed), etc.
 
+   type Report_Type is
+     (All_Reports,
+      Memory_Usage,
+      Allocations_Count,
+      Sort_Total_Allocs,
+      Marked_Blocks);
+   for Report_Type use
+     (All_Reports       => 0,
+      Memory_Usage      => 1,
+      Allocations_Count => 2,
+      Sort_Total_Allocs => 3,
+      Marked_Blocks     => 4);
+
+   generic
+      with procedure Put_Line (S : String) is <>;
+      with procedure Put      (S : String) is <>;
+   procedure Dump
+     (Pool   : Debug_Pool;
+      Size   : Positive;
+      Report : Report_Type := All_Reports);
+   --  Dump information about memory usage.
+   --  Size is the number of the biggest memory users we want to show. Report
+   --  indicates which sorting order is used in the report
+
+   procedure Dump_Stdout
+     (Pool   : Debug_Pool;
+      Size   : Positive;
+      Report : Report_Type := All_Reports);
+   --  Standard instantiation of Dump to print on standard_output. More
+   --  convenient to use where this is the intended location, and in particular
+   --  easier to use from the debugger.
+
+   procedure Reset;
+   --  Reset all internal data. This is in general not needed, unless you want
+   --  to know what memory is used by specific parts of your application
+
+   procedure Get_Size
+     (Storage_Address          : Address;
+      Size_In_Storage_Elements : out Storage_Count;
+      Valid                    : out Boolean);
+   --  set Valid if Storage_Address is the address of a chunk of memory
+   --  currently allocated by any pool.
+   --  If Valid is True, Size_In_Storage_Elements is set to the size of this
+   --  chunk of memory.
+
+   type Byte_Count is mod System.Max_Binary_Modulus;
+   --  Type used for maintaining byte counts, needs to be large enough
+   --  to accommodate counts allowing for repeated use of the same memory.
+
+   function High_Water_Mark
+     (Pool : Debug_Pool) return Byte_Count;
+   --  return the highest size of the memory allocated by the pool.
+   --  memory used internally by the pool is not taken into account.
+
+   function Current_Water_Mark
+     (Pool : Debug_Pool) return Byte_Count;
+   --  return the size of the memory currently allocated by the pool.
+   --  memory used internally by the pool is not taken into account.
+
+   procedure System_Memory_Debug_Pool
+     (Has_Unhandled_Memory : Boolean := True);
+   --  let the package know the System.Memory is using it.
+   --  If Has_Unhandled_Memory is true, some deallocate can be done for
+   --  memory not allocated with Allocate.
+
 private
    --  The following are the standard primitive subprograms for a pool
 
@@ -292,10 +357,6 @@ private
    --  on the setup of the storage pool.
    --  The parameters have the same semantics as defined in the ARM95.
 
-   type Byte_Count is mod System.Max_Binary_Modulus;
-   --  Type used for maintaining byte counts, needs to be large enough
-   --  to accommodate counts allowing for repeated use of the same memory.
-
    type Debug_Pool is new System.Checked_Pools.Checked_Pool with record
       Stack_Trace_Depth              : Natural := Default_Stack_Trace_Depth;
       Maximum_Logically_Freed_Memory : SSC     := Default_Max_Freed;
@@ -306,6 +367,12 @@ private
       Errors_To_Stdout               : Boolean := Default_Errors_To_Stdout;
       Low_Level_Traces               : Boolean := Default_Low_Level_Traces;
 
+      Alloc_Count    : Byte_Count := 0;
+      --  Total number of allocation
+
+      Free_Count     : Byte_Count := 0;
+      --  Total number of deallocation
+
       Allocated : Byte_Count := 0;
       --  Total number of bytes allocated in this pool
 
@@ -337,5 +404,6 @@ private
       --  for the advanced freeing algorithms that needs to traverse all these
       --  blocks to find possible references to the block being physically
       --  freed.
+
    end record;
 end GNAT.Debug_Pools;