youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove S3FS_MALLOC_TRIM (#2699)

Browse Source 
42b74c9d2e introduced this flag but it
is not clear that this behavior is required with recent libxml2
version.
This commit is contained in:
Andrew Gaul
2025-08-01 10:47:58 +09:00
committed by GitHub
parent c78517d410
commit 50bb76f968
4 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/addhead.cpp
View File

@ -201,7 +201,6 @@ struct curl_slist* AdditionalHeader::AddHeader(struct curl_slist* list, const ch
list = curl_slist_sort_insert(list, iter->first.c_str(), iter->second.c_str());
}
meta.clear();
S3FS_MALLOCTRIM(0);
return list;
}

2
src/curl.cpp
View File

@ -1583,8 +1583,6 @@ bool S3fsCurl::ClearInternalData()
fpLazySetup = nullptr;
S3FS_MALLOCTRIM(0);
return true;
}

36
src/s3fs.cpp
View File

@ -918,7 +918,6 @@ static int s3fs_getattr(const char* _path, struct stat* stbuf)
S3FS_PRN_DBG("[path=%s] uid=%u, gid=%u, mode=%04o", path, (unsigned int)(stbuf->st_uid), (unsigned int)(stbuf->st_gid), stbuf->st_mode);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1025,8 +1024,6 @@ static int s3fs_readlink(const char* _path, char* buf, size_t size)
strncpy(buf, strValue.c_str(), size - 1);
buf[size - 1] = '\0';
S3FS_MALLOCTRIM(0);
return 0;
}
@ -1078,8 +1075,6 @@ static int s3fs_mknod(const char *_path, mode_t mode, dev_t rdev)
S3FS_PRN_ERR("succeed to mknod the file(%s), but could not update timestamp of its parent directory(result=%d).", path, update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1156,8 +1151,6 @@ static int s3fs_create(const char* _path, mode_t mode, struct fuse_file_info* fi
ent->MarkDirtyNewFile();
fi->fh = autoent.Detach(); // KEEP fdentity open;
S3FS_MALLOCTRIM(0);
return 0;
}
@ -1239,8 +1232,6 @@ static int s3fs_mkdir(const char* _path, mode_t mode)
S3FS_PRN_ERR("succeed to create the directory(%s), but could not update timestamp of its parent directory(result=%d).", path, update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1270,8 +1261,6 @@ static int s3fs_unlink(const char* _path)
S3FS_PRN_ERR("succeed to remove the file(%s), but could not update timestamp of its parent directory(result=%d).", strPath.c_str(), update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1373,8 +1362,6 @@ static int s3fs_rmdir(const char* _path)
S3FS_PRN_ERR("succeed to remove the directory(%s), but could not update timestamp of its parent directory(result=%d).", path, update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1462,8 +1449,6 @@ static int s3fs_symlink(const char* _from, const char* _to)
S3FS_PRN_ERR("succeed to create symbolic link(%s), but could not update timestamp of its parent directory(result=%d).", strTo.c_str(), update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -1905,8 +1890,6 @@ static int s3fs_rename(const char* _from, const char* _to)
S3FS_PRN_ERR("succeed to create the file/directory(%s), but could not update timestamp of its parent directory(result=%d).", to, update_result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -2047,7 +2030,6 @@ static int s3fs_chmod(const char* _path, mode_t mode)
StatCache::getStatCacheData()->DelStat(normpath);
}
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -2142,7 +2124,6 @@ static int s3fs_chmod_nocopy(const char* _path, mode_t mode)
// [TODO][TBD] Plan to overwrite the temporary stat(no meta header) as a cache.
StatCache::getStatCacheData()->DelStat(normpath);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -2282,7 +2263,6 @@ static int s3fs_chown(const char* _path, uid_t uid, gid_t gid)
StatCache::getStatCacheData()->DelStat(normpath);
}
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -2384,7 +2364,6 @@ static int s3fs_chown_nocopy(const char* _path, uid_t uid, gid_t gid)
// [TODO][TBD] Plan to overwrite the temporary stat(no meta header) as a cache.
StatCache::getStatCacheData()->DelStat(normpath);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -2499,7 +2478,6 @@ static int update_mctime_parent_directory(const char* _path)
// [TODO][TBD] Plan to overwrite the temporary stat(no meta header) as a cache.
StatCache::getStatCacheData()->DelStat(normpath);
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -2662,7 +2640,6 @@ static int s3fs_utimens(const char* _path, const struct timespec ts[2])
}
}
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -2771,7 +2748,6 @@ static int s3fs_utimens_nocopy(const char* _path, const struct timespec ts[2])
// [TODO][TBD] Plan to overwrite the temporary stat(no meta header) as a cache.
StatCache::getStatCacheData()->DelStat(normpath);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -2877,7 +2853,6 @@ static int s3fs_truncate(const char* _path, off_t size)
// [TODO][TBD] Plan to overwrite the temporary stat(no meta header) as a cache.
StatCache::getStatCacheData()->DelStat(path);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -2982,8 +2957,6 @@ static int s3fs_open(const char* _path, struct fuse_file_info* fi)
}
fi->fh = autoent.Detach(); // KEEP fdentity open;
S3FS_MALLOCTRIM(0);
return 0;
}
@ -3135,7 +3108,6 @@ static int s3fs_flush(const char* _path, struct fuse_file_info* fi)
}
}
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -3185,7 +3157,6 @@ static int s3fs_fsync(const char* _path, int datasync, struct fuse_file_info* fi
}
}
}
S3FS_MALLOCTRIM(0);
// Issue 320: Delete stat cache entry because st_size may have changed.
StatCache::getStatCacheData()->DelStat(path);
@ -3263,7 +3234,6 @@ static int s3fs_release(const char* _path, struct fuse_file_info* fi)
S3FS_PRN_DBG("file(%s) is still opened(another pseudo fd is opened).", path);
}
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -3279,7 +3249,6 @@ static int s3fs_opendir(const char* _path, struct fuse_file_info* fi)
if(0 == (result = check_object_access(path, mask, nullptr))){
result = check_parent_object_access(path, X_OK);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -3439,7 +3408,6 @@ static int s3fs_readdir(const char* _path, void* buf, fuse_fill_dir_t filler, of
if(0 != (result = readdir_multi_head(strpath, head, buf, filler))){
S3FS_PRN_ERR("readdir_multi_head returns error(%d).", result);
}
S3FS_MALLOCTRIM(0);
return result;
}
@ -3551,7 +3519,6 @@ static int list_bucket(const char* path, S3ObjList& head, const char* delimiter,
break;
}
}
S3FS_MALLOCTRIM(0);
return 0;
}
@ -4396,7 +4363,6 @@ static int s3fs_access(const char* path, int mask)
(mask == F_OK) ? "F_OK" : "");
int result = check_object_access(path, mask, nullptr);
S3FS_MALLOCTRIM(0);
return result;
}
@ -4624,7 +4590,6 @@ static int s3fs_check_service()
return EXIT_FAILURE;
}
}
S3FS_MALLOCTRIM(0);
return EXIT_SUCCESS;
}
@ -5961,7 +5926,6 @@ int main(int argc, char* argv[])
// cleanup xml2
xmlCleanupParser();
S3FS_MALLOCTRIM(0);
exit(fuse_res);
}

26
src/s3fs.h
View File

@ -33,32 +33,6 @@
} \
}while(0)
// [NOTE]
// s3fs use many small allocated chunk in heap area for stats
// cache and parsing xml, etc. The OS may decide that giving
// this little memory back to the kernel will cause too much
// overhead and delay the operation.
// Address of gratitude, this workaround quotes a document of
// libxml2.( http://xmlsoft.org/xmlmem.html )
//
// When valgrind is used to test memory leak of s3fs, a large
// amount of chunk may be reported. You can check the memory
// release accurately by defining the S3FS_MALLOC_TRIM flag
// and building it. Also, when executing s3fs, you can define
// the MMAP_THRESHOLD environment variable and check more
// accurate memory leak.( see, man 3 free )
//
#ifdef S3FS_MALLOC_TRIM
#ifdef HAVE_MALLOC_TRIM
#include <malloc.h>
#define S3FS_MALLOCTRIM(pad) malloc_trim(pad)
#else // HAVE_MALLOC_TRIM
#define S3FS_MALLOCTRIM(pad)
#endif // HAVE_MALLOC_TRIM
#else // S3FS_MALLOC_TRIM
#define S3FS_MALLOCTRIM(pad)
#endif // S3FS_MALLOC_TRIM
#endif // S3FS_S3FS_H_
/*