Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

speed up hunspell inner loop #982

Merged
merged 2 commits into from Nov 3, 2023
Merged

speed up hunspell inner loop #982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5737bdb
speed up hunspell inner loop
Nov 3, 2023
4f15731
WaE: overflow in expression
caolanm Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 25 additions & 18 deletions src/hunspell/affixmgr.cxx
View file
Open in desktop
Expand Up @@ -75,6 +75,7 @@
#include <ctime>

#include <algorithm>
#include <chrono>
#include <memory>
#include <limits>
#include <string>
Expand Down Expand Up @@ -1590,17 +1591,20 @@ struct hentry* AffixMgr::compound_check(const std::string& word,
// add a time limit to handle possible
// combinatorical explosion of the overlapping words

HUNSPELL_THREAD_LOCAL clock_t timelimit;
HUNSPELL_THREAD_LOCAL std::chrono::steady_clock::time_point clock_time_start;
HUNSPELL_THREAD_LOCAL bool timelimit_exceeded;

// get the current time
std::chrono::steady_clock::time_point clock_now = std::chrono::steady_clock::now();

if (wordnum == 0) {
// get the start time, seeing as we're reusing this set to 0
// to flag timeout, use clock() + 1 to avoid start clock()
// of 0 as being a timeout
timelimit = clock() + 1;
}
else if (timelimit != 0 && (clock() > timelimit + TIMELIMIT)) {
timelimit = 0;
// set the start time
clock_time_start = clock_now;
timelimit_exceeded = false;
}
else if (std::chrono::duration_cast<std::chrono::milliseconds>(clock_now - clock_time_start).count()
> static_cast<double>(TIMELIMIT) * CLOCKS_PER_SEC * 1000)
timelimit_exceeded = true;

setcminmax(&cmin, &cmax, word.c_str(), len);

Expand All @@ -1626,7 +1630,7 @@ struct hentry* AffixMgr::compound_check(const std::string& word,

do { // simplified checkcompoundpattern loop

if (timelimit == 0)
if (timelimit_exceeded)
return 0;

if (scpd > 0) {
Expand Down Expand Up @@ -2216,17 +2220,20 @@ int AffixMgr::compound_check_morph(const std::string& word,
// add a time limit to handle possible
// combinatorical explosion of the overlapping words

HUNSPELL_THREAD_LOCAL clock_t timelimit;
HUNSPELL_THREAD_LOCAL std::chrono::steady_clock::time_point clock_time_start;
HUNSPELL_THREAD_LOCAL bool timelimit_exceeded;

// get the current time
std::chrono::steady_clock::time_point clock_now = std::chrono::steady_clock::now();

if (wordnum == 0) {
// get the start time, seeing as we're reusing this set to 0
// to flag timeout, use clock() + 1 to avoid start clock()
// of 0 as being a timeout
timelimit = clock() + 1;
}
else if (timelimit != 0 && (clock() > timelimit + TIMELIMIT)) {
timelimit = 0;
// set the start time
clock_time_start = clock_now;
timelimit_exceeded = false;
}
else if (std::chrono::duration_cast<std::chrono::milliseconds>(clock_now - clock_time_start).count()
> static_cast<double>(TIMELIMIT) * CLOCKS_PER_SEC * 1000)
timelimit_exceeded = true;

setcminmax(&cmin, &cmax, word.c_str(), len);

Expand All @@ -2246,7 +2253,7 @@ int AffixMgr::compound_check_morph(const std::string& word,

do { // onlycpdrule loop

if (timelimit == 0)
if (timelimit_exceeded)
return 0;

oldnumsyllable = numsyllable;
Expand Down