xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce allocation count in file.cc

Browse Source
This commit is contained in:
Maxime Coste 2015-09-11 13:49:08 +01:00
parent afbe2f10d5
commit 2334a57970
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/file.cc
View File

@ -313,8 +313,9 @@ template<typename Filter>
Vector<String> list_files(StringView prefix, StringView dirname, Vector<String> list_files(StringView prefix, StringView dirname,
Filter filter) Filter filter)
{ {
kak_assert(dirname.empty() or dirname.back() == '/'); char buffer[PATH_MAX+1];
DIR* dir = opendir(dirname.empty() ? "./" : dirname.zstr()); format_to(buffer, "{}", dirname);
DIR* dir = opendir(dirname.empty() ? "./" : buffer);
if (not dir) if (not dir)
return {}; return {};
@ -327,24 +328,28 @@ Vector<String> list_files(StringView prefix, StringView dirname,
if (not filter(*entry)) if (not filter(*entry))
continue; continue;
String filename = entry->d_name; StringView filename = entry->d_name;
if (filename.empty()) if (filename.empty())
continue; continue;
const bool match_prefix = prefix_match(filename, prefix); const bool match_prefix = prefix_match(filename, prefix);
const bool match_subseq = subsequence_match(filename, prefix); const bool match_subseq = subsequence_match(filename, prefix);
struct stat st; struct stat st;
if ((match_prefix or match_subseq) and if (match_prefix or match_subseq)
stat((dirname + filename).c_str(), &st) == 0)
{ {
auto fmt_str = (dirname.empty() or dirname.back() == '/') ? "{}{}" : "{}/{}";
format_to(buffer, fmt_str, dirname, filename);
if (stat(buffer, &st) != 0)
continue;
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
filename += '/'; filename = format_to(buffer, "{}/", filename);
if (prefix.length() != 0 or filename[0_byte] != '.') if (prefix.length() != 0 or filename[0_byte] != '.')
{ {
if (match_prefix) if (match_prefix)
result.push_back(filename); result.push_back(filename.str());
if (match_subseq) if (match_subseq)
subseq_result.push_back(filename); subseq_result.push_back(filename.str());
} }
} }
} }
@ -387,10 +392,12 @@ Vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
if (not dirname.empty()) if (not dirname.empty())
{ {
char buffer[PATH_MAX+1];
auto filter = [&](const dirent& entry) auto filter = [&](const dirent& entry)
{ {
struct stat st; struct stat st;
if (stat((dirname.str() + entry.d_name).c_str(), &st)) format_to(buffer, "{}{}", dirname, entry.d_name);
if (stat(buffer, &st) != 0)
return false; return false;
bool executable = (st.st_mode & S_IXUSR) bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP) | (st.st_mode & S_IXGRP)
@ -416,12 +423,10 @@ Vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
Vector<String> res; Vector<String> res;
for (auto dir : split(getenv("PATH"), ':')) for (auto dir : split(getenv("PATH"), ':'))
{ {
String dirname = dir.str(); auto dirname = ((not dir.empty() and dir.back() == '/') ? dir.substr(0, dir.length()-1) : dir).str();
if (not dirname.empty() and dirname.back() != '/')
dirname += '/';
struct stat st; struct stat st;
if (stat(dirname.substr(0_byte, dirname.length() - 1).zstr(), &st)) if (stat(dirname.c_str(), &st))
continue; continue;
auto& cache = command_cache[dirname]; auto& cache = command_cache[dirname];
@ -429,7 +434,9 @@ Vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
{ {
auto filter = [&](const dirent& entry) { auto filter = [&](const dirent& entry) {
struct stat st; struct stat st;
if (stat((dirname + entry.d_name).c_str(), &st)) char buffer[PATH_MAX+1];
format_to(buffer, "{}/{}", dirname, entry.d_name);
if (stat(buffer, &st))
return false; return false;
bool executable = (st.st_mode & S_IXUSR) bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP) | (st.st_mode & S_IXGRP)