summaryrefslogtreecommitdiff
path: root/symbol.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-12 08:43:55 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-12 08:43:55 (GMT)
commitc35ff11ae516421809e0d03c278576a70fda45c4 (patch)
tree990de489356901e7899c3a0f6d08d7e05901f48b /symbol.h
parentce5196b228a1f1599caf7c9f608d1eb7e40272bd (diff)
* id_table.h: introduce ID key table.
[Feature #11420] This table only manage ID->VALUE table to reduce overhead of st. Some functions prefixed rb_id_table_* are provided. * id_table.c: implement rb_id_table_*. There are several algorithms to implement it. Now, there are roughly 4 types: * st * array * hash (implemented by Yura Sokolov) * mix of array and hash The macro ID_TABLE_IMPL can choose implementation. You can see detailes about them at the head of id_table.c. At the default, I choose 34 (mix of list and hash). This is not final decision. Please report your suitable parameters or your data structure. * symbol.c: introduce rb_id_serial_t and rb_id_to_serial() to represent ID by serial number. * internal.h: use id_table for method tables. * class.c, gc.c, marshal.c, vm.c, vm_method.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'symbol.h')
-rw-r--r--symbol.h33
1 files changed, 24 insertions, 9 deletions
diff --git a/symbol.h b/symbol.h
index 5c52b97..001d6de 100644
--- a/symbol.h
+++ b/symbol.h
@@ -32,15 +32,6 @@ struct RSymbol {
#define RSYMBOL(obj) (R_CAST(RSymbol)(obj))
-static inline int
-id_type(ID id)
-{
- if (id<=tLAST_OP_ID) {
- return -1;
- }
- return (int)(id&ID_SCOPE_MASK);
-}
-
#define is_notop_id(id) ((id)>tLAST_OP_ID)
#define is_local_id(id) (id_type(id)==ID_LOCAL)
#define is_global_id(id) (id_type(id)==ID_GLOBAL)
@@ -51,6 +42,30 @@ id_type(ID id)
#define is_junk_id(id) (id_type(id)==ID_JUNK)
static inline int
+id_type(ID id)
+{
+ if (is_notop_id(id)) {
+ return (int)(id&ID_SCOPE_MASK);
+ }
+ else {
+ return -1;
+ }
+}
+
+typedef uint32_t rb_id_serial_t;
+
+static inline rb_id_serial_t
+rb_id_to_serial(ID id)
+{
+ if (is_notop_id(id)) {
+ return (rb_id_serial_t)(id >> ID_SCOPE_SHIFT);
+ }
+ else {
+ return (rb_id_serial_t)id;
+ }
+}
+
+static inline int
sym_type(VALUE sym)
{
ID id;