diff --git a/src/examples/task.ts b/src/examples/task.ts
index a73c9b8764b63663ea74417ea4025ac486d4566a..41025f042c48eb1252f14483ba94e1f10c771470 100644
--- a/src/examples/task.ts
+++ b/src/examples/task.ts
@@ -4,7 +4,7 @@
* @author David Sehnal <david.sehnal@gmail.com>
*/
-import { Task, Run, Progress, Scheduler, now, MultistepTask, ChunkedSubtask } from 'mol-task'
+import { Task, Run, Progress, Scheduler, now, MultistepTask, chunkedSubtask } from 'mol-task'
export async function test1() {
const t = Task.create('test', async () => 1);
@@ -65,7 +65,9 @@ export function testTree() {
});
}
-export const chunk = ChunkedSubtask(25, (n, state: { i: number, current: number, total: number }) => {
+export type ChunkedState = { i: number, current: number, total: number }
+
+function processChunk(n: number, state: ChunkedState): number {
const toProcess = Math.min(state.current + n, state.total);
const start = state.current;
for (let i = start; i < toProcess; i++) {
@@ -76,20 +78,20 @@ export const chunk = ChunkedSubtask(25, (n, state: { i: number, current: number,
}
state.current = toProcess;
return toProcess - start;
-}, (ctx, s, p) => ctx.update('chunk test ' + p));
+}
export const ms = MultistepTask('ms-task', ['step 1', 'step 2', 'step 3'], async (p: { i: number }, step, ctx) => {
await step(0);
const child = Task.create('chunked', async ctx => {
- const s = await chunk(ctx, { i: 0, current: 0, total: 125 });
+ const s = await chunkedSubtask(ctx, 25, { i: 0, current: 0, total: 125 }, processChunk, (ctx, s, p) => ctx.update('chunk test ' + p))
return s.i;
});
-
+
await ctx.runChild(child);
await Scheduler.delay(250);
await step(1);
- await chunk(ctx, { i: 0, current: 0, total: 80 });
+ await chunkedSubtask(ctx, 25, { i: 0, current: 0, total: 80 }, processChunk, (ctx, s, p) => ctx.update('chunk test ' + p))
await Scheduler.delay(250);
await step(2);
await Scheduler.delay(250);
diff --git a/src/mol-io/reader/cif/text/parser.ts b/src/mol-io/reader/cif/text/parser.ts
index 9db22779e0aa76d2e2677001954df92eb655490f..bbd4b39c83edaaa82b95b720511b9fc0baac7cb1 100644
--- a/src/mol-io/reader/cif/text/parser.ts
+++ b/src/mol-io/reader/cif/text/parser.ts
@@ -26,7 +26,7 @@ import * as Data from '../data-model'
import Field from './field'
import { Tokens, TokenBuilder } from '../../common/text/tokenizer'
import Result from '../../result'
-import { Task, RuntimeContext, ChunkedSubtask } from 'mol-task'
+import { Task, RuntimeContext, chunkedSubtask } from 'mol-task'
/**
* Types of supported mmCIF tokens.
@@ -468,7 +468,7 @@ interface LoopReadState {
tokenCount: number
}
-function readLoopChunk(state: LoopReadState, chunkSize: number) {
+function readLoopChunk(chunkSize: number, state: LoopReadState) {
const { tokenizer, tokens, fieldCount } = state;
let tokenCount = state.tokenCount;
let counter = 0;
@@ -481,9 +481,13 @@ function readLoopChunk(state: LoopReadState, chunkSize: number) {
return counter;
}
-const readLoopChunks = ChunkedSubtask(1000000,
- (size, state: LoopReadState) => readLoopChunk(state, size),
- (ctx, state) => ctx.update({ message: 'Parsing...', current: state.tokenizer.position, max: state.tokenizer.data.length }));
+function updateLoopChunk(ctx: RuntimeContext, state: LoopReadState) {
+ return ctx.update({ message: 'Parsing...', current: state.tokenizer.position, max: state.tokenizer.data.length });
+}
+
+// const readLoopChunks = ChunkedSubtask(1000000,
+// (size, state: LoopReadState) => readLoopChunk(state, size),
+// (ctx, state) => ctx.update({ message: 'Parsing...', current: state.tokenizer.position, max: state.tokenizer.data.length }));
/**
* Reads a loop.
@@ -512,7 +516,7 @@ async function handleLoop(tokenizer: TokenizerState, ctx: FrameContext): Promise
tokens
};
- await readLoopChunks(tokenizer.runtimeCtx, state);
+ await chunkedSubtask(tokenizer.runtimeCtx, 1000000, state, readLoopChunk, updateLoopChunk);
if (state.tokenCount % fieldCount !== 0) {
return {
diff --git a/src/mol-task/index.ts b/src/mol-task/index.ts
index 9e4c2e6474a63b537301b30e1a7c5f3c7db1bbb6..830153c1cfaa3cd6512b083dd988b90b825bdb08 100644
--- a/src/mol-task/index.ts
+++ b/src/mol-task/index.ts
@@ -12,7 +12,7 @@ import { Progress } from './execution/progress'
import { now } from './util/now'
import { Scheduler } from './util/scheduler'
import { MultistepTask } from './util/multistep'
-import { ChunkedSubtask } from './util/chunked'
+import { chunkedSubtask } from './util/chunked'
// Run the task without the ability to observe its progress.
function Run<T>(task: Task<T>): Promise<T>;
@@ -23,4 +23,4 @@ function Run<T>(task: Task<T>, observer?: Progress.Observer, updateRateMs?: numb
return ExecuteSynchronous(task);
}
-export { Task, RuntimeContext, Progress, Run, now, Scheduler, MultistepTask, ChunkedSubtask }
\ No newline at end of file
+export { Task, RuntimeContext, Progress, Run, now, Scheduler, MultistepTask, chunkedSubtask }
\ No newline at end of file
diff --git a/src/mol-task/util/chunked.ts b/src/mol-task/util/chunked.ts
index 8056f184bb57f82733a6c2b2158223fd166abf6e..d091e57066cbda2c53c38d14b0d18a2df53d4c8f 100644
--- a/src/mol-task/util/chunked.ts
+++ b/src/mol-task/util/chunked.ts
@@ -8,42 +8,39 @@ import { now } from './now'
import { RuntimeContext } from '../execution/runtime-context'
type UniformlyChunkedFn<S> = (chunkSize: number, state: S) => number
-type ChunkedSubtaskProvider<S> = (ctx: RuntimeContext, state: S) => Promise<S>
-function ChunkedSubtask<S>(initialChunk: number, f: UniformlyChunkedFn<S>,
- update: (ctx: RuntimeContext, state: S, processed: number) => Promise<void> | void): ChunkedSubtaskProvider<S> {
- return async (ctx: RuntimeContext, state: S) => {
- let chunkSize = Math.max(initialChunk, 0);
- let globalProcessed = 0, globalTime = 0;
+async function chunkedSubtask<S>(ctx: RuntimeContext, initialChunk: number, state: S,
+ f: UniformlyChunkedFn<S>, update: (ctx: RuntimeContext, state: S, processed: number) => Promise<void> | void): Promise<S> {
+ let chunkSize = Math.max(initialChunk, 0);
+ let globalProcessed = 0, globalTime = 0;
- if (ctx.isSynchronous) {
- f(Number.MAX_SAFE_INTEGER, state);
- return state;
- }
-
- let start = now();
- let lastSize = 0, currentTime = 0;
+ if (ctx.isSynchronous) {
+ f(Number.MAX_SAFE_INTEGER, state);
+ return state;
+ }
- while ((lastSize = f(chunkSize, state)) > 0) {
- globalProcessed += lastSize;
+ let start = now();
+ let lastSize = 0, currentTime = 0;
- const delta = now() - start;
- currentTime += delta;
- globalTime += delta;
+ while ((lastSize = f(chunkSize, state)) > 0) {
+ globalProcessed += lastSize;
- if (ctx.shouldUpdate) {
- await update(ctx, state, globalProcessed);
+ const delta = now() - start;
+ currentTime += delta;
+ globalTime += delta;
- chunkSize = Math.round(currentTime * globalProcessed / globalTime) + 1;
- start = now();
- currentTime = 0;
- }
- }
if (ctx.shouldUpdate) {
await update(ctx, state, globalProcessed);
+
+ chunkSize = Math.round(currentTime * globalProcessed / globalTime) + 1;
+ start = now();
+ currentTime = 0;
}
- return state;
}
+ if (ctx.shouldUpdate) {
+ await update(ctx, state, globalProcessed);
+ }
+ return state;
}
-export { ChunkedSubtask }
\ No newline at end of file
+export { chunkedSubtask }
\ No newline at end of file