X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;fp=stream.h;h=f2ba5d43dccc561ef530cf2445ea302f3a555e05;hp=d762869e281572278c3603afc0bbd70d657ceb19;hb=1c6b126fe95eb0465383ba225da764757eba05c0;hpb=4553a184fb72d199ad665f469b0ac693fb089701 diff --git a/stream.h b/stream.h index d762869..f2ba5d4 100644 --- a/stream.h +++ b/stream.h @@ -15,6 +15,11 @@ class MarkPool; class StreamProto; struct Client; +enum StreamStartSuitability { + NOT_SUITABLE_FOR_STREAM_START, + SUITABLE_FOR_STREAM_START, +}; + struct Stream { // Must be in sync with StreamConfig::Encoding. enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE }; @@ -57,6 +62,10 @@ struct Stream { // How many bytes this stream have received. Can very well be larger // than , 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; // Clients that are in SENDING_DATA, but that we don't listen on, // because we currently don't have any data for them. @@ -74,6 +83,10 @@ struct Stream { // The data pointers in the iovec are owned by us. std::vector queued_data; + // Index of the last element in queued_data that is suitable to start streaming at. + // -1 if none. + int queued_data_last_starting_point; + // 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. @@ -82,7 +95,7 @@ struct Stream { // Add more data to , adding Metacube headers if needed. // Does not take ownership of . // You should hold the owning Server's . - void add_data_deferred(const char *data, size_t bytes); + void add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start); // Add queued data to the stream, if any. // You should hold the owning Server's _and_ .