Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vm_method.c: disable GMC writing if GMC is disabled

* vm_method.c (rb_method_entry_get_without_cache): disable GMC
  writing if GMC is disabled
  [ruby-core:61218]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 4e12ff9225f16dbc36e2b3edf0dd48a87b465ecf 1 parent fd61a78
normal authored
Showing with 30 additions and 12 deletions.
  1. +6 −0 ChangeLog
  2. +24 −12 vm_method.c
6 ChangeLog
View
@@ -1,3 +1,9 @@
+Mon Mar 3 08:10:04 2014 Eric Wong <e@80x24.org>
+
+ * vm_method.c (rb_method_entry_get_without_cache): disable GMC
+ writing if GMC is disabled.
+ [ruby-core:61218]
+
Mon Mar 3 07:47:17 2014 Eric Wong <e@80x24.org>
* README.EXT: wrap GetDBM with do/while(0)
36 vm_method.c
View
@@ -2,6 +2,7 @@
* This file is included by vm.c
*/
+#if OPT_GLOBAL_METHOD_CACHE
#ifndef GLOBAL_METHOD_CACHE_SIZE
#define GLOBAL_METHOD_CACHE_SIZE 0x800
#endif
@@ -16,6 +17,9 @@
#define GLOBAL_METHOD_CACHE_KEY(c,m) ((((c)>>3)^(m))&GLOBAL_METHOD_CACHE_MASK)
#define GLOBAL_METHOD_CACHE(c,m) (global_method_cache + GLOBAL_METHOD_CACHE_KEY(c,m))
+#else
+#define GLOBAL_METHOD_CACHE(c,m) 0,rb_bug("global method cache disabled improperly")
+#endif
#include "method.h"
#define NOEX_NOREDEF 0
@@ -42,7 +46,10 @@ struct cache_entry {
VALUE defined_class;
};
+#if OPT_GLOBAL_METHOD_CACHE
static struct cache_entry global_method_cache[GLOBAL_METHOD_CACHE_SIZE];
+#endif
+
#define ruby_running (GET_VM()->running)
/* int ruby_running = 0; */
@@ -575,19 +582,24 @@ rb_method_entry_get_without_cache(VALUE klass, ID id,
defined_class = me->klass;
if (ruby_running) {
- struct cache_entry *ent;
- ent = GLOBAL_METHOD_CACHE(klass, id);
- ent->class_serial = RCLASS_SERIAL(klass);
- ent->method_state = GET_GLOBAL_METHOD_STATE();
- ent->defined_class = defined_class;
- ent->mid = id;
-
- if (UNDEFINED_METHOD_ENTRY_P(me)) {
- ent->me = 0;
- me = 0;
+ if (OPT_GLOBAL_METHOD_CACHE) {
+ struct cache_entry *ent;
+ ent = GLOBAL_METHOD_CACHE(klass, id);
+ ent->class_serial = RCLASS_SERIAL(klass);
+ ent->method_state = GET_GLOBAL_METHOD_STATE();
+ ent->defined_class = defined_class;
+ ent->mid = id;
+
+ if (UNDEFINED_METHOD_ENTRY_P(me)) {
+ ent->me = 0;
+ me = 0;
+ }
+ else {
+ ent->me = me;
+ }
}
- else {
- ent->me = me;
+ else if (UNDEFINED_METHOD_ENTRY_P(me)) {
+ me = 0;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.