amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复获取共享mmap大小bug

Browse Source
This commit is contained in:
ziyue 2022-02-11 13:40:41 +08:00
parent 8188aa0d53
commit 984715a018
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Http/HttpBody.cpp
View File

@ -9,6 +9,7 @@
*/ */
#include <csignal> #include <csignal>
#include <tuple>
#ifndef _WIN32 #ifndef _WIN32
#include <sys/mman.h> #include <sys/mman.h>
@ -60,13 +61,13 @@ Buffer::Ptr HttpStringBody::readData(size_t size) {
#ifdef ENABLE_MMAP #ifdef ENABLE_MMAP
static mutex s_mtx; static mutex s_mtx;
static unordered_map<string /*file_path*/, std::pair<char */*ptr*/, weak_ptr<char> /*mmap*/ > > s_shared_mmap; static unordered_map<string /*file_path*/, std::tuple<char */*ptr*/, int64_t /*size*/, weak_ptr<char> /*mmap*/ > > s_shared_mmap;
//删除mmap记录 //删除mmap记录
static void delSharedMmap(const string &file_path, char *ptr) { static void delSharedMmap(const string &file_path, char *ptr) {
lock_guard<mutex> lck(s_mtx); lock_guard<mutex> lck(s_mtx);
auto it = s_shared_mmap.find(file_path); auto it = s_shared_mmap.find(file_path);
if (it != s_shared_mmap.end() && it->second.first == ptr) { if (it != s_shared_mmap.end() && std::get<0>(it->second) == ptr) {
s_shared_mmap.erase(it); s_shared_mmap.erase(it);
} }
} }
@ -76,9 +77,10 @@ static std::shared_ptr<char> getSharedMmap(const string &file_path, int64_t &fil
lock_guard<mutex> lck(s_mtx); lock_guard<mutex> lck(s_mtx);
auto it = s_shared_mmap.find(file_path); auto it = s_shared_mmap.find(file_path);
if (it != s_shared_mmap.end()) { if (it != s_shared_mmap.end()) {
auto ret = it->second.second.lock(); auto ret = std::get<2>(it->second).lock();
if (ret) { if (ret) {
//命中mmap缓存 //命中mmap缓存
file_size = std::get<1>(it->second);
return ret; return ret;
} }
} }
@ -123,7 +125,7 @@ static std::shared_ptr<char> getSharedMmap(const string &file_path, int64_t &fil
} }
{ {
lock_guard<mutex> lck(s_mtx); lock_guard<mutex> lck(s_mtx);
s_shared_mmap[file_path] = std::make_pair(ret.get(), ret); s_shared_mmap[file_path] = std::make_tuple(ret.get(), file_size, ret);
} }
return ret; return ret;
} }
@ -135,7 +137,7 @@ HttpFileBody::HttpFileBody(const string &file_path, bool use_mmap) {
_map_addr = getSharedMmap(file_path, _read_to); _map_addr = getSharedMmap(file_path, _read_to);
} }
#endif #endif
if (!_map_addr) { if (!_map_addr && _read_to != -1) {
_fp.reset(fopen(file_path.data(), "rb"), [](FILE *fp) { _fp.reset(fopen(file_path.data(), "rb"), [](FILE *fp) {
if (fp) { if (fp) {
fclose(fp); fclose(fp);