Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1019)

Unified Diff: bench/benchmain.cpp

Issue 19807005: refactor duplication (shouldSkip and skip_name) into a utility function (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Forced linking is required, shouldn't have removed it Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gm/gmmain.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/benchmain.cpp
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index c0f6da90ec8bf5b2e09878bb9976c4001fa4e848..1ace7d108abd3d86623e619aa55797da9adbc07d 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -22,6 +22,7 @@ class GrContext;
#include "SkBenchLogger.h"
#include "SkBenchmark.h"
#include "SkCanvas.h"
+#include "SkCommandLineFlags.h"
#include "SkDeferredCanvas.h"
#include "SkDevice.h"
#include "SkColorPriv.h"
@@ -270,38 +271,6 @@ static int findConfig(const char config[]) {
return -1;
}
-static bool skip_name(const SkTDArray<const char*> array, const char name[]) {
- // FIXME: this duplicates the logic in skia_test.cpp, gmmain.cpp -- consolidate
- int count = array.count();
- size_t testLen = strlen(name);
- bool anyExclude = count == 0;
- for (int i = 0; i < array.count(); ++i) {
- const char* matchName = array[i];
- size_t matchLen = strlen(matchName);
- bool matchExclude, matchStart, matchEnd;
- if ((matchExclude = matchName[0] == '~')) {
- anyExclude = true;
- matchName++;
- matchLen--;
- }
- if ((matchStart = matchName[0] == '^')) {
- matchName++;
- matchLen--;
- }
- if ((matchEnd = matchName[matchLen - 1] == '$')) {
- matchLen--;
- }
- if (matchStart ? (!matchEnd || matchLen == testLen)
- && strncmp(name, matchName, matchLen) == 0
- : matchEnd ? matchLen <= testLen
- && strncmp(name + testLen - matchLen, matchName, matchLen) == 0
- : strstr(name, matchName) != 0) {
- return matchExclude;
- }
- }
- return !anyExclude;
-}
-
static void help() {
SkString configsStr;
static const size_t kConfigCount = SK_ARRAY_COUNT(gConfigs);
@@ -771,7 +740,7 @@ int tool_main(int argc, char** argv) {
}
// only run benchmarks if their name contains matchStr
- if (skip_name(fMatches, bench->getName())) {
+ if (SkCommandLineFlags::ShouldSkip(fMatches, bench->getName())) {
continue;
}
« no previous file with comments | « no previous file | gm/gmmain.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698