Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 11:41:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

HLS: 修复hls直播ts/m3u8文件更新导致mmap失效，触发bus error的bug

Browse Source
This commit is contained in:
ziyue
2021-12-22 15:42:03 +08:00
parent fe575af0d8
commit 2e9ff3ed3c
6 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Http/HttpBody.cpp
View File

@@ -45,54 +45,55 @@ Buffer::Ptr HttpStringBody::readData(size_t size) {
//////////////////////////////////////////////////////////////////
HttpFileBody::HttpFileBody(const string &filePath){
HttpFileBody::HttpFileBody(const string &filePath, bool use_mmap) {
std::shared_ptr<FILE> fp(fopen(filePath.data(), "rb"), [](FILE *fp) {
if (fp) {
fclose(fp);
}
});
if (!fp) {
init(fp, 0, 0);
init(fp, 0, 0, use_mmap);
} else {
init(fp, 0, File::fileSize(fp.get()));
init(fp, 0, File::fileSize(fp.get()), use_mmap);
}
}
HttpFileBody::HttpFileBody(const std::shared_ptr<FILE> &fp, size_t offset, size_t max_size) {
init(fp,offset,max_size);
HttpFileBody::HttpFileBody(const std::shared_ptr<FILE> &fp, size_t offset, size_t max_size, bool use_mmap) {
init(fp, offset, max_size, use_mmap);
}
void HttpFileBody::init(const std::shared_ptr<FILE> &fp, size_t offset, size_t max_size) {
void HttpFileBody::init(const std::shared_ptr<FILE> &fp, size_t offset, size_t max_size, bool use_mmap) {
_fp = fp;
_max_size = max_size;
#ifdef ENABLE_MMAP
do {
if(!_fp){
//文件不存在
break;
}
int fd = fileno(fp.get());
if (fd < 0) {
WarnL << "fileno failed:" << get_uv_errmsg(false);
break;
}
auto ptr = (char *) mmap(NULL, max_size, PROT_READ, MAP_SHARED, fd, offset);
if (ptr == MAP_FAILED) {
WarnL << "mmap failed:" << get_uv_errmsg(false);
break;
}
_map_addr.reset(ptr,[max_size,fp](char *ptr){
munmap(ptr,max_size);
});
} while (false);
if (use_mmap) {
do {
if (!_fp) {
//文件不存在
break;
}
int fd = fileno(fp.get());
if (fd < 0) {
WarnL << "fileno failed:" << get_uv_errmsg(false);
break;
}
auto ptr = (char *) mmap(NULL, max_size, PROT_READ, MAP_SHARED, fd, offset);
if (ptr == MAP_FAILED) {
WarnL << "mmap failed:" << get_uv_errmsg(false);
break;
}
_map_addr.reset(ptr, [max_size, fp](char *ptr) {
munmap(ptr, max_size);
});
} while (false);
}
#endif
if(!_map_addr && offset && fp.get()){
if (!_map_addr && offset && fp.get()) {
//未映射,那么fseek设置偏移量
fseek64(fp.get(), offset, SEEK_SET);
}
}
class BufferMmap : public Buffer{
public:
typedef std::shared_ptr<BufferMmap> Ptr;