#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/epoll.h>
+#include <sys/sendfile.h>
#include <time.h>
#include <signal.h>
#include <errno.h>
#include "server.h"
#include "mutexlock.h"
#include "parse.h"
+#include "util.h"
#include "state.pb.h"
using namespace std;
return stats;
}
-Stream::Stream(const string &stream_id)
+Stream::Stream(const string &stream_id, size_t backlog_size)
: stream_id(stream_id),
- data(new char[BACKLOG_SIZE]),
- data_size(0),
+ data_fd(make_tempfile("")),
+ backlog_size(backlog_size),
+ bytes_received(0),
mark_pool(NULL)
{
- memset(data, 0, BACKLOG_SIZE);
+ if (data_fd == -1) {
+ exit(1);
+ }
}
Stream::~Stream()
{
- delete[] data;
+ if (data_fd != -1) {
+ int ret;
+ do {
+ ret = close(data_fd);
+ } while (ret == -1 && errno == EINTR);
+ if (ret == -1) {
+ perror("close");
+ }
+ }
}
Stream::Stream(const StreamProto &serialized)
: stream_id(serialized.stream_id()),
header(serialized.header()),
- data(new char[BACKLOG_SIZE]),
- data_size(serialized.data_size()),
+ data_fd(make_tempfile(serialized.data())),
+ backlog_size(serialized.backlog_size()),
+ bytes_received(serialized.bytes_received()),
mark_pool(NULL)
{
- assert(serialized.data().size() == BACKLOG_SIZE);
- memcpy(data, serialized.data().data(), BACKLOG_SIZE);
+ if (data_fd == -1) {
+ exit(1);
+ }
}
-StreamProto Stream::serialize() const
+StreamProto Stream::serialize()
{
StreamProto serialized;
serialized.set_header(header);
- serialized.set_data(string(data, data + BACKLOG_SIZE));
- serialized.set_data_size(data_size);
+ if (!read_tempfile(data_fd, serialized.mutable_data())) { // Closes data_fd.
+ exit(1);
+ }
+ serialized.set_backlog_size(backlog_size);
+ serialized.set_bytes_received(bytes_received);
serialized.set_stream_id(stream_id);
+ data_fd = -1;
return serialized;
}
}
if (client_ptr->state == Client::SENDING_DATA &&
- client_ptr->bytes_sent == client_ptr->stream->data_size) {
+ client_ptr->bytes_sent == client_ptr->stream->bytes_received) {
client_ptr->stream->put_client_to_sleep(client_ptr);
} else {
process_client(client_ptr);
}
}
-void Server::add_stream(const string &stream_id)
+void Server::add_stream(const string &stream_id, size_t backlog_size)
{
MutexLock lock(&mutex);
- streams.insert(make_pair(stream_id, new Stream(stream_id)));
+ streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size)));
}
void Server::add_stream_from_serialized(const StreamProto &stream)
queued_data[stream_id].append(string(data, data + bytes));
}
-void Server::add_data(const string &stream_id, const char *data, size_t bytes)
+void Server::add_data(const string &stream_id, const char *data, ssize_t bytes)
{
Stream *stream = find_stream(stream_id);
- size_t pos = stream->data_size % BACKLOG_SIZE;
- stream->data_size += bytes;
-
- if (pos + bytes > BACKLOG_SIZE) {
- size_t to_copy = BACKLOG_SIZE - pos;
- memcpy(stream->data + pos, data, to_copy);
- data += to_copy;
- bytes -= to_copy;
+ size_t pos = stream->bytes_received % stream->backlog_size;
+ stream->bytes_received += bytes;
+
+ if (pos + bytes > stream->backlog_size) {
+ ssize_t to_copy = stream->backlog_size - pos;
+ while (to_copy > 0) {
+ int ret = pwrite(stream->data_fd, data, to_copy, pos);
+ if (ret == -1 && errno == EINTR) {
+ continue;
+ }
+ if (ret == -1) {
+ perror("pwrite");
+ // Dazed and confused, but trying to continue...
+ break;
+ }
+ pos += ret;
+ data += ret;
+ to_copy -= ret;
+ bytes -= ret;
+ }
pos = 0;
}
- memcpy(stream->data + pos, data, bytes);
+ while (bytes > 0) {
+ int ret = pwrite(stream->data_fd, data, bytes, pos);
+ if (ret == -1 && errno == EINTR) {
+ continue;
+ }
+ if (ret == -1) {
+ perror("pwrite");
+ // Dazed and confused, but trying to continue...
+ break;
+ }
+ pos += ret;
+ data += ret;
+ bytes -= ret;
+ }
+
stream->wake_up_all_clients();
}
// but we'll start sending immediately as we get data.
// This is postcondition #3.
client->state = Client::SENDING_DATA;
- client->bytes_sent = client->stream->data_size;
+ client->bytes_sent = client->stream->bytes_received;
client->stream->put_client_to_sleep(client);
return;
}
case Client::SENDING_DATA: {
+sending_data_again:
// See if there's some data we've lost. Ideally, we should drop to a block boundary,
// but resync will be the mux's problem.
Stream *stream = client->stream;
- size_t bytes_to_send = stream->data_size - client->bytes_sent;
+ size_t bytes_to_send = stream->bytes_received - client->bytes_sent;
if (bytes_to_send == 0) {
return;
}
- if (bytes_to_send > BACKLOG_SIZE) {
+ if (bytes_to_send > stream->backlog_size) {
fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
client->sock,
- (long long int)(bytes_to_send - BACKLOG_SIZE));
- client->bytes_sent = stream->data_size - BACKLOG_SIZE;
- bytes_to_send = BACKLOG_SIZE;
+ (long long int)(bytes_to_send - stream->backlog_size));
+ client->bytes_sent = stream->bytes_received - stream->backlog_size;
+ bytes_to_send = stream->backlog_size;
}
// See if we need to split across the circular buffer.
- ssize_t ret;
- if ((client->bytes_sent % BACKLOG_SIZE) + bytes_to_send > BACKLOG_SIZE) {
- size_t bytes_first_part = BACKLOG_SIZE - (client->bytes_sent % BACKLOG_SIZE);
-
- iovec iov[2];
- iov[0].iov_base = const_cast<char *>(stream->data + (client->bytes_sent % BACKLOG_SIZE));
- iov[0].iov_len = bytes_first_part;
+ bool more_data = false;
+ if ((client->bytes_sent % stream->backlog_size) + bytes_to_send > stream->backlog_size) {
+ bytes_to_send = stream->backlog_size - (client->bytes_sent % stream->backlog_size);
+ more_data = true;
+ }
- iov[1].iov_base = const_cast<char *>(stream->data);
- iov[1].iov_len = bytes_to_send - bytes_first_part;
+ ssize_t ret;
+ do {
+ loff_t offset = client->bytes_sent % stream->backlog_size;
+ ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
+ } while (ret == -1 && errno == EINTR);
- do {
- ret = writev(client->sock, iov, 2);
- } while (ret == -1 && errno == EINTR);
- } else {
- do {
- ret = write(client->sock,
- stream->data + (client->bytes_sent % BACKLOG_SIZE),
- bytes_to_send);
- } while (ret == -1 && errno == EINTR);
- }
if (ret == -1 && errno == EAGAIN) {
// We're out of socket space, so return; epoll will wake us up
// when there is more room.
}
if (ret == -1) {
// Error, close; postcondition #1.
- perror("write/writev");
+ perror("sendfile");
close_client(client);
return;
}
client->bytes_sent += ret;
- if (client->bytes_sent == stream->data_size) {
+ if (client->bytes_sent == stream->bytes_received) {
// We don't have any more data for this client, so put it to sleep.
// This is postcondition #3.
stream->put_client_to_sleep(client);
- } else {
- // XXX: Do we need to go another round here to explicitly
- // get the EAGAIN?
+ } else if (more_data) {
+ goto sending_data_again;
}
break;
}
projects / cubemap / blobdiff