-#include <stdio.h>
-#include <string.h>
-#include <stdint.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 <sys/socket.h>
+#include <sys/types.h>
#include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <unistd.h>
#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
#include "markpool.h"
-#include "metacube.h"
-#include "server.h"
#include "mutexlock.h"
#include "parse.h"
+#include "server.h"
#include "state.pb.h"
+#include "stream.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()),
- stream(stream),
- header_or_error(serialized.header_or_error()),
- 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_header_or_error(header_or_error);
- serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
- 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_id(stream_id),
- data(new char[BACKLOG_SIZE]),
- data_size(0),
- mark_pool(NULL)
-{
- memset(data, 0, BACKLOG_SIZE);
-}
-
-Stream::~Stream()
-{
- delete[] data;
-}
-
-Stream::Stream(const StreamProto &serialized)
- : stream_id(serialized.stream_id()),
- header(serialized.header()),
- data(new char[BACKLOG_SIZE]),
- data_size(serialized.data_size()),
- mark_pool(NULL)
-{
- assert(serialized.data().size() == BACKLOG_SIZE);
- memcpy(data, serialized.data().data(), BACKLOG_SIZE);
-}
-
-StreamProto Stream::serialize() const
-{
- StreamProto serialized;
- serialized.set_header(header);
- serialized.set_data(string(data, data + BACKLOG_SIZE));
- serialized.set_data_size(data_size);
- serialized.set_stream_id(stream_id);
- 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);
}
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)
queued_data[stream_id].append(string(data, data + bytes));
}
-void Server::add_data(const string &stream_id, const char *data, size_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;
- pos = 0;
- }
-
- memcpy(stream->data + pos, data, bytes);
- 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->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;
}
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());
}
queued_data.clear();
}