Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/good-onions-go.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@lynx-js/web-core": patch
---

feat: remove multi-thread mts heating
Comment thread
PupilTong marked this conversation as resolved.

The default rendering mode is "all-on-ui". Therefore the preheating for "multi-thread" will be removed.
Comment thread
PupilTong marked this conversation as resolved.
8 changes: 5 additions & 3 deletions packages/web-platform/web-core/src/uiThread/bootWorkers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ interface LynxViewRpc {
const backgroundWorkerContextCount: number[] = [];
const contextIdToBackgroundWorker: (Worker | undefined)[] = [];

let preHeatedMainWorker = createMainWorker();
export function bootWorkers(
lynxGroupId: number | undefined,
allOnUI?: boolean,
Expand All @@ -27,8 +26,7 @@ export function bootWorkers(
if (allOnUI) {
curMainWorker = createUIChannel();
} else {
curMainWorker = preHeatedMainWorker;
preHeatedMainWorker = createMainWorker();
curMainWorker = createMainWorker();
}
const curBackgroundWorker = createBackgroundWorker(
lynxGroupId,
Expand Down Expand Up @@ -124,6 +122,10 @@ function createBackgroundWorker(

function createWebWorker(name: string): Worker {
return new Worker(
/* webpackFetchPriority: "high" */
/* webpackChunkName: "web-core-worker-runtime" */
/* webpackPrefetch: true */
/* webpackPreload: true */
new URL('@lynx-js/web-worker-runtime', import.meta.url),
{
type: 'module',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ import { createExposureMonitor } from './crossThreadHandlers/createExposureMonit

const {
prepareMainThreadAPIs,
} = await import('@lynx-js/web-mainthread-apis');
} = await import(
/* webpackChunkName: "web-core-main-thread-apis" */
/* webpackMode: "lazy-once" */
/* webpackPreload: true */
/* webpackPrefetch: true */
/* webpackFetchPriority: "high" */
'@lynx-js/web-mainthread-apis'
);

export function createRenderAllOnUI(
mainToBackgroundRpc: Rpc,
Expand Down
47 changes: 5 additions & 42 deletions packages/web-platform/web-tests/tests/react.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@
});
await wait(50);
expect(message).toContain('fin');
expect(page.workers().length).toStrictEqual(1);
expect(page.workers().length).toStrictEqual(0);
});

test('api-error', async ({ page }, { title }) => {
Expand Down Expand Up @@ -886,43 +886,6 @@
await expect(offset).toBe(true);
});

test('api-preheat', async ({ page }, { title }) => {
await goto(page, title);
const target = page.locator('#target');
await expect(target).toHaveCSS('background-color', 'rgb(255, 192, 203)'); // pink
expect(page.workers().length).toStrictEqual(ENABLE_MULTI_THREAD ? 3 : 2);
});

test('api-preheat-at-least-one', async ({ page }, { title }) => {
await goto(page, title);
const target = page.locator('#target');
await expect(target).toHaveCSS('background-color', 'rgb(255, 192, 203)'); // pink
expect(page.workers().length).toBe(ENABLE_MULTI_THREAD ? 3 : 2);
await page.evaluate(() => {
document.body.querySelector('lynx-view')?.remove();
});
await wait(100);
const threadStrategy = ENABLE_MULTI_THREAD ? 'multi-thread' : 'all-on-ui';
expect(page.workers().length).toBe(1);
await page.evaluate((threadStrategy) => {
const newView = document.createElement('lynx-view');
newView.setAttribute('style', 'height:50vh; width:100vw;');
newView.setAttribute('thread-strategy', threadStrategy);
newView.setAttribute('url', '/dist/api-preheat/main-thread.js');
document.body.append(newView);
}, threadStrategy);

await page.evaluate((threadStrategy) => {
const newView = document.createElement('lynx-view');
newView.setAttribute('style', 'height:50vh; width:100vw;');
newView.setAttribute('thread-strategy', threadStrategy);
newView.setAttribute('url', '/dist/api-preheat/main-thread.js');
document.body.append(newView);
}, threadStrategy);
await wait(500);
expect(page.workers().length).toBe(ENABLE_MULTI_THREAD ? 5 : 3);
});

test('api-setSharedData', async ({ page }, { title }) => {
await goto(page, title);
await wait(100);
Expand All @@ -945,23 +908,23 @@
test('api-shared-context-worker-count', async ({ page }) => {
await goto(page, 'api-setSharedData', 'api-getSharedData');
await wait(100);
expect(page.workers().length).toBeLessThanOrEqual(4);
expect(page.workers().length).toBeLessThanOrEqual(3);
});

test('api-shared-context-worker-count-release', async ({ page }) => {
await goto(page, 'api-setSharedData', 'api-getSharedData');
await wait(100);
expect(page.workers().length).toBeLessThanOrEqual(4);
expect(page.workers().length).toBeLessThanOrEqual(3);
await page.evaluate(() =>
document.body.querySelector('lynx-view')?.remove()
);
await wait(100);
expect(page.workers().length).toBeLessThanOrEqual(3);
expect(page.workers().length).toBeLessThanOrEqual(2);
await page.evaluate(() =>
document.body.querySelector('lynx-view')?.remove()
);
await wait(100);
expect(page.workers().length).toBeLessThanOrEqual(1);
expect(page.workers().length).toBeLessThanOrEqual(0);
});

test.describe('api-exposure', () => {
Expand Down Expand Up @@ -3921,7 +3884,7 @@
textareaDom?.setSelectionRange(2, 5);
});
const result = await page.locator('.result').first().innerText();
expect(result).toBe('2-5');

Check failure on line 3887 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright (Default) / check

[webkit] › tests/react.spec.ts:3873:7 › reactlynx3 tests › elements › x-textarea › basic-element-x-textarea-bindselection

2) [webkit] › tests/react.spec.ts:3873:7 › reactlynx3 tests › elements › x-textarea › basic-element-x-textarea-bindselection Error: expect(received).toBe(expected) // Object.is equality Expected: "2-5" Received: "" 3885 | }); 3886 | const result = await page.locator('.result').first().innerText(); > 3887 | expect(result).toBe('2-5'); | ^ 3888 | }, 3889 | ); 3890 | at /__w/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:3887:26
},
);

Expand Down

This file was deleted.

This file was deleted.

9 changes: 7 additions & 2 deletions packages/web-platform/web-worker-runtime/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
// LICENSE file in the root directory of this source tree.

import { startBackgroundThread } from './backgroundThread/index.js';
import { startMainThreadWorker } from './mainThread/startMainThread.js';

export interface WorkerStartMessage {
mode: 'main' | 'background';
toPeerThread: MessagePort;
toUIThread: MessagePort;
}

globalThis.onmessage = (ev) => {
globalThis.onmessage = async (ev) => {
const { mode, toPeerThread, toUIThread } = ev
.data as WorkerStartMessage;
if (mode === 'main') {
const { startMainThreadWorker } = await import(
/* webpackChunkName: "web-worker-runtime-main-thread" */
/* webpackMode: "lazy-once" */
/* webpackPreload: true */
'./mainThread/startMainThread.js'
);
startMainThreadWorker(toUIThread, toPeerThread);
} else {
startBackgroundThread(toUIThread, toPeerThread);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ import { OffscreenDocument } from '@lynx-js/offscreen-document/webworker';
import { _onEvent } from '@lynx-js/offscreen-document/webworker';
import { registerUpdateDataHandler } from './crossThreadHandlers/registerUpdateDataHandler.js';

const { prepareMainThreadAPIs } = await import(
/* webpackChunkName: "web-core-main-thread-apis" */
/* webpackMode: "lazy-once" */
/* webpackPreload: true */
/* webpackPrefetch: true */
/* webpackFetchPriority: "high" */
'@lynx-js/web-mainthread-apis'
);
export async function startMainThreadWorker(
uiThreadPort: MessagePort,
backgroundThreadPort: MessagePort,
) {
const { prepareMainThreadAPIs } = await import(
'@lynx-js/web-mainthread-apis'
);
const uiThreadRpc = new Rpc(uiThreadPort, 'main-to-ui');
const backgroundThreadRpc = new Rpc(backgroundThreadPort, 'main-to-bg');
const { markTimingInternal, flushMarkTimingInternal } =
Expand Down
Loading