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

Unified Diff: runtime/vm/service.cc

Issue 1692743003: Fix windows build by not using strcasestr (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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 | runtime/vm/timeline.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index ed5e89da31614cc00b06de8bfdcb0d31a1dd32db..c8912eb48c240e41cc2a646e40a21cbc6536d69c 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -2878,8 +2878,8 @@ static const MethodParameter* set_vm_timeline_flags_params[] = {
static bool HasStream(const char** recorded_streams, const char* stream) {
while (*recorded_streams != NULL) {
- if ((strcasestr(*recorded_streams, "all") != NULL) ||
- (strcasestr(*recorded_streams, stream) != NULL)) {
+ if ((strstr(*recorded_streams, "all") != NULL) ||
+ (strstr(*recorded_streams, stream) != NULL)) {
return true;
}
recorded_streams++;
@@ -2889,6 +2889,10 @@ static bool HasStream(const char** recorded_streams, const char* stream) {
static bool SetVMTimelineFlags(Thread* thread, JSONStream* js) {
+ if (!FLAG_support_timeline) {
+ PrintSuccess(js);
+ return true;
+ }
Isolate* isolate = thread->isolate();
ASSERT(isolate != NULL);
StackZone zone(thread);
@@ -2919,6 +2923,11 @@ static const MethodParameter* get_vm_timeline_flags_params[] = {
static bool GetVMTimelineFlags(Thread* thread, JSONStream* js) {
+ if (!FLAG_support_timeline) {
+ JSONObject obj(js);
+ obj.AddProperty("type", "TimelineFlags");
+ return true;
+ }
Isolate* isolate = thread->isolate();
ASSERT(isolate != NULL);
StackZone zone(thread);
« no previous file with comments | « no previous file | runtime/vm/timeline.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698