if (should_stop) {
return;
}
-
+
for (int i = 0; i < nfds; ++i) {
int fd = events[i].data.fd;
assert(clients.count(fd) != 0);
process_client(client);
}
+
+ for (unsigned i = 0; i < to_process.size(); ++i) {
+ process_client(to_process[i]);
+ }
+ to_process.clear();
}
}
// 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);
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;
exit(1);
}
- process_client(&clients[client.sock()]);
+ if (client_ptr->state == Client::SENDING_DATA &&
+ client_ptr->bytes_sent == client_ptr->stream->data_size) {
+ put_client_to_sleep(client_ptr);
+ } else {
+ process_client(client_ptr);
+ }
}
void Server::add_stream(const string &stream_id)
// This is postcondition #3.
client->state = Client::SENDING_DATA;
client->bytes_sent = client->stream->data_size;
- sleeping_clients.push_back(client);
+ put_client_to_sleep(client);
return;
}
case Client::SENDING_DATA: {
// but resync will be the mux's problem.
const 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,
void Server::wake_up_all_clients()
{
- vector<Client *> to_process;
- swap(sleeping_clients, to_process);
- for (unsigned i = 0; i < to_process.size(); ++i) {
- process_client(to_process[i]);
+ 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();
}
}