Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: transfer from worker fixed #455

Merged
merged 13 commits into from
Jun 28, 2024
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
8 changes: 4 additions & 4 deletions examples/webpack5/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"solid-js": "^1.8.7",
"workerpool": "8.0.0"
"workerpool": "^9.1.2"
},
"devDependencies": {
"@babel/core": "^7.23.5",
Expand Down
64 changes: 50 additions & 14 deletions examples/webpack5/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,57 @@ function App() {
};
result.appendChild(a);
};

const createArray = () => {
const size = parseInt(inputArraySize());
const results = document.getElementById('arrayResults')!;
const result = document.createElement('div');
results.appendChild(result);
const p = document.createElement('p')!;
const promise = pool.exec('createArray', [size], { on: function (array) {
const p = document.createElement('p');
p.innerHTML = `Array of size ${array.buffer.byteLength} bytes is created in the worker.`;
result.appendChild(p);
}}).then(function (f) {
const p = document.createElement('p');
if (f) {
p.innerHTML = 'Ok. Array has been transferred.';
}
else {
p.innerHTML = '<b>Warning. Array has been cloned.<b>';
}
result.appendChild(p);
}).catch(function (error) {
result.innerHTML = `${error}`;
});

};

const [inputValue, setInputValue] = createSignal('30')
return <section>
Calculate fibonacci:
<input type="text" id="input" value={inputValue()} oninput={(e) => setInputValue(e.target.value)} />
<input type="button" id="calculate" value="Calculate" onclick={calculate} />

<p>
Try entering values in the range of 10 to 50.
Verify that the browser stays responsive when working on a large calculation.
We have created 3 workers, so the worker pool will handle a maximum of three
tasks at a time. When exceeding this, tasks will be put in a queue.
</p>

<div id="results"></div>
</section>
const [inputArraySize, setArraySize] = createSignal('100')

return <div>
<section>
<h4>Calculate fibonacci:</h4>
<input type="text" id="input" value={inputValue()} oninput={(e) => setInputValue(e.target.value)} />
<input type="button" id="calculate" value="Calculate" onclick={calculate} />

<p>
Try entering values in the range of 10 to 50.
Verify that the browser stays responsive when working on a large calculation.
We have created 3 workers, so the worker pool will handle a maximum of three
tasks at a time. When exceeding this, tasks will be put in a queue.
</p>
<div id="results"></div>
</section>
<section>
<h4>Test transferring array from a worker:</h4>
Input array size:
<input type="text" id="inputArraySize" value={inputArraySize()} oninput={(e) => setArraySize(e.target.value)} />
<input type="button" id="createArray" value="Create array!" onclick={createArray} />
<div id="arrayResults"></div>
</section>
</div>
}

export default App
23 changes: 21 additions & 2 deletions examples/webpack5/src/worker/worker.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
import workerpool from 'workerpool'
import { arrayBuffer } from 'stream/consumers';
import workerpool, { worker } from 'workerpool'

// a deliberately inefficient implementation of the fibonacci sequence
function fibonacci(n: number): number {
if (n < 2) return n;
return fibonacci(n - 2) + fibonacci(n - 1);
}

// As ArrayBuffer.prototype.detached is a rather recent feature it is not used here.
function isDetached (buffer: ArrayBuffer) : boolean {
try {
const array = new Uint8Array (buffer);
return false;
}
catch (error) {
return true;
}
}

function createArray(size: number) : boolean {
const array = size > 0 ? new Uint8Array(size) : new Uint8Array();
workerpool.workerEmit(new workerpool.Transfer(array, [array.buffer]));
return isDetached(array.buffer);
}

// create a worker and register public functions
workerpool.worker({
fibonacci: fibonacci
fibonacci: fibonacci,
createArray: createArray
});
2 changes: 1 addition & 1 deletion src/generated/embeddedWorker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if (typeof self !== 'undefined' && typeof postMessage === 'function' && typeof a
callback(message.data);
})
};
worker.send = function (message) {
postMessage(message);
worker.send = function (message, transfer) {
transfer ? postMessage(message, transfer) : postMessage (message);
};
}
else if (typeof process !== 'undefined') {
Expand Down