ObjFW  Diff

Differences From Artifact [a08f06103a]:

  • File src/OFStream.m — part of check-in [d16ad96cbd] at 2018-12-07 01:33:47 on branch trunk — OFStream: Use a delegate for async operations

    The target / selector approach had several drawbacks:

    * It was inconvenient to use, as for every read or write, a target,
    selector and context would need to be specified.
    * It lacked any kind of type-safety and would not even warn about using
    a callback method with the wrong number of parameters.
    * It encouraged using a different callback method for each read or
    write call, which results in code that is hard to follow and also
    slower (as it needs to recreate the async operation with a new
    callback every time). (user: js, size: 38772) [annotate] [blame] [check-ins using]

To Artifact [4879805b8b]:


1162
1163
1164
1165
1166
1167
1168
1169

1170
1171
1172

1173
1174

1175
1176
1177

1178
1179

1180
1181
1182
1183
1184
1185

1186
1187
1188
1189
1190
1191
1192

1193
1194

1195
1196

1197
1198
1199


1200
1201
1202

1203
1204
1205


1206
1207
1208
1209
1210
1211

1212
1213
1214
1215
1216
1217
1218
1219
1162
1163
1164
1165
1166
1167
1168

1169

1170

1171


1172
1173
1174

1175


1176
1177
1178
1179
1180
1181

1182

1183
1184
1185
1186
1187

1188


1189
1190

1191



1192
1193
1194
1195

1196



1197
1198
1199
1200
1201
1202
1203

1204

1205
1206
1207
1208
1209
1210
1211







-
+
-

-
+
-
-
+


-
+
-
-
+





-
+
-





-
+
-
-
+

-
+
-
-
-
+
+


-
+
-
-
-
+
+





-
+
-







		_writeBufferLength += length;

		return length;
	}
}

#ifdef OF_HAVE_SOCKETS
- (void)asyncWriteBuffer: (const void *)buffer
- (void)asyncWriteData: (OFData *)data
		  length: (size_t)length
{
	[self asyncWriteBuffer: buffer
	[self asyncWriteData: data
			length: length
		   runLoopMode: of_run_loop_mode_default];
		 runLoopMode: of_run_loop_mode_default];
}

- (void)asyncWriteBuffer: (const void *)buffer
- (void)asyncWriteData: (OFData *)data
		  length: (size_t)length
	     runLoopMode: (of_run_loop_mode_t)runLoopMode
	   runLoopMode: (of_run_loop_mode_t)runLoopMode
{
	OFStream <OFReadyForWritingObserving> *stream =
	    (OFStream <OFReadyForWritingObserving> *)self;

	[OFRunLoop of_addAsyncWriteForStream: stream
				      buffer: buffer
					data: data
				      length: length
					mode: runLoopMode
				    delegate: _delegate];
}

# ifdef OF_HAVE_BLOCKS
- (void)asyncWriteBuffer: (const void *)buffer
- (void)asyncWriteData: (OFData *)data
		  length: (size_t)length
		   block: (of_stream_async_write_block_t)block
		 block: (of_stream_async_write_block_t)block
{
	[self asyncWriteBuffer: buffer
	[self asyncWriteData: data
			length: length
		   runLoopMode: of_run_loop_mode_default
			 block: block];
		 runLoopMode: of_run_loop_mode_default
		       block: block];
}

- (void)asyncWriteBuffer: (const void *)buffer
- (void)asyncWriteData: (OFData *)data
		  length: (size_t)length
	     runLoopMode: (of_run_loop_mode_t)runLoopMode
		   block: (of_stream_async_write_block_t)block
	   runLoopMode: (of_run_loop_mode_t)runLoopMode
		 block: (of_stream_async_write_block_t)block
{
	OFStream <OFReadyForWritingObserving> *stream =
	    (OFStream <OFReadyForWritingObserving> *)self;

	[OFRunLoop of_addAsyncWriteForStream: stream
				      buffer: buffer
					data: data
				      length: length
					mode: runLoopMode
				       block: block];
}
# endif
#endif

- (void)writeInt8: (uint8_t)int8