Bring into synch with Trunk, and fix regression.

[SVN r41895]
This commit is contained in:
John Maddock
2007-12-08 17:37:40 +00:00
parent dc01b7833e
commit 97daf0f81f

View File

@ -324,17 +324,17 @@ int main(int argc, char**argv)
iters = 10; iters = 10;
tim = 1.1; tim = 1.1;
// cache load: // cache load:
regex_tA(&r, s2.c_str(), nsubs, matches.get(), 0); regexecA(&r, s2.c_str(), nsubs, matches.get(), 0);
do{ do{
iters *= (tim > 0.001) ? (1.1/tim) : 100; iters *= (tim > 0.001) ? (1.1/tim) : 100;
t.restart(); t.restart();
for(i = 0; i < iters; ++i) for(i = 0; i < iters; ++i)
{ {
result = regex_tA(&r, s2.c_str(), nsubs, matches.get(), 0); result = regexecA(&r, s2.c_str(), nsubs, matches.get(), 0);
} }
tim = t.elapsed(); tim = t.elapsed();
}while(tim < wait_time); }while(tim < wait_time);
cout << "POSIX regex_tA time: " << (tim * 1000000 / iters) << "us" << endl; cout << "POSIX regexecA time: " << (tim * 1000000 / iters) << "us" << endl;
if(result == 0) if(result == 0)
{ {