X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=c98feb46e3bb2e09f5913c1ea31a018e02680075;hp=3a9474a78bf0fcacebd3b7fdfe31dafc35a7303c;hb=52d37b2815f4b144fbac899b7f9548353a6fbe3c;hpb=b2d3112addcc8da422f08708db29435b45d85afa

diff --git a/stream.h b/stream.h
index 3a9474a..c98feb4 100644
--- a/stream.h
+++ b/stream.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <deque>
 #include <string>
 #include <vector>
 
@@ -75,9 +76,9 @@ struct Stream {
 	// than <backlog_size>, since the buffer wraps.
 	size_t bytes_received;
 
-	// The last point in the stream that is suitable to start new clients at
-	// (after having sent the header). -1 if no such point exists yet.
-	ssize_t last_suitable_starting_point;
+	// A list of points in the stream that is suitable to start new clients at
+	// (after having sent the header). Empty if no such point exists yet.
+	std::deque<size_t> suitable_starting_points;
 	
 	// Clients that are in SENDING_DATA, but that we don't listen on,
 	// because we currently don't have any data for them.
@@ -93,11 +94,11 @@ struct Stream {
 
 	// Queued data, if any. Protected by <queued_data_mutex>.
 	// The data pointers in the iovec are owned by us.
-	std::vector<iovec> queued_data;
-
-	// Index of the last element in queued_data that is suitable to start streaming at.
-	// -1 if none. Protected by <queued_data_mutex>.
-	int queued_data_last_starting_point_index;
+	struct DataElement {
+		iovec data;
+		StreamStartSuitability suitable_for_stream_start;
+	};
+	std::vector<DataElement> 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
@@ -117,8 +118,14 @@ private:
 
 	// Adds data directly to the stream file descriptor, without adding headers or
 	// going through <queued_data>.
+	// You should hold the owning Server's <mutex>, and probably call
+	// remove_obsolete_starting_points() afterwards.
+	void add_data_raw(const std::vector<DataElement> &data);
+
+	// Remove points from <suitable_starting_points> that are no longer
+	// in the backlog.
 	// You should hold the owning Server's <mutex>.
-	void add_data_raw(const std::vector<iovec> &data);
+	void remove_obsolete_starting_points();
 };
 
 #endif  // !defined(_STREAM_H)