#include <stdio.h>
#include <string.h>
#include <stdint.h>
+#include <unistd.h>
#include <assert.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/ioctl.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 <algorithm>
+#include "markpool.h"
#include "metacube.h"
#include "server.h"
#include "mutexlock.h"
#include "parse.h"
+#include "util.h"
#include "state.pb.h"
using namespace std;
Client::Client(int sock)
: sock(sock),
+ fwmark(0),
+ connect_time(time(NULL)),
state(Client::READING_REQUEST),
stream(NULL),
header_or_error_bytes_sent(0),
bytes_sent(0)
{
request.reserve(1024);
+
+ // Find the remote address, and convert it to ASCII.
+ sockaddr_in6 addr;
+ socklen_t addr_len = sizeof(addr);
+
+ if (getpeername(sock, reinterpret_cast<sockaddr *>(&addr), &addr_len) == -1) {
+ perror("getpeername");
+ remote_addr = "";
+ } else {
+ char buf[INET6_ADDRSTRLEN];
+ if (inet_ntop(addr.sin6_family, &addr.sin6_addr, buf, sizeof(buf)) == NULL) {
+ perror("inet_ntop");
+ remote_addr = "";
+ } else {
+ remote_addr = buf;
+ }
+ }
}
Client::Client(const ClientProto &serialized, Stream *stream)
: sock(serialized.sock()),
+ remote_addr(serialized.remote_addr()),
+ connect_time(serialized.connect_time()),
state(State(serialized.state())),
request(serialized.request()),
stream_id(serialized.stream_id()),
header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
bytes_sent(serialized.bytes_sent())
{
+ if (stream->mark_pool != NULL) {
+ fwmark = stream->mark_pool->get_mark();
+ } else {
+ fwmark = 0; // No mark.
+ }
+ if (setsockopt(sock, SOL_SOCKET, SO_MARK, &fwmark, sizeof(fwmark)) == -1) {
+ if (fwmark != 0) {
+ perror("setsockopt(SO_MARK)");
+ }
+ }
}
ClientProto Client::serialize() const
{
ClientProto serialized;
serialized.set_sock(sock);
+ serialized.set_remote_addr(remote_addr);
+ serialized.set_connect_time(connect_time);
serialized.set_state(state);
serialized.set_request(request);
serialized.set_stream_id(stream_id);
serialized.set_bytes_sent(bytes_sent);
return serialized;
}
+
+ClientStats Client::get_stats() const
+{
+ ClientStats stats;
+ stats.stream_id = stream_id;
+ stats.remote_addr = remote_addr;
+ stats.connect_time = connect_time;
+ stats.bytes_sent = bytes_sent;
+ return stats;
+}
-Stream::Stream(const string &stream_id)
+Stream::Stream(const string &stream_id, size_t backlog_size)
: stream_id(stream_id),
- data(new char[BACKLOG_SIZE]),
- data_size(0)
+ data_fd(make_tempfile("")),
+ backlog_size(backlog_size),
+ bytes_received(0),
+ mark_pool(NULL)
{
- memset(data, 0, BACKLOG_SIZE);
+ if (data_fd == -1) {
+ exit(1);
+ }
}
Stream::~Stream()
{
- delete[] data;
+ if (data_fd != -1) {
+ int ret;
+ do {
+ ret = close(data_fd);
+ } while (ret == -1 && errno == EINTR);
+ if (ret == -1) {
+ perror("close");
+ }
+ }
}
Stream::Stream(const StreamProto &serialized)
: stream_id(serialized.stream_id()),
header(serialized.header()),
- data(new char[BACKLOG_SIZE]),
- data_size(serialized.data_size())
+ data_fd(make_tempfile(serialized.data())),
+ backlog_size(serialized.backlog_size()),
+ bytes_received(serialized.bytes_received()),
+ mark_pool(NULL)
{
- assert(serialized.data().size() == BACKLOG_SIZE);
- memcpy(data, serialized.data().data(), BACKLOG_SIZE);
+ if (data_fd == -1) {
+ exit(1);
+ }
}
-StreamProto Stream::serialize() const
+StreamProto Stream::serialize()
{
StreamProto serialized;
serialized.set_header(header);
- serialized.set_data(string(data, data + BACKLOG_SIZE));
- serialized.set_data_size(data_size);
+ if (!read_tempfile(data_fd, serialized.mutable_data())) { // Closes data_fd.
+ exit(1);
+ }
+ serialized.set_backlog_size(backlog_size);
+ serialized.set_bytes_received(bytes_received);
serialized.set_stream_id(stream_id);
+ data_fd = -1;
return serialized;
}
}
}
-void Server::run()
+vector<ClientStats> Server::get_client_stats() const
{
- should_stop = false;
-
- // Joinable is already the default, but it's good to be certain.
- pthread_attr_t attr;
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
- pthread_create(&worker_thread, &attr, Server::do_work_thunk, this);
-}
-
-void Server::stop()
-{
- {
- MutexLock lock(&mutex);
- should_stop = true;
- }
+ vector<ClientStats> ret;
- if (pthread_join(worker_thread, NULL) == -1) {
- perror("pthread_join");
- exit(1);
+ MutexLock lock(&mutex);
+ for (map<int, Client>::const_iterator client_it = clients.begin();
+ client_it != clients.end();
+ ++client_it) {
+ ret.push_back(client_it->second.get_stats());
}
-}
-
-void *Server::do_work_thunk(void *arg)
-{
- Server *server = static_cast<Server *>(arg);
- server->do_work();
- return NULL;
+ return ret;
}
void Server::do_work()
for ( ;; ) {
int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
if (nfds == -1 && errno == EINTR) {
+ if (should_stop) {
+ return;
+ }
continue;
}
if (nfds == -1) {
MutexLock lock(&mutex); // We release the mutex between iterations.
- if (should_stop) {
- return;
- }
-
process_queued_data();
for (int i = 0; i < nfds; ++i) {
process_client(to_process[i]);
}
}
+
+ if (should_stop) {
+ return;
+ }
}
}
}
if (client_ptr->state == Client::SENDING_DATA &&
- client_ptr->bytes_sent == client_ptr->stream->data_size) {
+ client_ptr->bytes_sent == client_ptr->stream->bytes_received) {
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_stream(const string &stream_id, size_t backlog_size)
{
MutexLock lock(&mutex);
- streams.insert(make_pair(stream_id, new Stream(stream_id)));
+ streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size)));
}
void Server::add_stream_from_serialized(const StreamProto &stream)
}
}
}
+
+void Server::set_mark_pool(const std::string &stream_id, MarkPool *mark_pool)
+{
+ MutexLock lock(&mutex);
+ assert(clients.empty());
+ find_stream(stream_id)->mark_pool = mark_pool;
+}
void Server::add_data_deferred(const string &stream_id, const char *data, size_t bytes)
{
queued_data[stream_id].append(string(data, data + bytes));
}
-void Server::add_data(const string &stream_id, const char *data, size_t 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->data_size % BACKLOG_SIZE;
- stream->data_size += bytes;
-
- if (pos + bytes > BACKLOG_SIZE) {
- size_t to_copy = BACKLOG_SIZE - pos;
- memcpy(stream->data + pos, data, to_copy);
- data += to_copy;
- bytes -= to_copy;
+ 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;
}
- memcpy(stream->data + pos, data, bytes);
+ 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();
}
// but we'll start sending immediately as we get data.
// This is postcondition #3.
client->state = Client::SENDING_DATA;
- client->bytes_sent = client->stream->data_size;
+ client->bytes_sent = client->stream->bytes_received;
client->stream->put_client_to_sleep(client);
return;
}
case Client::SENDING_DATA: {
+sending_data_again:
// 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->data_size - client->bytes_sent;
+ size_t bytes_to_send = stream->bytes_received - client->bytes_sent;
if (bytes_to_send == 0) {
return;
}
- if (bytes_to_send > BACKLOG_SIZE) {
+ if (bytes_to_send > stream->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 = stream->data_size - BACKLOG_SIZE;
- bytes_to_send = BACKLOG_SIZE;
+ (long long int)(bytes_to_send - stream->backlog_size));
+ client->bytes_sent = stream->bytes_received - stream->backlog_size;
+ bytes_to_send = stream->backlog_size;
}
// See if we need to split across the circular buffer.
- ssize_t ret;
- if ((client->bytes_sent % 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_len = bytes_first_part;
+ 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);
+ more_data = true;
+ }
- iov[1].iov_base = const_cast<char *>(stream->data);
- iov[1].iov_len = bytes_to_send - bytes_first_part;
+ ssize_t ret;
+ do {
+ loff_t offset = client->bytes_sent % stream->backlog_size;
+ ret = sendfile(client->sock, stream->data_fd, &offset, bytes_to_send);
+ } while (ret == -1 && errno == EINTR);
- do {
- ret = writev(client->sock, iov, 2);
- } while (ret == -1 && errno == EINTR);
- } else {
- do {
- ret = write(client->sock,
- stream->data + (client->bytes_sent % BACKLOG_SIZE),
- bytes_to_send);
- } while (ret == -1 && errno == EINTR);
- }
if (ret == -1 && errno == EAGAIN) {
// We're out of socket space, so return; epoll will wake us up
// when there is more room.
}
if (ret == -1) {
// Error, close; postcondition #1.
- perror("write/writev");
+ perror("sendfile");
close_client(client);
return;
}
client->bytes_sent += ret;
- if (client->bytes_sent == stream->data_size) {
+ if (client->bytes_sent == 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 {
- // XXX: Do we need to go another round here to explicitly
- // get the EAGAIN?
+ } else if (more_data) {
+ goto sending_data_again;
}
break;
}
client->stream_id = request_tokens[1];
client->stream = find_stream(client->stream_id);
+ if (client->stream->mark_pool != NULL) {
+ client->fwmark = client->stream->mark_pool->get_mark();
+ } else {
+ client->fwmark = 0; // No mark.
+ }
+ if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {
+ if (client->fwmark != 0) {
+ perror("setsockopt(SO_MARK)");
+ }
+ }
client->request.clear();
return 200; // OK!
if (client->stream != NULL) {
delete_from(&client->stream->sleeping_clients, client);
delete_from(&client->stream->to_process, client);
+ if (client->stream->mark_pool != NULL) {
+ int fwmark = client->fwmark;
+ client->stream->mark_pool->release_mark(fwmark);
+ }
}
-
+
// Bye-bye!
int ret;
do {
projects / cubemap / blobdiff