406654be7a
SkTaskGroup is like SkThreadPool except the threads stay in one global pool. Each SkTaskGroup itself is tiny (4 bytes) and its wait() method applies only to tasks add()ed to that instance, not the whole thread pool. This means we don't need to bring up new thread pools when tests themselves want to use multithreading (e.g. pathops, quilt). We just create a new SkTaskGroup and wait for that to complete. This should be more efficient, and allow us to expand where we use threads to really latency sensitive places. E.g. we can probably now use these in nanobench for CPU .skp rendering. Now that all threads are sharing the same pool, I think we can remove most of the custom mechanism pathops tests use to control threading. They'll just ride on the global pool with all other tests now. This (temporarily?) removes the GPU multithreading feature from DM, which we don't use. On my desktop, DM runs a little faster (57s -> 55s) in Debug, and a lot faster in Release (36s -> 24s). The bots show speedups of similar proportions, cutting more than a minute off the N4/Release and Win7/Debug runtimes. BUG=skia: Committed: https://skia.googlesource.com/skia/+/9c7207b5dc71dc5a96a2eb107d401133333d5b6f R=caryclark@google.com, bsalomon@google.com, bungeman@google.com, mtklein@google.com, reed@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/531653002
102 lines
2.6 KiB
C++
102 lines
2.6 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "iOSShell.h"
|
|
|
|
#include "Resources.h"
|
|
#include "SkApplication.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkCommonFlags.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkWindow.h"
|
|
#include "sk_tool_utils.h"
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static SkView* curr_view(SkWindow* wind) {
|
|
SkView::F2BIter iter(wind);
|
|
return iter.next();
|
|
}
|
|
|
|
ShellWindow::ShellWindow(void* hwnd, int argc, char** argv)
|
|
: INHERITED(hwnd) {
|
|
SkCommandLineFlags::Parse(argc, argv);
|
|
}
|
|
|
|
ShellWindow::~ShellWindow() {
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
bool ShellWindow::onDispatchClick(int x, int y, Click::State state,
|
|
void* owner, unsigned modi) {
|
|
int w = SkScalarRoundToInt(this->width());
|
|
int h = SkScalarRoundToInt(this->height());
|
|
|
|
// check for the resize-box
|
|
if (w - x < 16 && h - y < 16) {
|
|
return false; // let the OS handle the click
|
|
} else {
|
|
return this->INHERITED::onDispatchClick(x, y, state, owner, modi);
|
|
}
|
|
}
|
|
|
|
void ShellWindow::onSizeChange() {
|
|
this->INHERITED::onSizeChange();
|
|
|
|
SkView::F2BIter iter(this);
|
|
SkView* view = iter.next();
|
|
view->setSize(this->width(), this->height());
|
|
}
|
|
|
|
DEFINE_bool(dm, false, "run dm");
|
|
DEFINE_bool(nanobench, false, "run nanobench");
|
|
|
|
int nanobench_main();
|
|
int dm_main();
|
|
|
|
IOS_launch_type set_cmd_line_args(int argc, char *argv[], const char* resourceDir) {
|
|
SkCommandLineFlags::Parse(argc, argv);
|
|
SetResourcePath(resourceDir);
|
|
if (FLAGS_nanobench) {
|
|
return nanobench_main() ? kError_iOSLaunchType : kTool_iOSLaunchType;
|
|
}
|
|
if (FLAGS_dm) {
|
|
return dm_main() ? kError_iOSLaunchType : kTool_iOSLaunchType;
|
|
}
|
|
return kError_iOSLaunchType;
|
|
}
|
|
|
|
// FIXME: this should be in a header
|
|
SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv);
|
|
SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
|
|
return new ShellWindow(hwnd, argc, argv);
|
|
}
|
|
|
|
// FIXME: this should be in a header
|
|
void get_preferred_size(int* x, int* y, int* width, int* height);
|
|
void get_preferred_size(int* x, int* y, int* width, int* height) {
|
|
*x = 10;
|
|
*y = 50;
|
|
*width = 640;
|
|
*height = 480;
|
|
}
|
|
|
|
// FIXME: this should be in a header
|
|
void application_init();
|
|
void application_init() {
|
|
SkGraphics::Init();
|
|
SkEvent::Init();
|
|
}
|
|
|
|
// FIXME: this should be in a header
|
|
void application_term();
|
|
void application_term() {
|
|
SkEvent::Term();
|
|
SkGraphics::Term();
|
|
}
|