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())
return serialized;
}
+void Stream::put_client_to_sleep(Client *client)
+{
+ sleeping_clients.push_back(client);
+}
+
+void Stream::wake_up_all_clients()
+{
+ if (to_process.empty()) {
+ swap(sleeping_clients, to_process);
+ } else {
+ to_process.insert(to_process.end(), sleeping_clients.begin(), sleeping_clients.end());
+ sleeping_clients.clear();
+ }
+}
+
Server::Server()
{
pthread_mutex_init(&mutex, NULL);
+ pthread_mutex_init(&queued_data_mutex, NULL);
epoll_fd = epoll_create(1024); // Size argument is ignored.
if (epoll_fd == -1) {
if (should_stop) {
return;
}
-
+
+ process_queued_data();
+
for (int i = 0; i < nfds; ++i) {
int fd = events[i].data.fd;
assert(clients.count(fd) != 0);
process_client(client);
}
+
+ for (map<string, Stream *>::iterator stream_it = streams.begin();
+ stream_it != streams.end();
+ ++stream_it) {
+ Stream *stream = stream_it->second;
+ for (size_t i = 0; i < stream->to_process.size(); ++i) {
+ process_client(stream->to_process[i]);
+ }
+ stream->to_process.clear();
+ }
}
}
-CubemapStateProto Server::serialize() const
+CubemapStateProto Server::serialize()
{
+ // We don't serialize anything queued, so empty the queues.
+ process_queued_data();
+
CubemapStateProto serialized;
for (map<int, Client>::const_iterator client_it = clients.begin();
client_it != clients.end();
return serialized;
}
+void Server::add_client_deferred(int sock)
+{
+ MutexLock lock(&queued_data_mutex);
+ queued_add_clients.push_back(sock);
+}
+
void Server::add_client(int sock)
{
- MutexLock lock(&mutex);
clients.insert(make_pair(sock, Client(sock)));
// Start listening on data from this socket.
epoll_event ev;
- ev.events = EPOLLIN | EPOLLRDHUP;
+ ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
ev.data.u64 = 0; // Keep Valgrind happy.
ev.data.fd = sock;
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_ADD)");
exit(1);
}
+
+ process_client(&clients[sock]);
}
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)));
+ Client *client_ptr = &clients[client.sock()];
// Start listening on data from this socket.
epoll_event ev;
perror("epoll_ctl(EPOLL_CTL_ADD)");
exit(1);
}
+
+ if (client_ptr->state == Client::SENDING_DATA &&
+ client_ptr->bytes_sent == client_ptr->stream->data_size) {
+ 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_data(const string &stream_id, const char *data, size_t bytes)
+
+void Server::add_data_deferred(const string &stream_id, const char *data, size_t bytes)
{
- if (bytes == 0) {
- return;
- }
+ MutexLock lock(&queued_data_mutex);
+ queued_data[stream_id].append(string(data, data + bytes));
+}
- MutexLock lock(&mutex);
+void Server::add_data(const string &stream_id, const char *data, size_t bytes)
+{
Stream *stream = find_stream(stream_id);
size_t pos = stream->data_size % BACKLOG_SIZE;
stream->data_size += bytes;
}
memcpy(stream->data + pos, data, bytes);
- wake_up_all_clients();
+ stream->wake_up_all_clients();
}
// See the .h file for postconditions after this function.
// 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;
- sleeping_clients.push_back(client);
+ client->bytes_sent = client->stream->data_size;
+ client->stream->put_client_to_sleep(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;
+ Stream *stream = client->stream;
+ size_t bytes_to_send = stream->data_size - client->bytes_sent;
+ if (bytes_to_send == 0) {
+ return;
+ }
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);
+ stream->put_client_to_sleep(client);
} else {
// XXX: Do we need to go another round here to explicitly
// get the EAGAIN?
}
client->stream_id = request_tokens[1];
+ client->stream = find_stream(client->stream_id);
client->request.clear();
return 200; // OK!
}
// This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
- vector<Client *>::iterator new_end =
- remove(sleeping_clients.begin(), sleeping_clients.end(), client);
- sleeping_clients.erase(new_end, sleeping_clients.end());
+ if (client->stream != NULL) {
+ vector<Client *>::iterator new_end =
+ remove(client->stream->sleeping_clients.begin(),
+ client->stream->sleeping_clients.end(),
+ client);
+ client->stream->sleeping_clients.erase(
+ new_end, client->stream->sleeping_clients.end());
+ }
// Bye-bye!
int ret;
clients.erase(client->sock);
}
-void Server::put_client_to_sleep(Client *client)
+Stream *Server::find_stream(const string &stream_id)
{
- sleeping_clients.push_back(client);
+ map<string, Stream *>::iterator it = streams.find(stream_id);
+ assert(it != streams.end());
+ return it->second;
}
-void Server::wake_up_all_clients()
+void Server::process_queued_data()
{
- vector<Client *> to_process;
- swap(sleeping_clients, to_process);
- for (unsigned i = 0; i < to_process.size(); ++i) {
- process_client(to_process[i]);
+ MutexLock lock(&queued_data_mutex);
+
+ for (size_t i = 0; i < queued_add_clients.size(); ++i) {
+ add_client(queued_add_clients[i]);
}
-}
+ queued_add_clients.clear();
-Stream *Server::find_stream(const string &stream_id)
-{
- map<string, Stream *>::iterator it = streams.find(stream_id);
- assert(it != streams.end());
- return it->second;
+ for (map<string, string>::iterator queued_it = queued_data.begin();
+ queued_it != queued_data.end();
+ ++queued_it) {
+ add_data(queued_it->first, queued_it->second.data(), queued_it->second.size());
+ }
+ queued_data.clear();
}
projects / cubemap / blobdiff