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

Side by Side Diff: runtime/vm/cpuinfo.h

Issue 1586663005: VM: Don't do free("") in shutdown when we can't find the cpu model field in /proc/cpuinfo. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | runtime/vm/cpuinfo_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef VM_CPUINFO_H_ 5 #ifndef VM_CPUINFO_H_
6 #define VM_CPUINFO_H_ 6 #define VM_CPUINFO_H_
7 7
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/allocation.h" 9 #include "vm/allocation.h"
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // Returns the field. Caller is responsible for freeing the result. 54 // Returns the field. Caller is responsible for freeing the result.
55 static const char* ExtractField(CpuInfoIndices idx); 55 static const char* ExtractField(CpuInfoIndices idx);
56 static const char* ExtractFieldByString(const char* field); 56 static const char* ExtractFieldByString(const char* field);
57 57
58 // Returns the field describing the CPU model. Caller is responsible for 58 // Returns the field describing the CPU model. Caller is responsible for
59 // freeing the result. 59 // freeing the result.
60 static const char* GetCpuModel() { 60 static const char* GetCpuModel() {
61 if (HasField(FieldName(kCpuInfoHardware))) { 61 if (HasField(FieldName(kCpuInfoHardware))) {
62 return ExtractField(kCpuInfoHardware); 62 return ExtractField(kCpuInfoHardware);
63 } else { 63 } else {
64 return ""; 64 return strdup("Unknown");
65 } 65 }
66 } 66 }
67 67
68 private: 68 private:
69 // The method to use to acquire info about the CPU. 69 // The method to use to acquire info about the CPU.
70 static CpuInfoMethod method_; 70 static CpuInfoMethod method_;
71 71
72 // Cpuinfo field names. 72 // Cpuinfo field names.
73 static const char* fields_[kCpuInfoMax]; 73 static const char* fields_[kCpuInfoMax];
74 }; 74 };
75 75
76 } // namespace dart 76 } // namespace dart
77 77
78 #endif // VM_CPUINFO_H_ 78 #endif // VM_CPUINFO_H_
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/cpuinfo_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698