#ifndef _SERVER_H
#define _SERVER_H 1
-#include <stdint.h>
#include <pthread.h>
-#include <string>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/epoll.h>
+#include <sys/types.h>
+#include <time.h>
#include <map>
+#include <string>
+#include <vector>
+
+#include "client.h"
+#include "thread.h"
+
+class ClientProto;
+struct Stream;
-#define NUM_SERVERS 4
-#define BACKLOG_SIZE 1048576
#define EPOLL_MAX_EVENTS 8192
#define EPOLL_TIMEOUT_MS 20
#define MAX_CLIENT_REQUEST 16384
-struct Client {
- // The file descriptor associated with this socket.
- int sock;
-
- enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA };
- State state;
-
- // The HTTP request, as sent by the client. If we are in READING_REQUEST,
- // this might not be finished.
- std::string client_request;
+class CubemapStateProto;
+class MarkPool;
+class StreamProto;
- // What stream we're connecting to; parsed from client_request.
- // Not relevant for READING_REQUEST.
- std::string stream_id;
-
- // The header we want to send. This is nominally a copy of Stream::header,
- // but since that might change on reconnects etc., we keep a local copy here.
- // Only relevant for SENDING_HEADER; blank otherwise.
- std::string header;
+class Server : public Thread {
+public:
+ Server();
+ ~Server();
- // Number of bytes we've sent of the header. Only relevant for SENDING_HEADER.
- size_t header_bytes_sent;
+ // Get the list of all currently connected clients.
+ std::vector<ClientStats> get_client_stats() const;
- // Number of bytes we've sent of data. Only relevant for SENDING_DATA.
- size_t bytes_sent;
-};
+ // Set header (both HTTP header and any stream headers) for the given stream.
+ void set_header(const std::string &stream_id, const std::string &header);
-struct Stream {
- // The HTTP response header, plus the video stream header (if any).
- std::string header;
+ // Set that the given stream should use the given mark pool from now on.
+ // NOTE: This should be set before any clients are connected!
+ void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+
+ // These will be deferred until the next time an iteration in do_work() happens,
+ // and the order between them are undefined.
+ // XXX: header should ideally be ordered with respect to data.
+ void add_client_deferred(int sock);
+ void add_data_deferred(const std::string &stream_id, const char *data, size_t bytes);
+
+ // These should not be called while running, since that would violate
+ // threading assumptions (ie., that epoll is only called from one thread
+ // at the same time).
+ CubemapStateProto serialize();
+ void add_client_from_serialized(const ClientProto &client);
+ void add_stream(const std::string &stream_id, size_t bytes_received);
+ void add_stream_from_serialized(const StreamProto &stream);
+ void set_backlog_size(const std::string &stream_id, size_t new_size);
- // The stream data itself, stored in a circular buffer.
- char data[BACKLOG_SIZE];
+private:
+ // Mutex protecting queued_data only. Note that if you want to hold both this
+ // and <mutex> below, you will need to take <mutex> before this one.
+ mutable pthread_mutex_t queued_data_mutex;
+
+ // Deferred commands that should be run from the do_work() thread as soon as possible.
+ // We defer these for two reasons:
+ //
+ // - We only want to fiddle with epoll from one thread at any given time,
+ // and doing add_client() from the acceptor thread would violate that.
+ // - We don't want the input thread(s) hanging on <mutex> when doing
+ // add_data(), since they want to do add_data() rather often, and <mutex>
+ // can be taken a lot of the time.
+ //
+ // Protected by <queued_data_mutex>.
+ std::vector<int> queued_add_clients;
+ std::map<std::string, std::string> queued_data;
+
+ // All variables below this line are protected by the mutex.
+ mutable pthread_mutex_t mutex;
- // How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
- // since the buffer wraps.
- size_t data_size;
-};
+ // Map from stream ID to stream.
+ std::map<std::string, Stream *> streams;
-class Server {
-public:
- Server();
+ // Map from file descriptor to client.
+ std::map<int, Client> clients;
- // Start a new thread that handles clients.
- void run();
- void add_client(int sock);
- void add_stream(const std::string &stream_id);
- void set_header(const std::string &stream_id, const std::string &header);
- void add_data(const std::string &stream_id, const char *data, size_t bytes);
+ // Used for epoll implementation (obviously).
+ int epoll_fd;
+ epoll_event events[EPOLL_MAX_EVENTS];
-private:
+ // The actual worker thread.
+ virtual void do_work();
+
+ // Process a client; read and write data as far as we can.
+ // After this call, one of these four is true:
+ //
+ // 1. The socket is closed, and the client deleted.
+ // 2. We are still waiting for more data from the client.
+ // 3. We've sent all the data we have to the client,
+ // and put it in <sleeping_clients>.
+ // 4. The socket buffer is full (which means we still have
+ // data outstanding).
+ //
+ // For #2, we listen for EPOLLIN events. For #3 and #4, we listen
+ // for EPOLLOUT in edge-triggered mode; it will never fire for #3,
+ // but it's cheaper than taking it in and out all the time.
void process_client(Client *client);
// Close a given client socket, and clean up after it.
void close_client(Client *client);
- // Parse the HTTP request, construct the header, and set the client into
- // the SENDING_HEADER state.
- void parse_request(Client *client);
-
- pthread_mutex_t mutex;
+ // Parse the HTTP request. Returns a HTTP status code (200/400/404).
+ int parse_request(Client *client);
- // Map from stream ID to stream.
- std::map<std::string, Stream> streams;
+ // Construct the HTTP header, and set the client into
+ // the SENDING_HEADER state.
+ void construct_header(Client *client);
- // Map from file descriptor to client.
- std::map<int, Client> clients;
+ // Construct a generic error with the given line, and set the client into
+ // the SENDING_ERROR state.
+ void construct_error(Client *client, int error_code);
- // Used for epoll implementation (obviously).
- int epoll_fd;
- epoll_event events[EPOLL_MAX_EVENTS];
+ // TODO: This function should probably die.
+ Stream *find_stream(const std::string &stream_id);
- // Recover the this pointer, and call do_work().
- static void *do_work_thunk(void *arg);
+ void process_queued_data();
- // The actual worker thread.
- void do_work();
+ void add_client(int sock);
};
#endif // !defined(_SERVER_H)
projects / cubemap / blobdiff