Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1230 for (int i = 1; i < options.num_isolates; ++i) { | 1230 for (int i = 1; i < options.num_isolates; ++i) { |
| 1231 options.isolate_sources[i].WaitForThread(); | 1231 options.isolate_sources[i].WaitForThread(); |
| 1232 } | 1232 } |
| 1233 | 1233 |
| 1234 if (options.parallel_files != NULL) | 1234 if (options.parallel_files != NULL) |
| 1235 for (int i = 0; i < threads.length(); i++) { | 1235 for (int i = 0; i < threads.length(); i++) { |
| 1236 i::Thread* thread = threads[i]; | 1236 i::Thread* thread = threads[i]; |
| 1237 thread->Join(); | 1237 thread->Join(); |
| 1238 delete thread; | 1238 delete thread; |
| 1239 } | 1239 } |
| 1240 | |
| 1241 OnExit(); | |
| 1242 #endif // V8_SHARED | 1240 #endif // V8_SHARED |
| 1243 return 0; | 1241 return 0; |
| 1244 } | 1242 } |
| 1245 | 1243 |
| 1246 | 1244 |
| 1247 int Shell::Main(int argc, char* argv[]) { | 1245 int Shell::Main(int argc, char* argv[]) { |
| 1248 if (!SetOptions(argc, argv)) return 1; | 1246 if (!SetOptions(argc, argv)) return 1; |
| 1249 Initialize(); | 1247 Initialize(); |
| 1250 | 1248 |
| 1251 int result = 0; | 1249 int result = 0; |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 1282 if (( options.interactive_shell | 1280 if (( options.interactive_shell |
| 1283 || !options.script_executed ) | 1281 || !options.script_executed ) |
| 1284 && !options.test_shell ) { | 1282 && !options.test_shell ) { |
| 1285 #ifndef V8_SHARED | 1283 #ifndef V8_SHARED |
| 1286 InstallUtilityScript(); | 1284 InstallUtilityScript(); |
| 1287 #endif // V8_SHARED | 1285 #endif // V8_SHARED |
| 1288 RunShell(); | 1286 RunShell(); |
| 1289 } | 1287 } |
| 1290 | 1288 |
| 1291 V8::Dispose(); | 1289 V8::Dispose(); |
| 1290 OnExit(); | |
|
Yang
2011/08/24 09:44:02
Delete the pointer to the counters file only after
| |
| 1292 | 1291 |
| 1293 return result; | 1292 return result; |
| 1294 } | 1293 } |
| 1295 | 1294 |
| 1296 } // namespace v8 | 1295 } // namespace v8 |
| 1297 | 1296 |
| 1298 | 1297 |
| 1299 #ifndef GOOGLE3 | 1298 #ifndef GOOGLE3 |
| 1300 int main(int argc, char* argv[]) { | 1299 int main(int argc, char* argv[]) { |
| 1301 return v8::Shell::Main(argc, argv); | 1300 return v8::Shell::Main(argc, argv); |
| 1302 } | 1301 } |
| 1303 #endif | 1302 #endif |
| OLD | NEW |