ObjFW  Check-in [d5236bb40e]

Overview
Comment:Ensure all selectors are registered before load.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | runtime
Files: files | file ages | folders
SHA3-256: d5236bb40eb246cd4f5432f16df877684051b3043244d99a058770fe3803b8a7
User & Date: js on 2012-04-21 13:47:49
Other Links: branch diff | manifest | tags
Context
2012-04-22
12:15
A few casts to make Clang happy. check-in: e1586f4dce user: js tags: runtime
2012-04-21
13:47
Ensure all selectors are registered before load. check-in: d5236bb40e user: js tags: runtime
13:05
Properly copy methods from superclass first. check-in: 8c368f8f38 user: js tags: runtime
Changes

Modified src/runtime/class.m from [7aa459dc9f] to [a7f5437671].

26
27
28
29
30
31
32
33

34
35
36
37
38
39
40
26
27
28
29
30
31
32

33
34
35
36
37
38
39
40







-
+







#import "runtime-private.h"

static struct objc_hashtable *classes = NULL;
static Class *load_queue = NULL;
static size_t load_queue_cnt = 0;

static void
register_class(Class cls)
register_class(struct objc_abi_class *cls)
{
	if (classes == NULL)
		classes = objc_hashtable_alloc(2);

	objc_hashtable_set(classes, cls->name, cls);
}

78
79
80
81
82
83
84
85

86
87


88
89


90

91
92

93
94
95
96
97
98
99
78
79
80
81
82
83
84

85
86

87
88
89
90
91
92

93
94

95
96
97
98
99
100
101
102







-
+

-
+
+


+
+
-
+

-
+







		for (i = 0; i < ml->count; i++)
			if (sel_isEqual((SEL)&ml->methods[i].sel, selector))
				((void(*)(id, SEL))ml->methods[i].imp)(cls,
				    selector);
}

static BOOL
has_load(struct objc_abi_class *cls)
has_load(Class cls)
{
	struct objc_abi_method_list *ml;
	struct objc_method_list *ml;
	SEL selector;
	unsigned int i;

	selector = sel_registerName("load");

	for (ml = cls->methodlist; ml != NULL; ml = ml->next)
	for (ml = cls->isa->methodlist; ml != NULL; ml = ml->next)
		for (i = 0; i < ml->count; i++)
			if (!strcmp(ml->methods[i].name, "load"))
			if (sel_isEqual((SEL)&ml->methods[i].sel, selector))
				return YES;

	return NO;
}

static void
call_load(Class cls)
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
261
262
263
264
265
266
267
268
269
270
271

272
273
274
275
276
277
278
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
261
262
263
264
265
266
267
268
269
270

271
272
273
274
275
276
277
278







-
+

-
-
-

-
+
-
-
-
+
-

+


-
-
-
+
+
+
+

+
-
+

-
-
+
+












-
+








	call_method(cls, "initialize");
}

void
objc_register_all_classes(struct objc_abi_symtab *symtab)
{
	size_t i;
	uint_fast32_t i;

	for (i = 0; i < symtab->cls_def_cnt; i++)
		register_class((Class)symtab->defs[i]);

	for (i = 0; i < symtab->cls_def_cnt; i++) {
		struct objc_abi_class *cls;
		struct objc_abi_class *cls =
		BOOL load;

		cls = (struct objc_abi_class*)symtab->defs[i];
		    (struct objc_abi_class*)symtab->defs[i];
		load = has_load(cls->metaclass);

		register_class(cls);
		register_selectors(cls);
		register_selectors(cls->metaclass);

		if (load) {
			Class cls_ = (Class)cls;
	}

	for (i = 0; i < symtab->cls_def_cnt; i++) {
		Class cls = (Class)symtab->defs[i];

		if (has_load(cls)) {
			setup_class(cls_);
			setup_class(cls);

			if (cls_->info & OBJC_CLASS_INFO_SETUP)
				call_load(cls_);
			if (cls->info & OBJC_CLASS_INFO_SETUP)
				call_load(cls);
			else {
				if (load_queue == NULL)
					load_queue = malloc(sizeof(Class));
				else
					load_queue = realloc(load_queue,
					    sizeof(Class) *
					    (load_queue_cnt + 1));

				if (load_queue == NULL)
					ERROR("Not enough memory for load "
					    "queue!");

				load_queue[load_queue_cnt++] = cls_;
				load_queue[load_queue_cnt++] = cls;
			}
		} else
			cls->info |= OBJC_CLASS_INFO_LOADED;
	}

	/* Process load queue */
	for (i = 0; i < load_queue_cnt; i++) {