ObjFW  Diff

Differences From Artifact [83e01ba01e]:

• File src/OFKernelEventObserver.m — part of check-in [62e2de30b9] at 2015-02-16 08:39:17 on branch trunk — Explicitly pass errno to exceptions

  The old behaviour where the exception would access errno directly on
  creation of the exception was very fragile. The two main problems with
  it were that sometimes it would pick up an errno even though none had
  been set and in other cases that when the exception was created errno
  had already been overridden.

  This also greatly increases errno handling on Win32, especially in
  conjunction with sockets. It can still be improved further, though. (user: js, size: 9076) [annotate] [blame] [check-ins using]

To Artifact [e8b15decf5]:

• File src/OFKernelEventObserver.m — part of check-in [f18615e057] at 2015-02-18 22:56:46 on branch trunk — Add of_getsockname() and make use of it

  of_getsockname() calls getsockname() after acquiring a mutex. This is
  necessary as some implementations of getsockname() are not thread-safe. (user: js, size: 9103) [annotate] [blame] [check-ins using]

45
46
47
48
49
50
51

52
53
54
55
56
57
58

# import "OFKernelEventObserver_select.h"
#endif

#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"


#import "socket_helpers.h"

enum {
	QUEUE_ADD = 0,
	QUEUE_REMOVE = 1,
	QUEUE_READ = 0,
	QUEUE_WRITE = 2

>

45
46
47
48
49
50
51
52
53
54
55
56
57
58
59

# import "OFKernelEventObserver_select.h"
#endif

#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"

#import "socket.h"
#import "socket_helpers.h"

enum {
	QUEUE_ADD = 0,
	QUEUE_REMOVE = 1,
	QUEUE_READ = 0,
	QUEUE_WRITE = 2

140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155

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

# ifndef __wii__
		cancelAddrLen = sizeof(_cancelAddr);
		if (getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
		    &cancelAddrLen))
			@throw [OFInitializationFailedException
			    exceptionWithClass: [self class]];
# endif
#endif

		_maxFD = _cancelFD[0];
		_FDToObject = [self allocMemoryWithSize: sizeof(id)

|
|

141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156

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

# ifndef __wii__
		cancelAddrLen = sizeof(_cancelAddr);
		if (of_getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
		    &cancelAddrLen) != 0)
			@throw [OFInitializationFailedException
			    exceptionWithClass: [self class]];
# endif
#endif

		_maxFD = _cancelFD[0];
		_FDToObject = [self allocMemoryWithSize: sizeof(id)