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);
process_client(client);
}
- for (unsigned i = 0; i < to_process.size(); ++i) {
- process_client(to_process[i]);
+ 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();
}
- to_process.clear();
}
}
if (client_ptr->state == Client::SENDING_DATA &&
client_ptr->bytes_sent == client_ptr->stream->data_size) {
- put_client_to_sleep(client_ptr);
+ client_ptr->stream->put_client_to_sleep(client_ptr);
} else {
process_client(client_ptr);
}
}
memcpy(stream->data + pos, data, bytes);
- wake_up_all_clients();
+ stream->wake_up_all_clients();
}
// See the .h file for postconditions after this function.
// This is postcondition #3.
client->state = Client::SENDING_DATA;
client->bytes_sent = client->stream->data_size;
- put_client_to_sleep(client);
+ 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 = client->stream;
+ Stream *stream = client->stream;
size_t bytes_to_send = stream->data_size - client->bytes_sent;
if (bytes_to_send == 0) {
return;
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?
}
// 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)
-{
- sleeping_clients.push_back(client);
-}
-
-void Server::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();
- }
-}
-
Stream *Server::find_stream(const string &stream_id)
{
map<string, Stream *>::iterator it = streams.find(stream_id);
// How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
// since the buffer wraps.
size_t data_size;
+
+ // Clients that are in SENDING_DATA, but that we don't listen on,
+ // because we currently don't have any data for them.
+ // See put_client_to_sleep() and wake_up_all_clients().
+ std::vector<Client *> sleeping_clients;
+
+ // Clients that we recently got data for (when they were in
+ // <sleeping_clients>).
+ std::vector<Client *> to_process;
+
+ // Put client to sleep, since there is no more data for it; we will on
+ // longer listen on POLLOUT until we get more data. Also, it will be put
+ // in the list of clients to wake up when we do.
+ void put_client_to_sleep(Client *client);
+
+ // We have more data, so mark all clients that are sleeping as ready to go.
+ void wake_up_all_clients();
private:
Stream(const Stream& other);
int epoll_fd;
epoll_event events[EPOLL_MAX_EVENTS];
- // Clients that are in SENDING_DATA, but that we don't listen on,
- // because we currently don't have any data for them.
- // See put_client_to_sleep() and wake_up_all_clients().
- std::vector<Client *> sleeping_clients;
-
- // Clients that we recently got data for (when they were in
- // <sleeping_clients>).
- std::vector<Client *> to_process;
-
// Recover the this pointer, and call do_work().
static void *do_work_thunk(void *arg);
// the SENDING_ERROR state.
void construct_error(Client *client, int error_code);
- // Put client to sleep, since there is no more data for it; we will on
- // longer listen on POLLOUT until we get more data. Also, it will be put
- // in the list of clients to wake up when we do.
- void put_client_to_sleep(Client *client);
-
- // We have more data, so mark all clients that are sleeping as ready to go.
- void wake_up_all_clients();
-
// TODO: This function should probably die.
Stream *find_stream(const std::string &stream_id);
};