#ifndef _SERVER_H
#define _SERVER_H 1
-#include <pthread.h>
#include <stddef.h>
#include <stdint.h>
#include <sys/epoll.h>
#include <time.h>
#include <map>
#include <memory>
+#include <mutex>
#include <queue>
#include <string>
#include <vector>
// 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);
+ CubemapStateProto serialize(std::unordered_map<const std::string *, size_t> *short_response_pool);
+ void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
int add_stream_from_serialized(const StreamProto &stream, int data_fd);
int lookup_stream_by_url(const std::string &url) const;
private:
// Mutex protecting queued_add_clients.
- // 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_clients_mutex;
+ // Note that if you want to hold both this and <mu> below,
+ // you will need to take <mu> before this one.
+ mutable std::mutex queued_clients_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>
+ // - We don't want the input thread(s) hanging on <mu> when doing
+ // add_data(), since they want to do add_data() rather often, and <mu>
// can be taken a lot of the time.
//
// Protected by <queued_clients_mutex>.
std::vector<std::pair<int, Acceptor *>> queued_add_clients;
// All variables below this line are protected by the mutex.
- mutable pthread_mutex_t mutex;
+ mutable std::mutex mu;
// All streams.
std::vector<std::unique_ptr<Stream>> streams;
// Listen for a different set of epoll events.
void change_epoll_events(Client *client, uint32_t events);
+ // If we're supposed to listen for more requests (persistent HTTP connections),
+ // puts the client back into READING_REQUEST, changes its epoll flags and returns
+ // true.
+ bool more_requests(Client *client);
+
// Parse the HTTP request. Returns a HTTP status code (200/204/400/404).
int parse_request(Client *client);