ObjFW  Diff

Differences From Artifact [8b9acbd834]:

To Artifact [10244167cd]:


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
119


120
121
122

123
124
125


126
127
128
129
130
131
132
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
119

120
121


122
123
124
125
126
127
128
129
130







-
-
+
+



-
















-
-
+
+



-


-
+










-
+

-
-
+
+


-
+

-
-
+
+


-
+

-
-
+
+


-
+

-
-
+
+







- (void)dealloc
{
	[FDs release];

	[super dealloc];
}

- (void)_addStream: (OFStream*)stream
	withEvents: (short)events
- (void)_addFileDescriptor: (int)fd
		withEvents: (short)events
{
	struct pollfd *FDsCArray = [FDs cArray];
	size_t i, count = [FDs count];
	int fd = [stream fileDescriptor];
	BOOL found = NO;

	for (i = 0; i < count; i++) {
		if (FDsCArray[i].fd == fd) {
			FDsCArray[i].events |= events;
			found = YES;
			break;
		}
	}

	if (!found) {
		struct pollfd p = { fd, events | POLLERR, 0 };
		[FDs addItem: &p];
	}
}

- (void)_removeStream: (OFStream*)stream
	   withEvents: (short)events
- (void)_removeFileDescriptor: (int)fd
		   withEvents: (short)events
{
	struct pollfd *FDsCArray = [FDs cArray];
	size_t i, nFDs = [FDs count];
	int fileDescriptor = [stream fileDescriptor];

	for (i = 0; i < nFDs; i++) {
		if (FDsCArray[i].fd == fileDescriptor) {
		if (FDsCArray[i].fd == fd) {
			FDsCArray[i].events &= ~events;

			if ((FDsCArray[i].events & ~POLLERR) == 0)
				[FDs removeItemAtIndex: i];

			break;
		}
	}
}

- (void)_addStreamForReading: (OFStream*)stream
- (void)_addFileDescriptorForReading: (int)fd
{
	[self _addStream: stream
	      withEvents: POLLIN];
	[self _addFileDescriptor: fd
		      withEvents: POLLIN];
}

- (void)_addStreamForWriting: (OFStream*)stream
- (void)_addFileDescriptorForWriting: (int)fd
{
	[self _addStream: stream
	      withEvents: POLLOUT];
	[self _addFileDescriptor: fd
		      withEvents: POLLOUT];
}

- (void)_removeStreamForReading: (OFStream*)stream
- (void)_removeFileDescriptorForReading: (int)fd
{
	[self _removeStream: stream
		 withEvents: POLLIN];
	[self _removeFileDescriptor: fd
			 withEvents: POLLIN];
}

- (void)_removeStreamForWriting: (OFStream*)stream
- (void)_removeFileDescriptorForWriting: (int)fd
{
	[self _removeStream: stream
		 withEvents: POLLOUT];
	[self _removeFileDescriptor: fd
			 withEvents: POLLOUT];
}

- (BOOL)observeWithTimeout: (int)timeout
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	struct pollfd *FDsCArray;
	size_t i, nFDs;