| OLD | NEW | 
|---|
| 1 #include "CrashHandler.h" | 1 #include "CrashHandler.h" | 
| 2 #include "DMJsonWriter.h" | 2 #include "DMJsonWriter.h" | 
| 3 #include "DMSrcSink.h" | 3 #include "DMSrcSink.h" | 
| 4 #include "OverwriteLine.h" | 4 #include "OverwriteLine.h" | 
| 5 #include "ProcStats.h" | 5 #include "ProcStats.h" | 
| 6 #include "SkBBHFactory.h" | 6 #include "SkBBHFactory.h" | 
| 7 #include "SkCommonFlags.h" | 7 #include "SkCommonFlags.h" | 
| 8 #include "SkForceLinking.h" | 8 #include "SkForceLinking.h" | 
| 9 #include "SkGraphics.h" | 9 #include "SkGraphics.h" | 
| 10 #include "SkMD5.h" | 10 #include "SkMD5.h" | 
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 410 } | 410 } | 
| 411 | 411 | 
| 412 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     ~~~~~~~~~~~~~~~~*/ | 412 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     ~~~~~~~~~~~~~~~~*/ | 
| 413 | 413 | 
| 414 int dm_main(); | 414 int dm_main(); | 
| 415 int dm_main() { | 415 int dm_main() { | 
| 416     SetupCrashHandler(); | 416     SetupCrashHandler(); | 
| 417     SkAutoGraphics ag; | 417     SkAutoGraphics ag; | 
| 418     SkTaskGroup::Enabler enabled(FLAGS_threads); | 418     SkTaskGroup::Enabler enabled(FLAGS_threads); | 
| 419 | 419 | 
| 420     SkDebugf("Blacklist debugging. %d total\n", FLAGS_blacklist.count()); |  | 
| 421     for (int i = 0; i < FLAGS_blacklist.count(); i++) { |  | 
| 422         SkDebugf("%d: '%s'\n", i, FLAGS_blacklist[i]); |  | 
| 423     } |  | 
| 424 |  | 
| 425     gather_srcs(); | 420     gather_srcs(); | 
| 426     gather_sinks(); | 421     gather_sinks(); | 
| 427     gather_tests(); | 422     gather_tests(); | 
| 428 | 423 | 
| 429     gPending = gSrcs.count() * gSinks.count() + gCPUTests.count() + gGPUTests.co
     unt(); | 424     gPending = gSrcs.count() * gSinks.count() + gCPUTests.count() + gGPUTests.co
     unt(); | 
| 430     SkDebugf("%d srcs * %d sinks + %d tests == %d tasks\n", | 425     SkDebugf("%d srcs * %d sinks + %d tests == %d tasks\n", | 
| 431              gSrcs.count(), gSinks.count(), gCPUTests.count() + gGPUTests.count(
     ), gPending); | 426              gSrcs.count(), gSinks.count(), gCPUTests.count() + gGPUTests.count(
     ), gPending); | 
| 432 | 427 | 
| 433     // We try to exploit as much parallelism as is safe.  Most Src/Sink pairs ru
     n on any thread, | 428     // We try to exploit as much parallelism as is safe.  Most Src/Sink pairs ru
     n on any thread, | 
| 434     // but Sinks that identify as part of a particular enclave run serially on a
      single thread. | 429     // but Sinks that identify as part of a particular enclave run serially on a
      single thread. | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 483     } | 478     } | 
| 484     return 0; | 479     return 0; | 
| 485 } | 480 } | 
| 486 | 481 | 
| 487 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 482 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 
| 488 int main(int argc, char** argv) { | 483 int main(int argc, char** argv) { | 
| 489     SkCommandLineFlags::Parse(argc, argv); | 484     SkCommandLineFlags::Parse(argc, argv); | 
| 490     return dm_main(); | 485     return dm_main(); | 
| 491 } | 486 } | 
| 492 #endif | 487 #endif | 
| OLD | NEW | 
|---|