summaryrefslogtreecommitdiffstats
path: root/runtime/map-keys.c
diff options
context:
space:
mode:
authorhunt <hunt>2005-10-26 08:29:38 +0000
committerhunt <hunt>2005-10-26 08:29:38 +0000
commitaf5dd76bca996577262e447fd8bff1bd0df30db7 (patch)
tree488419840e6841a1dcb022553cb33f6eccbbb3f5 /runtime/map-keys.c
parentd7c99876fec8867918d9f4f808edca985eb1fd67 (diff)
downloadsystemtap-steved-af5dd76bca996577262e447fd8bff1bd0df30db7.tar.gz
systemtap-steved-af5dd76bca996577262e447fd8bff1bd0df30db7.tar.xz
systemtap-steved-af5dd76bca996577262e447fd8bff1bd0df30db7.zip
2005-10-26 Martin Hunt <hunt@redhat.com>
* map.c (_new_map_create, _new_map_del_node, _new_map_del_node, _new_map_set_int64, _new_map_set_str,_new_map_get_int64, _new_map_get_str, _new_map_get_stat, _new_map_set_stat): New internal functions for the new API. * map-int.c (__stp_map_set_int64): Modify to return an error code. * map-stat.c (_stp_map_add_stat): Ditto. * map-str (_stp_map_set_str): Ditto. * Doxyfile: Remove predefines NEED_STRING_VALS, NEED_STATS, NEED_INT64. * map-keys.c: Ditto. * list.c (_stp_list_new): Ditto. Also set map->list. * map-values.c: Ditto.
Diffstat (limited to 'runtime/map-keys.c')
-rw-r--r--runtime/map-keys.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/runtime/map-keys.c b/runtime/map-keys.c
index 898e50a6..9bf756ac 100644
--- a/runtime/map-keys.c
+++ b/runtime/map-keys.c
@@ -25,12 +25,10 @@
#define KEY1TYPE char*
#define KEY1NAME str
#define KEY1STOR char key1[MAP_STRING_LENGTH]
-#define NEED_STRING_KEYS
#else
#define KEY1TYPE int64_t
#define KEY1NAME int64
#define KEY1STOR int64_t key1
-#define NEED_INT64_KEYS
#endif
#define KEY1_EQ_P JOIN(KEY1NAME,eq_p)
#define KEY1_HASH JOIN(KEY1NAME,hash)
@@ -43,12 +41,10 @@
#define KEY2TYPE char*
#define KEY2NAME str
#define KEY2STOR char key2[MAP_STRING_LENGTH]
-#define NEED_STRING_KEYS
#else
#define KEY2TYPE int64_t
#define KEY2NAME int64
#define KEY2STOR int64_t key2
-#define NEED_INT64_KEYS
#endif
#define KEY2_EQ_P JOIN(KEY2NAME,eq_p)
#define KEY2_HASH JOIN(KEY2NAME,hash)
@@ -61,12 +57,10 @@
#define KEY3TYPE char*
#define KEY3NAME str
#define KEY3STOR char key3[MAP_STRING_LENGTH]
-#define NEED_STRING_KEYS
#else
#define KEY3TYPE int64_t
#define KEY3NAME int64
#define KEY3STOR int64_t key3
-#define NEED_INT64_KEYS
#endif
#define KEY3_EQ_P JOIN(KEY3NAME,eq_p)
#define KEY3_HASH JOIN(KEY3NAME,hash)
@@ -79,12 +73,10 @@
#define KEY4TYPE char*
#define KEY4NAME str
#define KEY4STOR char key4[MAP_STRING_LENGTH]
-#define NEED_STRING_KEYS
#else
#define KEY4TYPE int64_t
#define KEY4NAME int64
#define KEY4STOR int64_t key4
-#define NEED_INT64_KEYS
#endif
#define KEY4_EQ_P JOIN(KEY4NAME,eq_p)
#define KEY4_HASH JOIN(KEY4NAME,hash)
@@ -97,12 +89,10 @@
#define KEY5TYPE char*
#define KEY5NAME str
#define KEY5STOR char key5[MAP_STRING_LENGTH]
-#define NEED_STRING_KEYS
#else
#define KEY5TYPE int64_t
#define KEY5NAME int64
#define KEY5STOR int64_t key5
-#define NEED_INT64_KEYS
#endif
#define KEY5_EQ_P JOIN(KEY5NAME,eq_p)
#define KEY5_HASH JOIN(KEY5NAME,hash)
@@ -316,7 +306,6 @@ MAP KEYSYM(_stp_map_new) (unsigned max_entries, int valtype, ...)
m = _stp_map_new (max_entries, valtype & 0x0f,
sizeof(struct KEYSYM(map_node)), 0);
break;
-#ifdef NEED_STAT_VALS
case HIST_LOG:
m = _stp_map_new_hstat_log (max_entries, sizeof(struct KEYSYM(map_node)),
buckets);
@@ -325,7 +314,6 @@ MAP KEYSYM(_stp_map_new) (unsigned max_entries, int valtype, ...)
m = _stp_map_new_hstat_linear (max_entries, sizeof(struct KEYSYM(map_node)),
start, stop, interval);
break;
-#endif
default:
_stp_warn ("Unknown histogram type %d\n", htype);
m = NULL;