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

Merge pull request #245 from andrewgaul/map-duplicate-lookups

Browse Source 
Elide duplicate lookups of std::map via iterators
This commit is contained in:
Takeshi Nakatani 2015-08-20 01:22:06 +09:00
commit a3e820e733
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/curl.cpp
View File

@ -3484,8 +3484,9 @@ int S3fsMultiCurl::MultiRead(void)
return -EIO;
}
hCurl = msg->easy_handle;
if(cMap_req.end() != cMap_req.find(hCurl)){
s3fscurl = cMap_req[hCurl];
s3fscurlmap_t::iterator iter;
if(cMap_req.end() != (iter = cMap_req.find(hCurl))){
s3fscurl = iter->second;
}else{
s3fscurl = NULL;
}
@ -3703,12 +3704,13 @@ bool AdditionalHeader::Load(const char* file)
charcntlist.push_back(keylen);
}
// set addheader
if(addheader.end() == addheader.find(key)){
addheader_t::iterator aiter;
if(addheader.end() == (aiter = addheader.find(key))){
headerpair_t hpair;
hpair[head] = value;
addheader[key] = hpair;
}else{
(addheader[key])[head] = value;
aiter->second[head] = value;
}
// set flag
if(!is_enable){
@ -3742,10 +3744,11 @@ bool AdditionalHeader::AddHeader(headers_t& meta, const char* path) const
}
// make target suffix(same character count) & find
string suffix(&path[nPathLen - (*iter)]);
if(addheader.end() == addheader.find(suffix)){
addheader_t::const_iterator aiter;
if(addheader.end() == (aiter = addheader.find(suffix))){
continue;
}
for(headerpair_t::const_iterator piter = addheader.at(suffix).begin(); piter != addheader.at(suffix).end(); ++piter){
for(headerpair_t::const_iterator piter = aiter->second.begin(); piter != aiter->second.end(); ++piter){
// Adding header
meta[(*piter).first] = (*piter).second;
}

17
src/s3fs.cpp
View File

@ -2840,7 +2840,8 @@ static int set_xattrs_to_header(headers_t& meta, const char* name, const char* v
string strxattrs;
xattrs_t xattrs;
if(meta.end() == meta.find("x-amz-meta-xattr")){
headers_t::iterator iter;
if(meta.end() == (iter = meta.find("x-amz-meta-xattr"))){
if(XATTR_REPLACE == (flags & XATTR_REPLACE)){
// there is no xattr header but flags is replace, so failure.
return -ENOATTR;
@ -2850,16 +2851,17 @@ static int set_xattrs_to_header(headers_t& meta, const char* name, const char* v
// found xattr header but flags is only creating, so failure.
return -EEXIST;
}
strxattrs = meta["x-amz-meta-xattr"];
strxattrs = iter->second;
}
// get map as xattrs_t
parse_xattrs(strxattrs, xattrs);
// add name(do not care overwrite and empty name/value)
if(xattrs.end() != xattrs.find(string(name))){
xattrs_t::iterator xiter;
if(xattrs.end() != (xiter = xattrs.find(string(name)))){
// found same head. free value.
delete xattrs[string(name)];
delete xiter->second;
}
PXATTRVAL pval = new XATTRVAL;
@ -3072,11 +3074,12 @@ static int s3fs_listxattr(const char* path, char* list, size_t size)
}
// get xattrs
if(meta.end() == meta.find("x-amz-meta-xattr")){
headers_t::iterator iter;
if(meta.end() == (iter = meta.find("x-amz-meta-xattr"))){
// object does not have xattrs
return 0;
}
string strxattrs = meta["x-amz-meta-xattr"];
string strxattrs = iter->second;
parse_xattrs(strxattrs, xattrs);
@ -3177,7 +3180,7 @@ static int s3fs_removexattr(const char* path, const char* name)
if(xiter->second){
delete xiter->second;
}
xattrs.erase(strname);
xattrs.erase(xiter);
// build new xattr
if(!xattrs.empty()){