External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

move buffer mgmt to stream service

Browse Source
This commit is contained in:
Jake McDermott 2018-08-18 11:50:04 -04:00
parent 13203af353
commit 2187655c68
No known key found for this signature in database
GPG Key ID: 9A6F084352C3A0B7
2 changed files with 56 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
awx/ui/client/features/output/index.controller.js
View File

@ -20,50 +20,16 @@ let stream;
let vm;
const bufferState = [0, 0]; // [length, count]
const listeners = [];
const rx = [];
function bufferInit () {
rx.length = 0;
bufferState[0] = 0;
bufferState[1] = 0;
}
function bufferAdd (event) {
rx.push(event);
bufferState[0] += 1;
bufferState[1] += 1;
return bufferState[1];
}
function bufferEmpty (min, max) {
let count = 0;
let removed = [];
for (let i = bufferState[0] - 1; i >= 0; i--) {
if (rx[i].counter <= max) {
removed = removed.concat(rx.splice(i, 1));
count++;
}
}
bufferState[0] -= count;
return removed;
}
let lockFrames;
function onFrames (events) {
events = slide.pushFrames(events);
if (lockFrames) {
events.forEach(bufferAdd);
return $q.resolve();
}
events = slide.pushFrames(events);
const popCount = events.length - slide.getCapacity();
const isAttached = events.length > 0;
@ -481,7 +447,7 @@ function clear () {
lockFollow = false;
lockFrames = false;
bufferInit();
stream.bufferInit();
status.init(resource);
slide.init(render, resource.events, scroll);
status.subscribe(data => { vm.status = data.status; });
@ -543,8 +509,6 @@ function OutputIndexController (
vm.debug = _debug;
render.requestAnimationFrame(() => {
bufferInit();
status.init(resource);
slide.init(render, resource.events, scroll);
render.init({ compile, toggles: vm.toggleLineEnabled });
@ -564,8 +528,6 @@ function OutputIndexController (
let showFollowTip = true;
const rates = [];
stream.init({
bufferAdd,
bufferEmpty,
onFrames,
onFrameRate (rate) {
rates.push(rate);

81
awx/ui/client/features/output/stream.service.js
View File

@ -5,24 +5,16 @@ import {
OUTPUT_PAGE_SIZE,
} from './constants';
const rx = [];
function OutputStream ($q) {
this.init = ({ bufferAdd, bufferEmpty, onFrames, onFrameRate, onStop }) => {
this.init = ({ onFrames, onFrameRate, onStop }) => {
this.hooks = {
bufferAdd,
bufferEmpty,
onFrames,
onFrameRate,
onStop,
};
this.counters = {
used: [],
ready: [],
min: 1,
max: 0,
final: null,
};
this.state = {
ending: false,
ended: false,
@ -30,9 +22,44 @@ function OutputStream ($q) {
this.lag = 0;
this.chain = $q.resolve();
this.factors = this.calcFactors(OUTPUT_PAGE_SIZE);
this.setFramesPerRender();
this.bufferInit();
};
this.bufferInit = () => {
rx.length = 0;
this.counters = {
total: 0,
min: 0,
max: null,
final: null,
ready: [],
used: [],
missing: [],
};
};
this.bufferEmpty = (minReady, maxReady) => {
let removed = [];
for (let i = rx.length - 1; i >= 0; i--) {
if (rx[i].counter <= maxReady) {
removed = removed.concat(rx.splice(i, 1));
}
}
return removed;
};
this.bufferAdd = event => {
rx.push(event);
this.counters.total += 1;
return this.counters.total;
};
this.calcFactors = size => {
@ -63,34 +90,32 @@ function OutputStream ($q) {
}
};
this.updateCounterState = ({ counter }) => {
this.checkCounter = ({ counter }) => {
this.counters.used.push(counter);
if (counter > this.counters.max) {
if (!this.counters.max || this.counters.max < counter) {
this.counters.max = counter;
}
let ready;
const missing = [];
let minReady;
let maxReady;
for (let i = this.counters.min; i <= this.counters.max; i++) {
if (this.counters.used.indexOf(i) === -1) {
missing.push(i);
} else if (missing.length === 0) {
maxReady = i;
}
}
if (maxReady) {
minReady = this.counters.min;
this.counters.min = maxReady + 1;
this.counters.used = this.counters.used.filter(c => c > maxReady);
if (missing.length === 0) {
ready = this.counters.max;
} else {
ready = missing[0] - 1;
}
this.counters.ready = [this.counters.min, ready];
this.counters.min = ready + 1;
this.counters.used = this.counters.used.filter(c => c > ready);
this.counters.missing = missing;
this.counters.ready = [minReady, maxReady];
return this.counters.ready;
};
@ -105,8 +130,8 @@ function OutputStream ($q) {
this.counters.final = data.counter;
}
const [minReady, maxReady] = this.updateCounterState(data);
const count = this.hooks.bufferAdd(data);
const [minReady, maxReady] = this.checkCounter(data);
const count = this.bufferAdd(data);
if (count % OUTPUT_PAGE_SIZE === 0) {
this.setFramesPerRender();
@ -121,7 +146,7 @@ function OutputStream ($q) {
}
const isLastFrame = this.state.ending && (maxReady >= this.counters.final);
const events = this.hooks.bufferEmpty(minReady, maxReady);
const events = this.bufferEmpty(minReady, maxReady);
return this.emitFrames(events, isLastFrame);
})
@ -142,7 +167,7 @@ function OutputStream ($q) {
let events = [];
if (this.counters.ready.length > 0) {
events = this.hooks.bufferEmpty(...this.counters.ready);
events = this.bufferEmpty(...this.counters.ready);
}
return this.emitFrames(events, true);