octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 09:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1095 from gaul/intmax_t

Browse Source 
Avoid narrowing time_t and off_t args in logging
This commit is contained in:
Takeshi Nakatani 2019-07-15 11:33:44 +09:00 committed by GitHub
commit 20ea96328c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cache.cpp
View File

@ -268,12 +268,12 @@ bool StatCache::GetStat(const string& key, struct stat* pst, headers_t* meta, bo
} }
if(is_delete_cache){ if(is_delete_cache){
// not hit by different ETag // not hit by different ETag
S3FS_PRN_DBG("stat cache not hit by ETag[path=%s][time=%jd.%09ld][hit count=%lu][ETag(%s)!=(%s)]", S3FS_PRN_DBG("stat cache not hit by ETag[path=%s][time=%lld.%09ld][hit count=%lu][ETag(%s)!=(%s)]",
strpath.c_str(), (intmax_t)(ent->cache_date.tv_sec), ent->cache_date.tv_nsec, ent->hit_count, petag ? petag : "null", stretag.c_str()); strpath.c_str(), static_cast<long long>(ent->cache_date.tv_sec), ent->cache_date.tv_nsec, ent->hit_count, petag ? petag : "null", stretag.c_str());
}else{ }else{
// hit // hit
S3FS_PRN_DBG("stat cache hit [path=%s][time=%jd.%09ld][hit count=%lu]", S3FS_PRN_DBG("stat cache hit [path=%s][time=%lld.%09ld][hit count=%lu]",
strpath.c_str(), (intmax_t)(ent->cache_date.tv_sec), ent->cache_date.tv_nsec, ent->hit_count); strpath.c_str(), static_cast<long long>(ent->cache_date.tv_sec), ent->cache_date.tv_nsec, ent->hit_count);
if(pst!= NULL){ if(pst!= NULL){
*pst= ent->stbuf; *pst= ent->stbuf;

8
src/curl.cpp
View File

@ -593,8 +593,8 @@ int S3fsCurl::CurlProgress(void *clientp, double dltotal, double dlnow, double u
}else{ }else{
// timeout? // timeout?
if(now - S3fsCurl::curl_times[curl] > readwrite_timeout){ if(now - S3fsCurl::curl_times[curl] > readwrite_timeout){
S3FS_PRN_ERR("timeout now: %jd, curl_times[curl]: %jd, readwrite_timeout: %jd", S3FS_PRN_ERR("timeout now: %lld, curl_times[curl]: %lld, readwrite_timeout: %lld",
(intmax_t)now, (intmax_t)(S3fsCurl::curl_times[curl]), (intmax_t)readwrite_timeout); static_cast<long long>(now), static_cast<long long>((S3fsCurl::curl_times[curl])), static_cast<long long>(readwrite_timeout));
return CURLE_ABORTED_BY_CALLBACK; return CURLE_ABORTED_BY_CALLBACK;
} }
} }
@ -3141,7 +3141,7 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
int S3fsCurl::PreGetObjectRequest(const char* tpath, int fd, off_t start, ssize_t size, sse_type_t ssetype, string& ssevalue) int S3fsCurl::PreGetObjectRequest(const char* tpath, int fd, off_t start, ssize_t size, sse_type_t ssetype, string& ssevalue)
{ {
S3FS_PRN_INFO3("[tpath=%s][start=%lld][size=%jd]", SAFESTRPTR(tpath), static_cast<long long int>(start), (intmax_t)size); S3FS_PRN_INFO3("[tpath=%s][start=%lld][size=%lld]", SAFESTRPTR(tpath), static_cast<long long>(start), static_cast<long long>(size));
if(!tpath || -1 == fd || 0 > start || 0 > size){ if(!tpath || -1 == fd || 0 > start || 0 > size){
return -1; return -1;
@ -3194,7 +3194,7 @@ int S3fsCurl::GetObjectRequest(const char* tpath, int fd, off_t start, ssize_t s
{ {
int result; int result;
S3FS_PRN_INFO3("[tpath=%s][start=%lld][size=%jd]", SAFESTRPTR(tpath), static_cast<long long int>(start), (intmax_t)size); S3FS_PRN_INFO3("[tpath=%s][start=%lld][size=%lld]", SAFESTRPTR(tpath), static_cast<long long>(start), static_cast<long long>(size));
if(!tpath){ if(!tpath){
return -1; return -1;

8
src/fdcache.cpp
View File

@ -799,14 +799,14 @@ int FdEntity::Open(headers_t* pmeta, off_t size, time_t time, bool no_fd_lock_wa
{ {
AutoLock auto_lock(&fdent_lock, no_fd_lock_wait ? AutoLock::NO_WAIT : AutoLock::NONE); AutoLock auto_lock(&fdent_lock, no_fd_lock_wait ? AutoLock::NO_WAIT : AutoLock::NONE);
S3FS_PRN_DBG("[path=%s][fd=%d][size=%lld][time=%jd]", path.c_str(), fd, static_cast<long long int>(size), (intmax_t)time); S3FS_PRN_DBG("[path=%s][fd=%d][size=%lld][time=%lld]", path.c_str(), fd, static_cast<long long>(size), static_cast<long long>(time));
if (!auto_lock.isLockAcquired()) { if (!auto_lock.isLockAcquired()) {
// had to wait for fd lock, return // had to wait for fd lock, return
return -EIO; return -EIO;
} }
S3FS_PRN_DBG("[path=%s][fd=%d][size=%lld][time=%jd]", path.c_str(), fd, static_cast<long long int>(size), (intmax_t)time); S3FS_PRN_DBG("[path=%s][fd=%d][size=%lld][time=%lld]", path.c_str(), fd, static_cast<long long>(size), static_cast<long long>(time));
AutoLock auto_data_lock(&fdent_data_lock); AutoLock auto_data_lock(&fdent_data_lock);
if(-1 != fd){ if(-1 != fd){
@ -1058,7 +1058,7 @@ int FdEntity::SetMtime(time_t time, bool lock_already_held)
{ {
AutoLock auto_lock(&fdent_lock, lock_already_held ? AutoLock::ALREADY_LOCKED : AutoLock::NONE); AutoLock auto_lock(&fdent_lock, lock_already_held ? AutoLock::ALREADY_LOCKED : AutoLock::NONE);
S3FS_PRN_INFO3("[path=%s][fd=%d][time=%jd]", path.c_str(), fd, (intmax_t)time); S3FS_PRN_INFO3("[path=%s][fd=%d][time=%lld]", path.c_str(), fd, static_cast<long long>(time));
if(-1 == time){ if(-1 == time){
return 0; return 0;
@ -2118,7 +2118,7 @@ FdEntity* FdManager::GetFdEntity(const char* path, int existfd)
FdEntity* FdManager::Open(const char* path, headers_t* pmeta, off_t size, time_t time, bool force_tmpfile, bool is_create, bool no_fd_lock_wait) FdEntity* FdManager::Open(const char* path, headers_t* pmeta, off_t size, time_t time, bool force_tmpfile, bool is_create, bool no_fd_lock_wait)
{ {
S3FS_PRN_DBG("[path=%s][size=%lld][time=%jd]", SAFESTRPTR(path), static_cast<long long int>(size), (intmax_t)time); S3FS_PRN_DBG("[path=%s][size=%lld][time=%lld]", SAFESTRPTR(path), static_cast<long long>(size), static_cast<long long>(time));
if(!path || '\0' == path[0]){ if(!path || '\0' == path[0]){
return NULL; return NULL;

10
src/s3fs.cpp
View File

@ -1081,7 +1081,7 @@ static int s3fs_create(const char* _path, mode_t mode, struct fuse_file_info* fi
static int create_directory_object(const char* path, mode_t mode, time_t time, uid_t uid, gid_t gid) static int create_directory_object(const char* path, mode_t mode, time_t time, uid_t uid, gid_t gid)
{ {
S3FS_PRN_INFO1("[path=%s][mode=%04o][time=%jd][uid=%u][gid=%u]", path, mode, (intmax_t)time, (unsigned int)uid, (unsigned int)gid); S3FS_PRN_INFO1("[path=%s][mode=%04o][time=%lld][uid=%u][gid=%u]", path, mode, static_cast<long long>(time), (unsigned int)uid, (unsigned int)gid);
if(!path || '\0' == path[0]){ if(!path || '\0' == path[0]){
return -1; return -1;
@ -1929,7 +1929,7 @@ static int s3fs_utimens(const char* _path, const struct timespec ts[2])
struct stat stbuf; struct stat stbuf;
dirtype nDirType = DIRTYPE_UNKNOWN; dirtype nDirType = DIRTYPE_UNKNOWN;
S3FS_PRN_INFO("[path=%s][mtime=%jd]", path, (intmax_t)(ts[1].tv_sec)); S3FS_PRN_INFO("[path=%s][mtime=%lld]", path, static_cast<long long>(ts[1].tv_sec));
if(0 == strcmp(path, "/")){ if(0 == strcmp(path, "/")){
S3FS_PRN_ERR("Could not change mtime for mount point."); S3FS_PRN_ERR("Could not change mtime for mount point.");
@ -1994,7 +1994,7 @@ static int s3fs_utimens_nocopy(const char* _path, const struct timespec ts[2])
struct stat stbuf; struct stat stbuf;
dirtype nDirType = DIRTYPE_UNKNOWN; dirtype nDirType = DIRTYPE_UNKNOWN;
S3FS_PRN_INFO1("[path=%s][mtime=%s]", path, str(ts[1].tv_sec).c_str()); S3FS_PRN_INFO1("[path=%s][mtime=%lld]", path, static_cast<long long>(ts[1].tv_sec));
if(0 == strcmp(path, "/")){ if(0 == strcmp(path, "/")){
S3FS_PRN_ERR("Could not change mtime for mount point."); S3FS_PRN_ERR("Could not change mtime for mount point.");
@ -2074,7 +2074,7 @@ static int s3fs_truncate(const char* _path, off_t size)
headers_t meta; headers_t meta;
FdEntity* ent = NULL; FdEntity* ent = NULL;
S3FS_PRN_INFO("[path=%s][size=%jd]", path, (intmax_t)size); S3FS_PRN_INFO("[path=%s][size=%lld]", path, static_cast<long long>(size));
if(size < 0){ if(size < 0){
size = 0; size = 0;
@ -2207,7 +2207,7 @@ static int s3fs_read(const char* _path, char* buf, size_t size, off_t offset, st
WTF8_ENCODE(path) WTF8_ENCODE(path)
ssize_t res; ssize_t res;
S3FS_PRN_DBG("[path=%s][size=%zu][offset=%jd][fd=%llu]", path, size, (intmax_t)offset, (unsigned long long)(fi->fh)); S3FS_PRN_DBG("[path=%s][size=%zu][offset=%lld][fd=%llu]", path, size, static_cast<long long>(offset), (unsigned long long)(fi->fh));
FdEntity* ent; FdEntity* ent;
if(NULL == (ent = FdManager::get()->ExistOpen(path, static_cast<int>(fi->fh)))){ if(NULL == (ent = FdManager::get()->ExistOpen(path, static_cast<int>(fi->fh)))){