X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=d762869e281572278c3603afc0bbd70d657ceb19;hp=7e20aef2f02c6147e952c3804c55f705d39f0363;hb=9abb89bcf7940e2ada9d708f86a218a56334f68d;hpb=534764f026b82b144e974882c8e53c4cd8d21b68

diff --git a/stream.h b/stream.h
index 7e20aef..d762869 100644
--- a/stream.h
+++ b/stream.h
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <string>
 #include <vector>
 
@@ -28,7 +29,7 @@ struct Stream {
 	// Changes the backlog size, restructuring the data as needed.
 	void set_backlog_size(size_t new_size);
 
-	std::string stream_id;
+	std::string url;
 
 	// The HTTP response header, without the trailing double newline.
 	std::string http_header;
@@ -69,22 +70,31 @@ struct Stream {
 	// What pool to fetch marks from, or NULL.
 	MarkPool *mark_pool;
 
+	// Queued data, if any. Protected by the owning Server's <queued_data_mutex>.
+	// The data pointers in the iovec are owned by us.
+	std::vector<iovec> queued_data;
+
 	// Put client to sleep, since there is no more data for it; we will on
 	// longer listen on POLLOUT until we get more data. Also, it will be put
 	// in the list of clients to wake up when we do.
 	void put_client_to_sleep(Client *client);
 
-	// Add more input data to the stream. You should probably call wake_up_all_clients()
-	// after that.
-	void add_data(const char *data, ssize_t bytes);
+	// Add more data to <queued_data>, adding Metacube headers if needed.
+	// Does not take ownership of <data>.
+	// You should hold the owning Server's <queued_data_mutex>.
+	void add_data_deferred(const char *data, size_t bytes);
 
-	// We have more data, so mark all clients that are sleeping as ready to go.
-	void wake_up_all_clients();
+	// Add queued data to the stream, if any.
+	// You should hold the owning Server's <mutex> _and_ <queued_data_mutex>.
+	void process_queued_data();
 
 private:
 	Stream(const Stream& other);
 
-	void add_data_raw(const char *data, ssize_t bytes);
+	// Adds data directly to the stream file descriptor, without adding headers or
+	// going through <queued_data>.
+	// You should hold the owning Server's <mutex>.
+	void add_data_raw(const std::vector<iovec> &data);
 };
 
 #endif  // !defined(_STREAM_H)