gather-write directly to asio when using sync mode and pushing a sample of buffers.

Author: cboulay

examples/CMakeLists.txt

@@ -36,6 +36,7 @@ addlslexample(ReceiveDataInChunks cpp)
 addlslexample(ReceiveDataSimple cpp)
 addlslexample(ReceiveStringMarkers cpp)
 addlslexample(ReceiveStringMarkersC c)
+addlslexample(SendData cpp)
 addlslexample(SendDataC c)
 addlslexample(SendDataInChunks cpp)
 addlslexample(SendDataSimple cpp)

examples/ReceiveDataInChunks.cpp

@@ -8,18 +8,18 @@
 int main(int argc, char **argv) {
 	std::cout << "ReceiveDataInChunks" << std::endl;
 	std::cout << "ReceiveDataInChunks StreamName max_buflen flush" << std::endl;
-	std::cout << "- max_buffered -- duration in msec to buffer" << std::endl;
+	std::cout << "- max_buffered -- duration in sec (or x100 samples if samplerate is 0) to buffer in the receiver" << std::endl;
 	std::cout << "- flush -- set non-zero to flush data instead of pulling; useful for testing throughput" << std::endl;
 
 	try {
 
 		std::string name{argc > 1 ? argv[1] : "MyAudioStream"};
-		double max_buflen = argc > 2 ? std::stod(argv[2]) : 360.;
+		double max_buffered = argc > 2 ? std::stod(argv[2]) : 360.;
 		bool flush = argc > 3;
 		// resolve the stream of interest & make an inlet
-		int32_t buf_samples = (int32_t)(max_buflen * 1000);
-		lsl::stream_inlet inlet(lsl::resolve_stream("name", name).at(0), max_buflen,
-			transp_bufsize_thousandths);
+		lsl::stream_info inlet_info = lsl::resolve_stream("name", name).at(0);
+		lsl::stream_inlet inlet(inlet_info,(int32_t)(max_buffered * 1000),
+			0, true, transp_bufsize_thousandths);
 
 		// Use set_postprocessing to get the timestamps in a common base clock.
 		// Do not use if this application will record timestamps to disk -- it is better to 

examples/SendData.cpp

@@ -1,69 +1,94 @@
-#include "lsl_cpp.h"
-#include <iostream>
-#include <stdlib.h>
-#include <time.h>
-using namespace std;
-
-/**
- * This example program offers an 8-channel stream, float-formatted, that resembles EEG data.
- * The example demonstrates also how per-channel meta-data can be specified using the .desc() field
- * of the stream information object.
- *
- * Note that the timer used in the send loop of this program is not particularly accurate.
- */
-
-
-const char *channels[] = {"C3", "C4", "Cz", "FPz", "POz", "CPz", "O1", "O2"};
-
-int main(int argc, char *argv[]) {
-	string name, type;
-	if (argc != 3) {
-		cout << "This opens a stream under some user-defined name and with a user-defined content "
-				"type."
-			 << endl;
-		cout << "Please enter the stream name and the stream type (e.g. \"BioSemi EEG\" (without "
-				"the quotes)):"
-			 << endl;
-		cin >> name >> type;
-	} else {
-		name = argv[1];
-		type = argv[2];
-	}
-
-	try {
-
-		// make a new stream_info (100 Hz)
-		lsl::stream_info info(name, type, 8, 100, lsl::cf_float32, string(name) += type);
-
-		// add some description fields
-		info.desc().append_child_value("manufacturer", "BioSemi");
-		lsl::xml_element chns = info.desc().append_child("channels");
-		for (int k = 0; k < 8; k++)
-			chns.append_child("channel")
-				.append_child_value("label", channels[k])
-				.append_child_value("unit", "microvolts")
-				.append_child_value("type", "EEG");
-
-		// make a new outlet
-		lsl::stream_outlet outlet(info);
-
-		// send data forever
-		cout << "Now sending data... " << endl;
-		double starttime = ((double)clock()) / CLOCKS_PER_SEC;
-		for (unsigned t = 0;; t++) {
-
-			// wait a bit and create random data
-			while (((double)clock()) / CLOCKS_PER_SEC < starttime + t * 0.01)
-				;
-			float sample[8];
-			for (int c = 0; c < 8; c++) sample[c] = (float)((rand() % 1500) / 500.0 - 1.5);
-
-			// send the sample
-			outlet.push_sample(sample);
-		}
-
-	} catch (std::exception &e) { cerr << "Got an exception: " << e.what() << endl; }
-	cout << "Press any key to exit. " << endl;
-	cin.get();
-	return 0;
-}
+#include "lsl_cpp.h"
+#include <iostream>
+#include <stdlib.h>
+#include <time.h>
+using namespace std;
+
+/**
+ * This example program offers an 8-channel stream, float-formatted, that resembles EEG data.
+ * The example demonstrates also how per-channel meta-data can be specified using the .desc() field
+ * of the stream information object.
+ *
+ * Note that the timer used in the send loop of this program is not particularly accurate.
+ */
+
+
+const char *channels[] = {"C3", "C4", "Cz", "FPz", "POz", "CPz", "O1", "O2"};
+
+int main(int argc, char *argv[]) {
+	string name, type;
+	if (argc < 3) {
+		cout << "This opens a stream under some user-defined name and with a user-defined content "
+				"type." << endl;
+		cout << "SendData Name Type n_channels[8] srate[100] max_buffered[360] sync[false] contig[true]" << endl;
+		cout << "Please enter the stream name and the stream type (e.g. \"BioSemi EEG\" (without "
+				"the quotes)):"
+			 << endl;
+		cin >> name >> type;
+	} else {
+		name = argv[1];
+		type = argv[2];
+	}
+	int n_channels = argc > 3 ? std::stol(argv[3]) : 8;
+	n_channels = n_channels < 8 ? 8 : n_channels;
+	int samplingrate = argc > 4 ? std::stol(argv[4]) : 100;
+	int max_buffered = argc > 5 ? std::stol(argv[5]) : 360;
+	bool sync = argc > 6 ? std::stol(argv[6]) > 0 : false;
+	bool contig = argc > 7 ? std::stol(argv[7]) > 0 : true;
+
+	try {
+
+		// make a new stream_info (100 Hz)
+		lsl::stream_info info(name, type, n_channels, samplingrate, lsl::cf_float32, string(name) += type);
+
+		// add some description fields
+		info.desc().append_child_value("manufacturer", "LSL");
+		lsl::xml_element chns = info.desc().append_child("channels");
+		for (int k = 0; k < n_channels; k++)
+			chns.append_child("channel")
+				.append_child_value("label", k < 8 ? channels[k] : "Chan-" + std::to_string(k+1))
+				.append_child_value("unit", "microvolts")
+				.append_child_value("type", type);
+
+		// make a new outlet
+		lsl::stream_outlet outlet(info, 0, max_buffered, sync ? transp_sync_blocking : transp_default);
+
+		// send data forever
+		cout << "Now sending data... " << endl;
+		double starttime = ((double)clock()) / CLOCKS_PER_SEC;
+
+		// Initialize 2 discontiguous data arrays.
+		vector<float> sample(8, 0.0);
+		vector<float> extra(n_channels - 8, 0.0);
+		if (contig) {
+			// If this is contiguous mode (default) then we combine the arrays.
+			sample.insert(
+				sample.end(),
+				make_move_iterator(extra.begin()),
+				make_move_iterator(extra.end()));
+		}
+		// bytes is used in !contig mode because we need to know how big each buffer is.
+		array<uint32_t, 2> bytes = {8 * sizeof(float), static_cast<uint32_t>((n_channels - 8) * sizeof(float))};
+		for (unsigned t = 0;; t++) {
+
+			// wait a bit and create random data
+			while (((double)clock()) / CLOCKS_PER_SEC < starttime + t * 0.01)
+				;
+			for (int c = 0; c < 8; c++) sample[c] = (float)((rand() % 1500) / 500.0 - 1.5);
+
+			// send the sample
+			if (contig)
+				outlet.push_sample(sample);
+			else {
+				// Advanced: Push set of discontiguous buffers.
+				array<float *, 2> bufs = {sample.data(), extra.data()};
+				outlet.push_numeric_bufs(reinterpret_cast<const char **>(const_cast<const float**>(bufs.data())),
+					bytes.data(), 2, lsl::local_clock(), true);
+			}
+		}
+
+	} catch (exception &e) { cerr << "Got an exception: " << e.what() << endl; }
+	cout << "Press any key to exit. " << endl;
+	cin.get();
+	return 0;
+}

examples/SendDataInChunks.cpp

@@ -104,6 +104,7 @@ int main(int argc, char **argv) {
 	int32_t chunk_rate = argc > 6 ? std::stol(argv[6]) : 10;  // Chunks per second.
 	bool nodata = argc > 7;
 	bool do_sync = argc > 8 ? (bool)std::stol(argv[8]) : true;
+	bool b_contig = true && do_sync;  // Set true to test gather-write operations.
 
 	int32_t chunk_samples = samplingrate > 0 ? std::max((samplingrate / chunk_rate), 1) : 100;  // Samples per chunk.
 	int32_t chunk_duration = 1000 / chunk_rate;  // Milliseconds per chunk
@@ -118,7 +119,7 @@ int main(int argc, char **argv) {
 			lsl::xml_element chn = chns.append_child("channel");
 			chn.append_child_value("label", "Chan-" + std::to_string(c));
 			chn.append_child_value("unit", "microvolts");
-			chn.append_child_value("type", "EEG");
+			chn.append_child_value("type", type);
 		}
 		int32_t buf_samples = max_buffered * samplingrate;
 		lsl::stream_outlet outlet(info, chunk_samples, buf_samples,
@@ -127,32 +128,41 @@ int main(int argc, char **argv) {
 		std::cout << "Stream UID: " << info.uid() << std::endl;
 
 		// Create a connection to our device.
-		fake_device my_device(n_channels, (float)samplingrate);
+		int dev_chans = b_contig ? n_channels : n_channels + 1;
+		fake_device my_device(dev_chans, (float)samplingrate);
 
 		// Prepare buffer to get data from 'device'.
 		//  The buffer should be larger than you think you need. Here we make it 4x as large.
-		std::vector<int16_t> chunk_buffer(4 * chunk_samples * n_channels);
-		std::fill(chunk_buffer.begin(), chunk_buffer.end(), 0);
+		std::vector<int16_t> dev_buffer(4 * chunk_samples * dev_chans);
+		std::fill(dev_buffer.begin(), dev_buffer.end(), 0);
 
 		std::cout << "Now sending data..." << std::endl;
 
 		// Your device might have its own timer. Or you can decide how often to poll
 		//  your device, as we do here.
-		auto next_chunk_time = std::chrono::high_resolution_clock::now();
+		auto t_start = std::chrono::high_resolution_clock::now();
+		auto next_chunk_time = t_start;
 		for (unsigned c = 0;; c++) {
 			// wait a bit
 			next_chunk_time += std::chrono::milliseconds(chunk_duration);
 			std::this_thread::sleep_until(next_chunk_time);
 
 			// Get data from device
-			std::size_t returned_samples = my_device.get_data(chunk_buffer, nodata);
+			std::size_t returned_samples = my_device.get_data(dev_buffer, nodata);
 
 			// send it to the outlet. push_chunk_multiplexed is one of the more complicated approaches.
 			//  other push_chunk methods are easier but slightly slower.
 			double ts = lsl::local_clock();
-			outlet.push_chunk_multiplexed(chunk_buffer.data(), returned_samples * n_channels, ts, true);
+			if (b_contig) {
+				// Push a chunk of a contiguous buffer.
+				outlet.push_chunk_multiplexed(dev_buffer.data(), returned_samples * n_channels, ts, true);
+			} else {
+				std::cout << "Discontiguous push_chunk not yet supported." << std::endl;
+				std::cout << "See SendData.cpp for discontiguous push_sample, then set " << std::endl;
+				std::cout << "timestamps as LSL_DEDUCED_TIMESTAMP and pushtrough as false " << std::endl;
+				std::cout << "for all samples except the the first or last in a chunk." << std::endl;
+			}
 		}
-
 	} catch (std::exception &e) { std::cerr << "Got an exception: " << e.what() << std::endl; }
 	std::cout << "Press any key to exit. " << std::endl;
 	std::cin.get();

include/lsl/outlet.h

@@ -99,7 +99,7 @@ extern LIBLSL_C_API int32_t lsl_push_sample_vtp(lsl_outlet out, const void *data
  * @see lsl_push_sample_ftp
  * @param out The lsl_outlet object through which to push the data.
  * @param data A pointer to values to push. The number of values pointed to must be no less than the number of channels in the sample.
- * @param lengths A pointer the number of elements to push for each channel (string lengths).
+ * @param lengths A pointer the number of elements to push for each channel (string lengths, or number of bytes).
  */
 extern LIBLSL_C_API int32_t lsl_push_sample_buf(lsl_outlet out, const char **data, const uint32_t *lengths);
 /** @copydoc lsl_push_sample_buf
@@ -108,6 +108,11 @@ extern LIBLSL_C_API int32_t lsl_push_sample_buft(lsl_outlet out, const char **da
 /** @copydoc lsl_push_sample_buft
  * @param pushthrough @see lsl_push_sample_ftp */
 extern LIBLSL_C_API int32_t lsl_push_sample_buftp(lsl_outlet out, const char **data, const uint32_t *lengths, double timestamp, int32_t pushthrough);
+/** @copydoc lsl_push_sample_buftp
+ * @param nbufs Number of values pointed to in `data` and number of items in `lengths` -- doesn't assume one buffer
+ * per channel but each array in data must be longer than each item in lengths.
+ */
+extern LIBLSL_C_API int32_t lsl_push_sample_buftpn(lsl_outlet out, const char **data, const uint32_t *lengths, double timestamp, int32_t pushthrough, uint32_t nbufs);
 
 /** Push a chunk of multiplexed samples into the outlet. One timestamp per sample is provided.
  *

include/lsl_cpp.h

@@ -499,7 +499,7 @@ class stream_outlet {
 	}
 
 	/** Push a pointer to raw numeric data as one sample into the outlet.
-	 * This is the lowest-level function; performns no checking whatsoever. Can not be used for
+	 * This is the lowest-level function; performs no checking whatsoever. Cannot be used for
 	 * variable-size / string-formatted channels.
 	 * @param sample A pointer to the raw sample data to push.
 	 * @param timestamp Optionally the capture time of the sample, in agreement with local_clock();
@@ -512,6 +512,20 @@ class stream_outlet {
 		lsl_push_sample_vtp(obj.get(), (sample), timestamp, pushthrough);
 	}
 
+	/**
+	 * Push a pointer to an array of buffers of variable size as one sample into the outlet.
+	 *
+	 * @param bufs A pointer to an array of data buffers.
+	 * @param bytes An array of sizes (number of bytes) of buffers in bufs.
+	 * @param nbufs Total number of buffers.
+	 * @param timestamp Optionally the capture time of the sample, in agreement with local_clock();
+	 * @param pushthrough Whether to push the sample through to the receivers immediately instead of
+	 * concatenating with subsequent samples.
+	 */
+	void push_numeric_bufs(const char **bufs, uint32_t *bytes, uint32_t nbufs, double timestamp = 0.0, bool pushthrough = true) {
+		lsl_push_sample_buftpn(obj.get(), bufs, bytes, timestamp, pushthrough, nbufs);
+	}
+
 
 	// ===================================================
 	// === Pushing an chunk of samples into the outlet ===

src/lsl_outlet_c.cpp

@@ -28,7 +28,7 @@ LIBLSL_C_API lsl_outlet lsl_create_outlet_ex(
 		buf_samples /= 1000;
 	buf_samples = (buf_samples > 0) ? buf_samples : 1;
 	return create_object_noexcept<stream_outlet_impl>(
-		*info, chunk_size, buf_samples);
+		*info, chunk_size, buf_samples, flags);
 }
 
 LIBLSL_C_API lsl_outlet lsl_create_outlet(
@@ -171,14 +171,32 @@ LIBLSL_C_API int32_t lsl_push_sample_buft(
 
 LIBLSL_C_API int32_t lsl_push_sample_buftp(lsl_outlet out, const char **data,
 	const uint32_t *lengths, double timestamp, int32_t pushthrough) {
+	stream_outlet_impl *outimpl = out;
+	return lsl_push_sample_buftpn(out, data, lengths, timestamp, pushthrough,
+		(uint32_t)outimpl->info().channel_count());
+}
+
+LIBLSL_C_API int32_t lsl_push_sample_buftpn(lsl_outlet out, const char **data,
+	const uint32_t *lengths, double timestamp, int32_t pushthrough, uint32_t nbufs) {
+	stream_outlet_impl *outimpl = out;
 	try {
-		stream_outlet_impl *outimpl = out;
-		std::vector<std::string> tmp;
-		for (uint32_t k = 0; k < (uint32_t)outimpl->info().channel_count(); k++)
-			tmp.emplace_back(data[k], lengths[k]);
-		return outimpl->push_sample_noexcept(&tmp[0], timestamp, pushthrough);
+		if (outimpl->is_sync_blocking()) {
+			// Convert input to a vector of asio buffers
+			std::vector<asio::const_buffer> buffs;
+			for (auto buf_ix = 0; buf_ix < nbufs; buf_ix++) {
+				buffs.push_back(asio::buffer(data[buf_ix], lengths[buf_ix]));
+			}
+			return outimpl->push_sample_gather(buffs, timestamp, pushthrough);
+		} else {
+			std::vector<std::string> tmp;
+			for (uint32_t k = 0; k < nbufs; k++)
+				tmp.emplace_back(data[k], lengths[k]);
+			return outimpl->push_sample_noexcept(&tmp[0], timestamp, pushthrough);
+		}
 	} catch (std::exception &e) {
 		LOG_F(WARNING, "Unexpected error during push_sample: %s", e.what());
+		if (!outimpl->is_sync_blocking() && outimpl->info().channel_format() != cft_string)
+			LOG_F(ERROR, "lsl_push_sample_buftpn only compatible with string type or when outlet is using sync writes.");
 		return lsl_internal_error;
 	}
 }