Changeset 156104 in webkit
- Timestamp:
- Sep 19, 2013 10:57:47 AM (11 years ago)
- Location:
- trunk/PerformanceTests
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/PerformanceTests/ChangeLog
r156088 r156104 1 2013-09-19 Ryosuke Niwa <rniwa@webkit.org> 2 3 DoYouEvenBench: Indentations in benchmark.js and benchmark.html are all messed up 4 https://bugs.webkit.org/show_bug.cgi?id=121597 5 6 Reviewed by Anders Carlsson. 7 8 Fixed indentations. 9 10 * DoYouEvenBench/benchmark.html: 11 * DoYouEvenBench/benchmark.js: 12 (SimplePromise.prototype.resolve.else): 13 (SimplePromise.prototype.resolve): 14 (BenchmarkRunner.waitForElement.resolveIfReady): 15 (BenchmarkRunner.waitForElement): 16 (BenchmarkRunner._waitAndWarmUp.Fibonacci): 17 (BenchmarkRunner._finalize): 18 1 19 2013-09-19 Ryosuke Niwa <rniwa@webkit.org> 2 20 -
trunk/PerformanceTests/DoYouEvenBench/benchmark.html
r156088 r156104 20 20 ['Adding' + numberOfItemsToAdd + 'Items', function (newTodo, contentWindow, contentDocument) { 21 21 var todoController = contentWindow.todo.controller; 22 for (var i = 0; i < numberOfItemsToAdd; i++) {23 newTodo.value = 'Something to do ' + i;24 todoController.addItem({keyCode: todoController.ENTER_KEY, target: newTodo});22 for (var i = 0; i < numberOfItemsToAdd; i++) { 23 newTodo.value = 'Something to do ' + i; 24 todoController.addItem({keyCode: todoController.ENTER_KEY, target: newTodo}); 25 25 } 26 26 }], 27 27 ['CompletingAllItems', function (newTodo, contentWindow, contentDocument) { 28 var checkboxes = contentDocument.querySelectorAll('.toggle');29 for (var i = 0; i < checkboxes.length; i++)30 checkboxes[i].click();28 var checkboxes = contentDocument.querySelectorAll('.toggle'); 29 for (var i = 0; i < checkboxes.length; i++) 30 checkboxes[i].click(); 31 31 }], 32 33 var deleteButtons = contentDocument.querySelectorAll('.destroy');34 for (var i = 0; i < deleteButtons.length; i++)35 deleteButtons[i].click();32 ['DeletingAllItems', function (newTodo, contentWindow, contentDocument) { 33 var deleteButtons = contentDocument.querySelectorAll('.destroy'); 34 for (var i = 0; i < deleteButtons.length; i++) 35 deleteButtons[i].click(); 36 36 }], 37 37 ] … … 42 42 url: 'todomvc/architecture-examples/emberjs/index.html', 43 43 prepare: function (contentWindow, contentDocument) { 44 contentWindow.Todos.Store = contentWindow.DS.Store.extend({45 revision: 12,46 adapter: 'Todos.LSAdapter',47 commit: function () { }48 });44 contentWindow.Todos.Store = contentWindow.DS.Store.extend({ 45 revision: 12, 46 adapter: 'Todos.LSAdapter', 47 commit: function () { } 48 }); 49 49 50 50 return BenchmarkRunner.waitForElement('#new-todo').then(function (element) { … … 58 58 tests: [ 59 59 ['Adding' + numberOfItemsToAdd + 'Items', function (params) { 60 for (var i = 0; i < numberOfItemsToAdd; i++) {61 params.emberRun(function () { params.views["new-todo"].set('value', 'Something to do' + i); });62 params.emberRun(function () { params.views["new-todo"].insertNewline(document.createEvent('Event')); });63 }60 for (var i = 0; i < numberOfItemsToAdd; i++) { 61 params.emberRun(function () { params.views["new-todo"].set('value', 'Something to do' + i); }); 62 params.emberRun(function () { params.views["new-todo"].insertNewline(document.createEvent('Event')); }); 63 } 64 64 }], 65 65 ['CompletingAllItems', function (params, contentWindow, contentDocument) { 66 var checkboxes = contentDocument.querySelectorAll('.ember-checkbox');67 for (var i = 0; i < checkboxes.length; i++) {68 var view = params.views[checkboxes[i].id];69 params.emberRun(function () { view.set('checked', true); });70 }66 var checkboxes = contentDocument.querySelectorAll('.ember-checkbox'); 67 for (var i = 0; i < checkboxes.length; i++) { 68 var view = params.views[checkboxes[i].id]; 69 params.emberRun(function () { view.set('checked', true); }); 70 } 71 71 }], 72 72 ['DeletingItems', function (params, contentWindow, contentDocument) { 73 var deleteButtons = contentDocument.querySelectorAll('.destroy');74 for (var i = 0; i < deleteButtons.length; i++)75 params.emberRun(function () { deleteButtons[i].click(); });73 var deleteButtons = contentDocument.querySelectorAll('.destroy'); 74 for (var i = 0; i < deleteButtons.length; i++) 75 params.emberRun(function () { deleteButtons[i].click(); }); 76 76 }], 77 77 ] … … 90 90 tests: [ 91 91 ['Adding' + numberOfItemsToAdd + 'Items', function (newTodo, contentWindow, contentDocument) { 92 var appView = contentWindow.appView;93 var fakeEvent = {which: contentWindow.ENTER_KEY};94 for (var i = 0; i < numberOfItemsToAdd; i++) {95 newTodo.value = 'Something to do ' + i;96 appView.createOnEnter(fakeEvent);92 var appView = contentWindow.appView; 93 var fakeEvent = {which: contentWindow.ENTER_KEY}; 94 for (var i = 0; i < numberOfItemsToAdd; i++) { 95 newTodo.value = 'Something to do ' + i; 96 appView.createOnEnter(fakeEvent); 97 97 } 98 98 }], 99 99 ['CompletingAllItems', function (newTodo, contentWindow, contentDocument) { 100 var checkboxes = contentDocument.querySelectorAll('.toggle');101 for (var i = 0; i < checkboxes.length; i++)102 checkboxes[i].click();100 var checkboxes = contentDocument.querySelectorAll('.toggle'); 101 for (var i = 0; i < checkboxes.length; i++) 102 checkboxes[i].click(); 103 103 }], 104 105 var deleteButtons = contentDocument.querySelectorAll('.destroy');106 for (var i = 0; i < deleteButtons.length; i++)107 deleteButtons[i].click();104 ['DeletingAllItems', function (newTodo, contentWindow, contentDocument) { 105 var deleteButtons = contentDocument.querySelectorAll('.destroy'); 106 for (var i = 0; i < deleteButtons.length; i++) 107 deleteButtons[i].click(); 108 108 }], 109 109 ] … … 122 122 tests: [ 123 123 ['Adding' + numberOfItemsToAdd + 'Items', function (newTodo, contentWindow, contentDocument) { 124 var app = contentWindow.app;125 var fakeEvent = {which: app.ENTER_KEY};126 for (var i = 0; i < numberOfItemsToAdd; i++) {127 newTodo.value = 'Something to do ' + i;128 app.create.call(newTodo, fakeEvent);129 }124 var app = contentWindow.app; 125 var fakeEvent = {which: app.ENTER_KEY}; 126 for (var i = 0; i < numberOfItemsToAdd; i++) { 127 newTodo.value = 'Something to do ' + i; 128 app.create.call(newTodo, fakeEvent); 129 } 130 130 }], 131 131 ['CompletingAllItems', function (newTodo, contentWindow, contentDocument) { 132 var app = contentWindow.app;133 var checkboxes = contentDocument.querySelectorAll('.toggle');134 for (var i = 0; i < checkboxes.length; i++)135 app.toggle.call(checkboxes[i]);132 var app = contentWindow.app; 133 var checkboxes = contentDocument.querySelectorAll('.toggle'); 134 for (var i = 0; i < checkboxes.length; i++) 135 app.toggle.call(checkboxes[i]); 136 136 }], 137 138 var app = contentWindow.app;139 var deleteButtons = contentDocument.querySelectorAll('.destroy');140 for (var i = 0; i < deleteButtons.length; i++)141 app.destroy.call(deleteButtons[i]);137 ['DeletingAllItems', function (newTodo, contentWindow, contentDocument) { 138 var app = contentWindow.app; 139 var deleteButtons = contentDocument.querySelectorAll('.destroy'); 140 for (var i = 0; i < deleteButtons.length; i++) 141 app.destroy.call(deleteButtons[i]); 142 142 }], 143 143 ] … … 156 156 tests: [ 157 157 ['Adding' + numberOfItemsToAdd + 'Items', function (newTodo, contentWindow, contentDocument) { 158 var todomvc = contentWindow.todomvc;159 var submitEvent = document.createEvent('Event');160 submitEvent.initEvent('submit', true, true);161 var inputEvent = document.createEvent('Event');162 inputEvent.initEvent('input', true, true);163 for (var i = 0; i < numberOfItemsToAdd; i++) {164 newTodo.value = 'Something to do ' + i;165 newTodo.dispatchEvent(inputEvent);166 newTodo.form.dispatchEvent(submitEvent);158 var todomvc = contentWindow.todomvc; 159 var submitEvent = document.createEvent('Event'); 160 submitEvent.initEvent('submit', true, true); 161 var inputEvent = document.createEvent('Event'); 162 inputEvent.initEvent('input', true, true); 163 for (var i = 0; i < numberOfItemsToAdd; i++) { 164 newTodo.value = 'Something to do ' + i; 165 newTodo.dispatchEvent(inputEvent); 166 newTodo.form.dispatchEvent(submitEvent); 167 167 } 168 168 }], 169 169 ['CompletingAllItems', function (newTodo, contentWindow, contentDocument) { 170 var checkboxes = contentDocument.querySelectorAll('.toggle');171 for (var i = 0; i < checkboxes.length; i++)172 checkboxes[i].click();170 var checkboxes = contentDocument.querySelectorAll('.toggle'); 171 for (var i = 0; i < checkboxes.length; i++) 172 checkboxes[i].click(); 173 173 }], 174 175 var deleteButtons = contentDocument.querySelectorAll('.destroy');176 for (var i = 0; i < deleteButtons.length; i++)177 deleteButtons[i].click();174 ['DeletingAllItems', function (newTodo, contentWindow, contentDocument) { 175 var deleteButtons = contentDocument.querySelectorAll('.destroy'); 176 for (var i = 0; i < deleteButtons.length; i++) 177 deleteButtons[i].click(); 178 178 }], 179 179 ] -
trunk/PerformanceTests/DoYouEvenBench/benchmark.js
r156073 r156104 23 23 this._resolved = true; 24 24 this._resolvedValue = value; 25 return;25 return; 26 26 } 27 27 28 28 var result = this._callback(value); 29 29 if (result instanceof SimplePromise) { 30 var chainedPromise = this._chainedPromise;31 result.then(function (result) { chainedPromise.resolve(result); });30 var chainedPromise = this._chainedPromise; 31 result.then(function (result) { chainedPromise.resolve(result); }); 32 32 } else 33 this._chainedPromise.resolve(result);33 this._chainedPromise.resolve(result); 34 34 } 35 35 … … 48 48 function resolveIfReady() { 49 49 var element = contentDocument.querySelector(selector); 50 if (element)51 return promise.resolve(element);50 if (element) 51 return promise.resolve(element); 52 52 setTimeout(resolveIfReady, 50); 53 53 } … … 77 77 78 78 function Fibonacci(n) { 79 if (Date.now() - startTime > 100)80 return;81 if (n <= 0)82 return 0;83 else if (n == 1)84 return 1;85 return Fibonacci(n - 2) + Fibonacci(n - 1);79 if (Date.now() - startTime > 100) 80 return; 81 if (n <= 0) 82 return 0; 83 else if (n == 1) 84 return 1; 85 return Fibonacci(n - 2) + Fibonacci(n - 1); 86 86 } 87 87 88 88 var promise = new SimplePromise; 89 89 setTimeout(function () { 90 Fibonacci(100);91 promise.resolve();90 Fibonacci(100); 91 promise.resolve(); 92 92 }, 200); 93 93 return promise; … … 110 110 var startTime = now(); 111 111 setTimeout(function () { 112 var endTime = now();113 callback(syncTime, endTime - startTime);112 var endTime = now(); 113 callback(syncTime, endTime - startTime); 114 114 }, 0); 115 115 } … … 300 300 var total = 0; // FIXME: Compute the total properly. 301 301 for (var title in self._measuredValues) { 302 results += title + ' : ' + self._measuredValues[title] + ' ms\n';303 total += self._measuredValues[title];302 results += title + ' : ' + self._measuredValues[title] + ' ms\n'; 303 total += self._measuredValues[title]; 304 304 } 305 305 results += 'Total : ' + (total / 2) + ' ms\n';
Note: See TracChangeset
for help on using the changeset viewer.