ObjFW  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [e5ceb906d0]:

  • File src/runtime/autorelease.m — part of check-in [bb18681460] at 2020-09-27 23:27:30 on branch trunk — Fix missing include (user: js size: 3384) [more...]

To Artifact [0e5c7aa48b]:

  • File src/runtime/autorelease.m — part of check-in [5b37fbeb82] at 2020-12-20 21:26:08 on branch trunk — Return error instead of using errno for threading errno is problematic for Amiga libraries and is also not thread-safe on some systems, even though it should. (user: js size: 3429) [more...]
︙
49
50
51
52
53
54
55
56
57
58



59
60
61
62
63
64
65

49
50
51
52
53
54
55



56
57
58
59
60
61
62
63
64
65








-
-
-
+
+
+








static uintptr_t count = 0;
static uintptr_t size = 0;
#endif

#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
OF_CONSTRUCTOR()
{
	OF_ENSURE(of_tlskey_new(&objectsKey));
	OF_ENSURE(of_tlskey_new(&countKey));
	OF_ENSURE(of_tlskey_new(&sizeKey));
	OF_ENSURE(of_tlskey_new(&objectsKey) == 0);
	OF_ENSURE(of_tlskey_new(&countKey) == 0);
	OF_ENSURE(of_tlskey_new(&sizeKey) == 0);
}
#endif

void *
objc_autoreleasePoolPush()
{
#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
︙
96
97
98
99
100
101
102
103
104


105
106
107
108
109

110
111
112
113
114
115
116

96
97
98
99
100
101
102


103
104
105
106
107
108

109
110
111
112
113
114
115
116








-
-
+
+




-
+









	if (freeMem) {
		free(objects);
		objects = NULL;
#if defined(OF_HAVE_COMPILER_TLS) || !defined(OF_HAVE_THREADS)
		size = 0;
#else
		OF_ENSURE(of_tlskey_set(objectsKey, objects));
		OF_ENSURE(of_tlskey_set(sizeKey, (void *)0));
		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
		OF_ENSURE(of_tlskey_set(sizeKey, (void *)0) == 0);
#endif
	}

#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
	OF_ENSURE(of_tlskey_set(countKey, (void *)count));
	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
#endif
}

id
_objc_rootAutorelease(id object)
{
#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
︙
125
126
127
128
129
130
131
132
133


134
135
136
137
138
139
140

141
142
143
144

125
126
127
128
129
130
131


132
133
134
135
136
137
138
139

140
141
142
143
144








-
-
+
+






-
+





		else
			size *= 2;

		OF_ENSURE((objects =
		    realloc(objects, size * sizeof(id))) != NULL);

#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
		OF_ENSURE(of_tlskey_set(objectsKey, objects));
		OF_ENSURE(of_tlskey_set(sizeKey, (void *)size));
		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
		OF_ENSURE(of_tlskey_set(sizeKey, (void *)size) == 0);
#endif
	}

	objects[count++] = object;

#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
	OF_ENSURE(of_tlskey_set(countKey, (void *)count));
	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
#endif

	return object;
}