Overview
Context
Changes
Modified src/OFPollKernelEventObserver.m
from [0607878a6c]
to [49ee878680].
︙ | | |
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
-
-
-
+
+
+
+
+
+
+
+
+
+
+
|
[super dealloc];
}
- (void)of_addObject: (id)object
fileDescriptor: (int)fd
events: (short)events
{
struct pollfd *FDs = _FDs.mutableItems;
size_t count = _FDs.count;
bool found = false;
struct pollfd *FDs;
size_t count;
bool found;
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
FDs = _FDs.mutableItems;
count = _FDs.count;
found = false;
for (size_t i = 0; i < count; i++) {
if (FDs[i].fd == fd) {
FDs[i].events |= events;
found = true;
break;
}
|
︙ | | |
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
-
-
+
+
+
+
+
+
+
+
+
|
}
}
- (void)of_removeObject: (id)object
fileDescriptor: (int)fd
events: (short)events
{
struct pollfd *FDs = _FDs.mutableItems;
size_t nFDs = _FDs.count;
struct pollfd *FDs;
size_t nFDs;
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
FDs = _FDs.mutableItems;
nFDs = _FDs.count;
for (size_t i = 0; i < nFDs; i++) {
if (FDs[i].fd == fd) {
FDs[i].events &= ~events;
if (FDs[i].events == 0) {
/*
|
︙ | | |
Modified src/OFSelectKernelEventObserver.m
from [002aab58fd]
to [7a4ddf3e07].
︙ | | |
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
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
103
104
105
|
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
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
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
|
#endif
@implementation OFSelectKernelEventObserver
- (instancetype)init
{
self = [super init];
@try {
#ifdef OF_AMIGAOS
_maxFD = 0;
_maxFD = 0;
#else
# ifndef OF_WINDOWS
if (_cancelFD[0] >= (int)FD_SETSIZE)
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
if (_cancelFD[0] >= (int)FD_SETSIZE)
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
# endif
FD_ZERO(&_readFDs);
FD_ZERO(&_writeFDs);
FD_SET(_cancelFD[0], &_readFDs);
FD_ZERO(&_readFDs);
FD_ZERO(&_writeFDs);
FD_SET(_cancelFD[0], &_readFDs);
if (_cancelFD[0] > INT_MAX)
@throw [OFOutOfRangeException exception];
if (_cancelFD[0] > INT_MAX)
@throw [OFOutOfRangeException exception];
_maxFD = (int)_cancelFD[0];
_maxFD = (int)_cancelFD[0];
#endif
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
int fd = object.fileDescriptorForReading;
if (fd < 0 || fd > INT_MAX - 1)
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
if (fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET((of_socket_t)fd, &_readFDs);
[super addObjectForReading: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
int fd = object.fileDescriptorForWriting;
if (fd < 0 || fd > INT_MAX - 1)
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
if (fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
|
︙ | | |
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
|
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
159
160
161
162
163
|
-
+
+
-
+
+
+
|
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForReading;
if (fd < 0)
@throw [OFOutOfRangeException exception];
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_readFDs);
[super removeObjectForReading: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForWriting;
if (fd < 0)
@throw [OFOutOfRangeException exception];
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_writeFDs);
|
︙ | | |