]> git.sesse.net Git - cubemap/blobdiff - server.cpp
Move Server:add_data() into Stream, where it more logically belongs.
[cubemap] / server.cpp
index 0c36e49363178f1ccd0a4955ef119a5ea6ebe9bd..266d41809765075caaa750be0fd06809d707481d 100644 (file)
-#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 <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 "util.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, size_t backlog_size)
-       : stream_id(stream_id),
-         data_fd(make_tempfile("")),
-          backlog_size(backlog_size),
-         bytes_received(0),
-         mark_pool(NULL)
-{
-       if (data_fd == -1) {
-               exit(1);
-       }
-}
-
-Stream::~Stream()
-{
-       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_fd(make_tempfile(serialized.data())),
-         backlog_size(serialized.backlog_size()),
-         bytes_received(serialized.bytes_received()),
-         mark_pool(NULL)
-{
-       if (data_fd == -1) {
-               exit(1);
-       }
-}
-
-StreamProto Stream::serialize()
-{
-       StreamProto serialized;
-       serialized.set_header(header);
-       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 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);
@@ -374,50 +225,6 @@ void Server::add_data_deferred(const string &stream_id, const char *data, size_t
        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)
 {
@@ -718,7 +525,8 @@ void Server::process_queued_data()
        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();
 }