Client::Client(int sock)
: sock(sock),
state(Client::READING_REQUEST),
+ stream(NULL),
header_or_error_bytes_sent(0),
bytes_sent(0)
{
request.reserve(1024);
}
-Client::Client(const ClientProto &serialized)
+Client::Client(const ClientProto &serialized, Stream *stream)
: sock(serialized.sock()),
state(State(serialized.state())),
request(serialized.request()),
stream_id(serialized.stream_id()),
+ stream(stream),
header_or_error(serialized.header_or_error()),
header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
bytes_sent(serialized.bytes_sent())
void Server::add_client_from_serialized(const ClientProto &client)
{
MutexLock lock(&mutex);
- clients.insert(make_pair(client.sock(), Client(client)));
+ Stream *stream = find_stream(client.stream_id());
+ clients.insert(make_pair(client.sock(), Client(client, stream)));
// Start listening on data from this socket.
epoll_event ev;
// but we'll start sending immediately as we get data.
// This is postcondition #3.
client->state = Client::SENDING_DATA;
- client->bytes_sent = find_stream(client->stream_id)->data_size;
+ client->bytes_sent = client->stream->data_size;
sleeping_clients.push_back(client);
return;
}
case Client::SENDING_DATA: {
// 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.
- const Stream &stream = *find_stream(client->stream_id);
- size_t bytes_to_send = stream.data_size - client->bytes_sent;
+ const Stream *stream = client->stream;
+ size_t bytes_to_send = stream->data_size - client->bytes_sent;
if (bytes_to_send > 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 = find_stream(client->stream_id)->data_size - BACKLOG_SIZE;
+ client->bytes_sent = stream->data_size - 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_base = const_cast<char *>(stream->data + (client->bytes_sent % BACKLOG_SIZE));
iov[0].iov_len = bytes_first_part;
- iov[1].iov_base = const_cast<char *>(stream.data);
+ iov[1].iov_base = const_cast<char *>(stream->data);
iov[1].iov_len = bytes_to_send - bytes_first_part;
do {
} else {
do {
ret = write(client->sock,
- stream.data + (client->bytes_sent % BACKLOG_SIZE),
+ stream->data + (client->bytes_sent % BACKLOG_SIZE),
bytes_to_send);
} while (ret == -1 && errno == EINTR);
}
}
client->bytes_sent += ret;
- if (client->bytes_sent == stream.data_size) {
+ if (client->bytes_sent == stream->data_size) {
// We don't have any more data for this client, so put it to sleep.
// This is postcondition #3.
put_client_to_sleep(client);
}
client->stream_id = request_tokens[1];
+ client->stream = streams[client->stream_id];
client->request.clear();
return 200; // OK!