Overview
Comment: | Split OBJC_CLASS_INFO_INITIALIZED.
We now have OBJC_CLASS_INFO_{SETUP,LOADED,INITIALIZED}. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | runtime |
Files: | files | file ages | folders |
SHA3-256: |
5a719c9b1f20077ab582c9ec8cd1a2c5 |
User & Date: | js on 2012-04-18 18:00:04 |
Other Links: | branch diff | manifest | tags |
Context
2012-04-18
| ||
18:41 | Correctly call load. check-in: d13674c4c9 user: js tags: runtime | |
18:00 | Split OBJC_CLASS_INFO_INITIALIZED. check-in: 5a719c9b1f user: js tags: runtime | |
17:29 | Add cast to make Clang happy. check-in: 3ae7423995 user: js tags: runtime | |
Changes
Modified src/runtime/class.m from [4b0eeefabc] to [106999ef41].
︙ | ︙ | |||
158 159 160 161 162 163 164 165 166 167 168 169 170 171 | if (cls->superclass->subclass_list == NULL) ERROR("Not enough memory for subclass list of class %s\n", cls->superclass->name); cls->superclass->subclass_list[i] = cls; cls->superclass->subclass_list[i + 1] = Nil; } inline Class objc_classname_to_class(const char *name) { Class c; if (classes == NULL) | > > > > > > > > > > > > > > > > > > > > > > > > > > | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | if (cls->superclass->subclass_list == NULL) ERROR("Not enough memory for subclass list of class %s\n", cls->superclass->name); cls->superclass->subclass_list[i] = cls; cls->superclass->subclass_list[i + 1] = Nil; } static void setup_class(Class cls) { const char *superclass; if (cls->info & OBJC_CLASS_INFO_SETUP) return; if ((superclass = ((struct objc_abi_class*)cls)->superclass) != NULL) { if ((cls->superclass = objc_lookup_class(superclass)) == Nil) return; cls->isa->superclass = cls->superclass->isa; add_subclass(cls); add_subclass(cls->isa); } else cls->isa->superclass = cls; objc_update_dtable(cls); objc_update_dtable(cls->isa); cls->info |= OBJC_CLASS_INFO_SETUP; cls->isa->info |= OBJC_CLASS_INFO_SETUP; } inline Class objc_classname_to_class(const char *name) { Class c; if (classes == NULL) |
︙ | ︙ | |||
194 195 196 197 198 199 200 | initialize); } inline Class objc_lookup_class(const char *name) { Class cls = objc_classname_to_class(name); | < | | > < | < < < < < < < < | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | initialize); } inline Class objc_lookup_class(const char *name) { Class cls = objc_classname_to_class(name); if (cls == NULL) return Nil; if (cls->info & OBJC_CLASS_INFO_INITIALIZED) return cls; objc_global_mutex_lock(); /* * It's possible that two threads try to get a class at the same time. * Make sure that the thread which held the lock did not already * initialize it. */ if (cls->info & OBJC_CLASS_INFO_INITIALIZED) { objc_global_mutex_unlock(); return cls; } setup_class(cls); if (!(cls->info & OBJC_CLASS_INFO_SETUP)) { objc_global_mutex_unlock(); return Nil; } /* Set it first to prevent calling it recursively */ cls->info |= OBJC_CLASS_INFO_INITIALIZED; cls->isa->info |= OBJC_CLASS_INFO_INITIALIZED; call_initialize(cls); objc_global_mutex_unlock(); |
︙ | ︙ |
Modified src/runtime/runtime-private.h from [8f5d45afbf] to [5779ba0dc9].
︙ | ︙ | |||
115 116 117 118 119 120 121 | const void *buckets[256]; BOOL empty; }; enum objc_abi_class_info { OBJC_CLASS_INFO_CLASS = 0x01, OBJC_CLASS_INFO_METACLASS = 0x02, | > > | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | const void *buckets[256]; BOOL empty; }; enum objc_abi_class_info { OBJC_CLASS_INFO_CLASS = 0x01, OBJC_CLASS_INFO_METACLASS = 0x02, OBJC_CLASS_INFO_SETUP = 0x04, OBJC_CLASS_INFO_LOADED = 0x08, OBJC_CLASS_INFO_INITIALIZED = 0x10 }; typedef struct { of_mutex_t mutex; of_thread_t owner; int count; } objc_mutex_t; |
︙ | ︙ |