-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
+#include <errno.h>
#include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <sys/epoll.h>
#include <sys/sendfile.h>
-#include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
#include "markpool.h"
+#include "mutexlock.h"
#include "parse.h"
#include "server.h"
-#include "stream.h"
-#include "mutexlock.h"
#include "state.pb.h"
+#include "stream.h"
using namespace std;
process_queued_data();
for (int i = 0; i < nfds; ++i) {
- int fd = events[i].data.fd;
- assert(clients.count(fd) != 0);
- Client *client = &clients[fd];
+ Client *client = reinterpret_cast<Client *>(events[i].data.u64);
if (events[i].events & (EPOLLERR | EPOLLRDHUP | EPOLLHUP)) {
close_client(client);
// Start listening on data from this socket.
epoll_event ev;
ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
- ev.data.u64 = 0; // Keep Valgrind happy.
- ev.data.fd = sock;
+ ev.data.u64 = reinterpret_cast<uint64_t>(&clients[sock]);
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_ADD)");
exit(1);
void Server::add_client_from_serialized(const ClientProto &client)
{
MutexLock lock(&mutex);
- Stream *stream = find_stream(client.stream_id());
+ Stream *stream;
+ map<string, Stream *>::iterator stream_it = streams.find(client.stream_id());
+ if (stream_it == streams.end()) {
+ stream = NULL;
+ } else {
+ stream = stream_it->second;
+ }
clients.insert(make_pair(client.sock(), Client(client, stream)));
Client *client_ptr = &clients[client.sock()];
ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;
}
ev.data.u64 = 0; // Keep Valgrind happy.
- ev.data.fd = client.sock();
+ ev.data.u64 = reinterpret_cast<uint64_t>(client_ptr);
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_ADD)");
exit(1);
}
if (client_ptr->state == Client::SENDING_DATA &&
- client_ptr->bytes_sent == client_ptr->stream->bytes_received) {
+ client_ptr->stream_pos == client_ptr->stream->bytes_received) {
client_ptr->stream->put_client_to_sleep(client_ptr);
} else {
process_client(client_ptr);
streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
}
+void Server::set_backlog_size(const std::string &stream_id, size_t new_size)
+{
+ MutexLock lock(&mutex);
+ assert(streams.count(stream_id) != 0);
+ streams[stream_id]->set_backlog_size(new_size);
+}
+
void Server::set_header(const string &stream_id, const string &header)
{
MutexLock lock(&mutex);
++client_it) {
Client *client = &client_it->second;
if (client->state == Client::SENDING_DATA &&
- client->bytes_sent == 0) {
+ client->stream_pos == 0) {
construct_header(client);
}
}
queued_data[stream_id].append(string(data, data + 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->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;
- }
-
- 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();
-}
-
// See the .h file for postconditions after this function.
void Server::process_client(Client *client)
{
// but we'll start sending immediately as we get data.
// This is postcondition #3.
client->state = Client::SENDING_DATA;
- client->bytes_sent = client->stream->bytes_received;
+ client->stream_pos = client->stream->bytes_received;
client->stream->put_client_to_sleep(client);
return;
}
// 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->bytes_received - client->bytes_sent;
+ size_t bytes_to_send = stream->bytes_received - client->stream_pos;
if (bytes_to_send == 0) {
return;
}
fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
client->sock,
(long long int)(bytes_to_send - stream->backlog_size));
- client->bytes_sent = stream->bytes_received - stream->backlog_size;
+ client->stream_pos = stream->bytes_received - stream->backlog_size;
+ client->bytes_lost += bytes_to_send - stream->backlog_size;
+ ++client->num_loss_events;
bytes_to_send = stream->backlog_size;
}
// See if we need to split across the circular buffer.
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);
+ if ((client->stream_pos % stream->backlog_size) + bytes_to_send > stream->backlog_size) {
+ bytes_to_send = stream->backlog_size - (client->stream_pos % stream->backlog_size);
more_data = true;
}
ssize_t ret;
do {
- loff_t offset = client->bytes_sent % stream->backlog_size;
+ loff_t offset = client->stream_pos % stream->backlog_size;
ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
} while (ret == -1 && errno == EINTR);
close_client(client);
return;
}
+ client->stream_pos += ret;
client->bytes_sent += ret;
- if (client->bytes_sent == stream->bytes_received) {
+ if (client->stream_pos == 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 if (more_data) {
+ } else if (more_data && ret == bytes_to_send) {
goto sending_data_again;
}
break;
epoll_event ev;
ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;
- ev.data.u64 = 0; // Keep Valgrind happy.
- ev.data.fd = client->sock;
+ ev.data.u64 = reinterpret_cast<uint64_t>(client);
if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_MOD)");
epoll_event ev;
ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;
- ev.data.u64 = 0; // Keep Valgrind happy.
- ev.data.fd = client->sock;
+ ev.data.u64 = reinterpret_cast<uint64_t>(client);
if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
perror("epoll_ctl(EPOLL_CTL_MOD)");
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());
+ Stream *stream = find_stream(queued_it->first);
+ stream->add_data(queued_it->second.data(), queued_it->second.size());
+ stream->wake_up_all_clients();
}
queued_data.clear();
}
projects / cubemap / blobdiff