1
0
mirror of https://github.com/ohwgiles/laminar.git synced 2026-10-25 21:08:56 +00:00

resolves #37: closed connection on large files

The old implementation slurped the whole artefact into memory, and
did not ensure it remained allocated beyond the first call to write().
The new implementation uses mmap and ensures the mapping lasts until
the file has been delivered
This commit is contained in:
Oliver Giles
2018-07-06 13:18:04 +03:00
parent 078e0e9882
commit 758b5f2e46
5 changed files with 55 additions and 18 deletions

View File

@@ -22,6 +22,10 @@
#include "log.h"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <fstream>
#include <zlib.h>
@@ -840,13 +844,37 @@ static bool slurp(fs::path path, std::string& output) {
return false;
}
bool Laminar::getArtefact(std::string path, std::string& result) {
if(archiveUrl != ARCHIVE_URL_DEFAULT) {
// we shouldn't have got here. Probably an invalid link.
return false;
class MappedFileImpl : public MappedFile {
public:
MappedFileImpl(const char* path) :
fd(open(path, O_RDONLY)),
sz(0),
ptr(nullptr)
{
if(fd == -1) return;
struct stat st;
if(fstat(fd, &st) != 0) return;
sz = st.st_size;
ptr = mmap(nullptr, sz, PROT_READ, MAP_SHARED, fd, 0);
if(ptr == MAP_FAILED)
ptr = nullptr;
}
fs::path file(fs::path(homeDir)/"archive"/path);
return slurp(file, result);
~MappedFileImpl() override {
if(ptr)
munmap(ptr, sz);
if(fd != -1)
close(fd);
}
virtual const void* address() override { return ptr; }
virtual size_t size() override { return sz; }
private:
int fd;
size_t sz;
void* ptr;
};
kj::Own<MappedFile> Laminar::getArtefact(std::string path) {
return kj::heap<MappedFileImpl>(fs::path(fs::path(homeDir)/"archive"/path).c_str());
}
std::string Laminar::getCustomCss()