X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=0c0fabac29c90f99330cfc8c5d634f3c78321f95;hp=83257e9046d3a9cbbd29756f100bedaed069df45;hb=845934ca50eee40884e8cc85ea81eb310efa5ca3;hpb=479933dbc99e984f1ecf9987441fa3ee8a7bd382 diff --git a/stream.cpp b/stream.cpp index 83257e9..0c0faba 100644 --- a/stream.cpp +++ b/stream.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -15,8 +15,8 @@ using namespace std; -Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding) - : stream_id(stream_id), +Stream::Stream(const string &url, size_t backlog_size, Encoding encoding) + : url(url), encoding(encoding), data_fd(make_tempfile("")), backlog_size(backlog_size), @@ -31,18 +31,12 @@ Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding) Stream::~Stream() { if (data_fd != -1) { - int ret; - do { - ret = close(data_fd); - } while (ret == -1 && errno == EINTR); - if (ret == -1) { - log_perror("close"); - } + safe_close(data_fd); } } Stream::Stream(const StreamProto &serialized, int data_fd) - : stream_id(serialized.stream_id()), + : url(serialized.url()), http_header(serialized.http_header()), stream_header(serialized.stream_header()), encoding(Stream::STREAM_ENCODING_RAW), // Will be changed later. @@ -77,7 +71,7 @@ StreamProto Stream::serialize() serialized.add_data_fds(data_fd); serialized.set_backlog_size(backlog_size); serialized.set_bytes_received(bytes_received); - serialized.set_stream_id(stream_id); + serialized.set_url(url); data_fd = -1; return serialized; } @@ -117,7 +111,13 @@ void Stream::set_backlog_size(size_t new_size) // Now cheat a bit by rewinding, and adding all the old data back. bytes_received -= existing_data.size(); - add_data(existing_data.data(), existing_data.size()); + iovec iov; + iov.iov_base = const_cast(existing_data.data()); + iov.iov_len = existing_data.size(); + + vector iovs; + iovs.push_back(iov); + add_data_raw(iovs); } void Stream::put_client_to_sleep(Client *client) @@ -125,69 +125,121 @@ void Stream::put_client_to_sleep(Client *client) sleeping_clients.push_back(client); } -void Stream::add_data(const char *data, ssize_t bytes) +// Return a new set of iovecs that contains only the first bytes of . +vector collect_iovecs(const vector &data, size_t bytes_wanted) +{ + vector ret; + for (size_t i = 0; i < data.size() && bytes_wanted > 0; ++i) { + if (data[i].iov_len <= bytes_wanted) { + // Consume the entire iovec. + ret.push_back(data[i]); + bytes_wanted -= data[i].iov_len; + } else { + // Take only parts of this iovec. + iovec iov; + iov.iov_base = data[i].iov_base; + iov.iov_len = bytes_wanted; + ret.push_back(iov); + bytes_wanted = 0; + } + } + return ret; +} + +// Return a new set of iovecs that contains all of except the first bytes. +vector remove_iovecs(const vector &data, size_t bytes_wanted) +{ + vector ret; + size_t i; + for (i = 0; i < data.size() && bytes_wanted > 0; ++i) { + if (data[i].iov_len <= bytes_wanted) { + // Consume the entire iovec. + bytes_wanted -= data[i].iov_len; + } else { + // Take only parts of this iovec. + iovec iov; + iov.iov_base = reinterpret_cast(data[i].iov_base) + bytes_wanted; + iov.iov_len = data[i].iov_len - bytes_wanted; + ret.push_back(iov); + bytes_wanted = 0; + } + } + + // Add the rest of the iovecs unchanged. + ret.insert(ret.end(), data.begin() + i, data.end()); + return ret; +} + +void Stream::add_data_raw(const vector &orig_data) +{ + vector data = orig_data; + while (!data.empty()) { + size_t pos = bytes_received % backlog_size; + + // Collect as many iovecs as we can before we hit the point + // where the circular buffer wraps around. + vector to_write = collect_iovecs(data, backlog_size - pos); + ssize_t ret; + do { + ret = pwritev(data_fd, to_write.data(), to_write.size(), pos); + } while (ret == -1 && errno == EINTR); + + if (ret == -1) { + log_perror("pwritev"); + // Dazed and confused, but trying to continue... + return; + } + bytes_received += ret; + + // Remove the data that was actually written from the set of iovecs. + data = remove_iovecs(data, ret); + } +} + +void Stream::add_data_deferred(const char *data, size_t bytes) { - if (encoding == Stream::STREAM_ENCODING_RAW) { - add_data_raw(data, bytes); - } else if (encoding == STREAM_ENCODING_METACUBE) { + if (encoding == Stream::STREAM_ENCODING_METACUBE) { + // Add a Metacube block header before the data. metacube_block_header hdr; memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync)); hdr.size = htonl(bytes); hdr.flags = htonl(0); - char *block = new char[bytes + sizeof(hdr)]; - memcpy(block, &hdr, sizeof(hdr)); - memcpy(block + sizeof(hdr), data, bytes); - add_data_raw(block, bytes + sizeof(hdr)); - delete[] block; + iovec iov; + iov.iov_base = new char[bytes + sizeof(hdr)]; + iov.iov_len = bytes + sizeof(hdr); + + memcpy(iov.iov_base, &hdr, sizeof(hdr)); + memcpy(reinterpret_cast(iov.iov_base) + sizeof(hdr), data, bytes); + + queued_data.push_back(iov); + } else if (encoding == Stream::STREAM_ENCODING_RAW) { + // Just add the data itself. + iovec iov; + iov.iov_base = new char[bytes]; + memcpy(iov.iov_base, data, bytes); + iov.iov_len = bytes; + + queued_data.push_back(iov); } else { assert(false); } } -void Stream::add_data_raw(const char *data, ssize_t bytes) +void Stream::process_queued_data() { - size_t pos = bytes_received % backlog_size; - bytes_received += bytes; - - if (pos + bytes > backlog_size) { - ssize_t to_copy = backlog_size - pos; - while (to_copy > 0) { - int ret = pwrite(data_fd, data, to_copy, pos); - if (ret == -1 && errno == EINTR) { - continue; - } - if (ret == -1) { - log_perror("pwrite"); - // Dazed and confused, but trying to continue... - break; - } - pos += ret; - data += ret; - to_copy -= ret; - bytes -= ret; - } - pos = 0; + if (queued_data.empty()) { + return; } - while (bytes > 0) { - int ret = pwrite(data_fd, data, bytes, pos); - if (ret == -1 && errno == EINTR) { - continue; - } - if (ret == -1) { - log_perror("pwrite"); - // Dazed and confused, but trying to continue... - break; - } - pos += ret; - data += ret; - bytes -= ret; + add_data_raw(queued_data); + for (size_t i = 0; i < queued_data.size(); ++i) { + char *data = reinterpret_cast(queued_data[i].iov_base); + delete[] data; } -} + queued_data.clear(); -void Stream::wake_up_all_clients() -{ + // We have more data, so wake up all clients. if (to_process.empty()) { swap(sleeping_clients, to_process); } else {