Skip to content

Commit

Permalink
Experimental switch to POSIX regex
Browse files Browse the repository at this point in the history 
It looks better in profiling on Debug build but when built for Release
with optimization it's actually a lot slower, like 50% of overall
runtime added on top.
  • Loading branch information
@Code7R
Code7R committed Sep 28, 2024
1 parent 4fdb3ec commit 9e1a39c
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 39 deletions.
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,8 @@ IF(CONFIG_FDO_MENUS)
ADD_EXECUTABLE(${_tgt} fdomenu.cc)
TARGET_LINK_LIBRARIES(${_tgt} ice)
# XXX: static linking or LTO make it actually slower
#target_compile_options(${_tgt} PUBLIC -pg)
#target_link_options(${_tgt} PUBLIC -pg)
#target_compile_options(${_tgt} PUBLIC -flto)
#target_link_options(${_tgt} PUBLIC -flto)
#target_compile_options(${_tgt} PUBLIC -static)
Expand Down
89 changes: 50 additions & 39 deletions src/fdomenu.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#define _GNU_SOURCE
#endif

#include <regex.h>

#include "base.h"
#include "config.h"
#include "appnames.h"
Expand All @@ -35,11 +37,11 @@
#include <iostream>
#include <locale>
#include <map>
#include <regex>
#include <set>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <functional>

#include <dirent.h>
#include <fcntl.h>
Expand Down Expand Up @@ -244,11 +246,9 @@ void replace_all(std::string &str, const std::string &from,
}
}

auto line_matcher =
std::regex("^\\s*(Terminal|Type|Name|GenericName|Exec|TryExec|Icon|"
"Categories|NoDisplay)"
"(\\[((\\w\\w)(_\\w\\w)?)\\])?\\s*=\\s*(.*){0,1}?\\s*$",
std::regex_constants::ECMAScript);
#define LINE_MATCH_PATTERN "^\\s*(Terminal|Type|Name|GenericName|Exec|TryExec|Icon|" \
"Categories|NoDisplay)(\\[((\\w\\w)(_\\w\\w)?)\\])?\\s*=\\s*(.*){0,1}?\\s*$"
regex_t line_matcher;

struct DesktopFile : public tLintRefcounted {
bool Terminal = false, IsApp = true, NoDisplay = false,
Expand Down Expand Up @@ -307,22 +307,28 @@ struct DesktopFile : public tLintRefcounted {
std::ifstream dfile;
dfile.open(filePath);
string line;
std::smatch m;
regmatch_t m[10];
auto rmstr = [&line](const regmatch_t rm) {
if (rm.rm_so < 0) return string();
return string(line.data() + rm.rm_so, rm.rm_eo - rm.rm_so);
};

bool reading = false;

auto take_loc_best = [&langWanted,
&langWantShort](decltype(m[0]) &value,
decltype(m[0]) &langLong,
decltype(m[0]) &langShort,
&langWantShort,
&line, &rmstr](const regmatch_t &value,
const regmatch_t &langLong,
const regmatch_t &langShort,
string &out, string &outLoc) {
if (langWanted.size() > 3 && langLong == langWanted) {
if (langWanted.size() > 3 && rmstr(langLong) == langWanted) {
// perfect hit always takes preference
outLoc = value;
} else if (langShort.matched && langShort == langWantShort) {
outLoc = rmstr(value);
} else if (langShort.rm_so >=0 && rmstr(langShort) == langWantShort) {
if (outLoc.empty())
outLoc = value;
} else if (!langLong.matched) {
out = value;
outLoc = rmstr(value);
} else if (langLong.rm_so <0) {
out = rmstr(value);
}
};

Expand All @@ -344,39 +350,40 @@ struct DesktopFile : public tLintRefcounted {
if (!reading)
continue;

std::regex_search(line, m, line_matcher);
if (m.empty())
if (regexec(&line_matcher, line.c_str(), ACOUNT(m), m, 0))
continue;

// for(auto x: m) cout << x << " - "; cout << " = " << m.size() <<
// endl;

const auto &value = m[6], key = m[1], langLong = m[3],
const auto &val = m[6], key = m[1], langLong = m[3],
langShort = m[4];
// cerr << "val: " << value << ", key: " << key << ", langLong: " <<
// langLong << ", langShort: " << langShort << endl;

if (key == "Terminal")
Terminal = value.compare("true") == 0;
else if (key == "NoDisplay")
NoDisplay = value.compare("true") == 0;
else if (key == "Icon")
Icon = value;
else if (key == "Categories")
Tokenize(value, ";", Categories);
else if (key == "Exec")
Exec = value;
else if (key == "TryExec")
TryExec = value;
else if (key == "Type") {
if (value == "Application")
#define keymatch(r) (key.rm_so >=0 && (sizeof(r)-1) == (key.rm_eo-key.rm_so) && 0 == strncmp(line.c_str()+key.rm_so, r, sizeof(r)-1) )
#define _LINE_VAL rmstr(val)

if (keymatch("Terminal"))
Terminal = _LINE_VAL.compare("true") == 0;
else if (keymatch("NoDisplay"))
NoDisplay = _LINE_VAL.compare("true") == 0;
else if (keymatch("Icon"))
Icon = _LINE_VAL;
else if (keymatch("Categories"))
Tokenize(_LINE_VAL, ";", Categories);
else if (keymatch("Exec"))
Exec = _LINE_VAL;
else if (keymatch("TryExec"))
TryExec = _LINE_VAL;
else if (keymatch("Type")) {
if (_LINE_VAL == "Application")
IsApp = true;
else if (value == "Directory")
else if (_LINE_VAL == "Directory")
IsApp = false;
} else if (key == "Name")
take_loc_best(value, langLong, langShort, Name, NameLoc);
else if (generic_name && key == "GenericName")
take_loc_best(value, langLong, langShort, GenericName,
} else if (keymatch("Name"))
take_loc_best(val, langLong, langShort, Name, NameLoc);
else if (generic_name && keymatch("GenericName"))
take_loc_best(val, langLong, langShort, GenericName,
GenericNameLoc);
}
}
Expand Down Expand Up @@ -569,6 +576,10 @@ int main(int argc, char **argv) {

std::ios_base::sync_with_stdio(false);

auto r = regcomp(&line_matcher, LINE_MATCH_PATTERN, REG_EXTENDED);
if (r)
return r;

#ifdef CONFIG_I18N
setlocale(LC_ALL, "");

Expand Down

0 comments on commit 9e1a39c

Please sign in to comment.