2005-11-09 Martin Hunt <hunt@redhat.com>

	* map.h: Remove HSTAT_LOG and HSTAT_LINEAR.
	* map-gen.c: Fix comment.
	* pmap-gen.c: Ditto.

diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index d98ce50e4629871cc437014b1b8d8cb93be26964..0c85f33a3750f39b1b11d53532f6bc3640859058 100644 (file)
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,4 +1,10 @@
 2005-11-09  Martin Hunt  <hunt@redhat.com>
+
+       * map.h: Remove HSTAT_LOG and HSTAT_LINEAR.
+       * map-gen.c: Fix comment.
+       * pmap-gen.c: Ditto.
+       
+2005-11-09  Martin Hunt  <hunt@redhat.com>     
        * map.c (_stp_cmp): Patch to sort on stats.
        (_stp_map_sort): Ditto.
        (_stp_map_sortn): Ditto.

diff --git a/runtime/map-gen.c b/runtime/map-gen.c
index f3d65c4d0104760f8ada377f07ed9e16d5e1c3eb..fccdecdc8fe6ff107334bdaea1d2545d4b3d0e33 100644 (file)
--- a/runtime/map-gen.c
+++ b/runtime/map-gen.c
@@ -345,8 +345,8 @@ MAP KEYSYM(_stp_map_new) (unsigned max_entries)
        return m;
 }
 #else
-/* _stp_map_new_key1_key2...val (num, HSTAT_LINEAR, start, end, interval) */
-/* _stp_map_new_key1_key2...val (num, HSTAT_LOG, buckets) */ 
+/* _stp_map_new_key1_key2...val (num, HIST_LINEAR, start, end, interval) */
+/* _stp_map_new_key1_key2...val (num, HIST_LOG, buckets) */ 
 
 MAP KEYSYM(_stp_map_new) (unsigned max_entries, int htype, ...)
 {

diff --git a/runtime/map.h b/runtime/map.h
index 83a65c1efed6e368c16f0477736f5bc922dd3a75..08c06a1ed7e31134f1cf86fd06aa69f35abfa22f 100644 (file)
--- a/runtime/map.h
+++ b/runtime/map.h
@@ -47,11 +47,6 @@ amount of memory. Do not increase above 5. */
 
 #include "stat.h"
 
-/* Histogram is log 2 */
-#define HSTAT_LOG (STAT | (HIST_LOG << 8))
-/* Histogram is linear */
-#define HSTAT_LINEAR (STAT | (HIST_LINEAR <<  8))
-
 /* Keys are either int64 or strings */
 typedef union {
        int64_t val;

diff --git a/runtime/pmap-gen.c b/runtime/pmap-gen.c
index e5da6a3d0405adf97aeba41c9b34292bd6592af1..cb203a8879a1147fd80cccf355f25b429098184c 100644 (file)
--- a/runtime/pmap-gen.c
+++ b/runtime/pmap-gen.c
@@ -421,8 +421,8 @@ MAP KEYSYM(_stp_pmap_new) (unsigned max_entries)
        return map;
 }
 #else
-/* _stp_pmap_new_key1_key2...val (num, HSTAT_LINEAR, start, end, interval) */
-/* _stp_pmap_new_key1_key2...val (num, HSTAT_LOG, buckets) */ 
+/* _stp_pmap_new_key1_key2...val (num, HIST_LINEAR, start, end, interval) */
+/* _stp_pmap_new_key1_key2...val (num, HIST_LOG, buckets) */ 
 
 MAP KEYSYM(_stp_pmap_new) (unsigned max_entries, int htype, ...)
 {