#include <sys/sendfile.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <time.h>
#include <unistd.h>
#include <algorithm>
#include <map>
#include <utility>
#include <vector>
+#include "accesslog.h"
+#include "log.h"
#include "markpool.h"
#include "mutexlock.h"
#include "parse.h"
using namespace std;
+extern AccessLogThread *access_log;
+
Server::Server()
{
pthread_mutex_init(&mutex, NULL);
epoll_fd = epoll_create(1024); // Size argument is ignored.
if (epoll_fd == -1) {
- perror("epoll_fd");
+ log_perror("epoll_fd");
exit(1);
}
}
Server::~Server()
{
+ for (map<string, Stream *>::iterator stream_it = streams.begin();
+ stream_it != streams.end();
+ ++stream_it) {
+ delete stream_it->second;
+ }
+
int ret;
do {
ret = close(epoll_fd);
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- perror("close(epoll_fd)");
+ log_perror("close(epoll_fd)");
}
}
continue;
}
if (nfds == -1) {
- perror("epoll_wait");
+ log_perror("epoll_wait");
exit(1);
}
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)");
+ log_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)");
+ log_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);
}
}
return;
}
if (ret == -1) {
- perror("read");
+ log_perror("read");
close_client(client);
return;
}
switch (status) {
case RP_OUT_OF_SPACE:
- fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
+ log(WARNING, "[%s] Client sent overlong request!", client->remote_addr.c_str());
close_client(client);
return;
case RP_NOT_FINISHED_YET:
// See if there's more data for us.
goto read_request_again;
case RP_EXTRA_DATA:
- fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
+ log(WARNING, "[%s] Junk data after request!", client->remote_addr.c_str());
close_client(client);
return;
case RP_FINISHED:
if (ret == -1) {
// Error! Postcondition #1.
- perror("write");
+ log_perror("write");
close_client(client);
return;
}
// 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;
}
if (bytes_to_send > stream->backlog_size) {
- fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
- client->sock,
+ log(WARNING, "[%s] Client lost %lld bytes, maybe too slow connection",
+ client->remote_addr.c_str(),
(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);
}
if (ret == -1) {
// Error, close; postcondition #1.
- perror("sendfile");
+ log_perror("sendfile");
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 && size_t(ret) == bytes_to_send) {
goto sending_data_again;
}
break;
}
if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {
if (client->fwmark != 0) {
- perror("setsockopt(SO_MARK)");
+ log_perror("setsockopt(SO_MARK)");
}
}
client->request.clear();
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)");
+ log_perror("epoll_ctl(EPOLL_CTL_MOD)");
exit(1);
}
}
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)");
+ log_perror("epoll_ctl(EPOLL_CTL_MOD)");
exit(1);
}
}
void Server::close_client(Client *client)
{
if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
- perror("epoll_ctl(EPOLL_CTL_DEL)");
+ log_perror("epoll_ctl(EPOLL_CTL_DEL)");
exit(1);
}
}
}
+ // Log to access_log.
+ access_log->write(client->get_stats());
+
// Bye-bye!
int ret;
do {
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- perror("close");
+ log_perror("close");
}
clients.erase(client->sock);
++queued_it) {
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();
}