ObjFW  Check-in [a2f2a3289d]

Overview
Comment:OFKernelEventObserver: Only use 1 internal socket
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a2f2a3289d8e56b061c2b6bdf71c3b3e8ddd6d047150fa3ba8f9bdfdb9b0e364
User & Date: js on 2014-03-05 00:34:59
Other Links: manifest | tags
Context
2014-03-05
01:36
Add OF_ROUND_UP_POW2 macro check-in: ae9f0dc0e0 user: js tags: trunk
00:34
OFKernelEventObserver: Only use 1 internal socket check-in: a2f2a3289d user: js tags: trunk
00:31
Move netinet/in.h include to socket.h check-in: 4de1f2a67a user: js tags: trunk
Changes

Modified src/OFKernelEventObserver.m from [a663dc04e8] to [2dacb355e7].

104
105
106
107
108
109
110
111

112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131

132
133

134
135
136
137
138
139
140
141
142
143
144
145

146
147
148
149
150

151
152
153
154
155
156
157
158
104
105
106
107
108
109
110

111


112

113
114
115
116
117
118
119
120
121
122
123
124
125
126


127
128

129

130
131
132
133
134
135

136
137
138

139

140
141
142

143

144
145
146
147
148
149
150







-
+
-
-

-














-
-
+

-
+
-






-



-
+
-



-
+
-







#endif

- init
{
	self = [super init];

	@try {
#ifndef OF_HAVE_PIPE
#if !defined(OF_HAVE_PIPE) && !defined(__wii__)
		struct sockaddr_in cancelAddr2;
# ifndef __wii__
		socklen_t cancelAddrLen;
# endif
#endif

		_readObjects = [[OFMutableArray alloc] init];
		_writeObjects = [[OFMutableArray alloc] init];
		_queue = [[OFMutableArray alloc] init];
		_queueInfo = [[OFDataArray alloc]
		    initWithItemSize: sizeof(int)];
		_queueFDs = [[OFDataArray alloc] initWithItemSize: sizeof(int)];

#ifdef OF_HAVE_PIPE
		if (pipe(_cancelFD))
			@throw [OFInitializationFailedException
			    exceptionWithClass: [self class]];
#else
		_cancelFD[0] = socket(AF_INET, SOCK_DGRAM, 0);
		_cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);
		_cancelFD[0] = _cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);

		if (_cancelFD[0] == INVALID_SOCKET ||
		if (_cancelFD[0] == INVALID_SOCKET)
		    _cancelFD[1] == INVALID_SOCKET)
			@throw [OFInitializationFailedException
			    exceptionWithClass: [self class]];

		_cancelAddr.sin_family = AF_INET;
		_cancelAddr.sin_port = 0;
		_cancelAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
		cancelAddr2 = _cancelAddr;

# ifdef __wii__
		/* The Wii does not accept port 0 as "choose any free port" */
		_cancelAddr.sin_port = 65533;
		_cancelAddr.sin_port = 65535;
		cancelAddr2.sin_port = 65534;
# endif

		if (bind(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
		    sizeof(_cancelAddr)) || bind(_cancelFD[1],
		    sizeof(_cancelAddr)))
		    (struct sockaddr*)&cancelAddr2, sizeof(cancelAddr2)))
			@throw [OFInitializationFailedException
			    exceptionWithClass: [self class]];

# ifndef __wii__
		cancelAddrLen = sizeof(_cancelAddr);
		if (getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
		    &cancelAddrLen))
176
177
178
179
180
181
182

183

184
185
186
187
188
189
190
168
169
170
171
172
173
174
175

176
177
178
179
180
181
182
183







+
-
+








	return self;
}

- (void)dealloc
{
	close(_cancelFD[0]);
	if (_cancelFD[1] != _cancelFD[0])
	close(_cancelFD[1]);
		close(_cancelFD[1]);

	[_readObjects release];
	[_writeObjects release];
	[_queue release];
	[_queueInfo release];
	[_queueFDs release];
#ifdef OF_HAVE_THREADS