Skip to content

Commit

Permalink
v5.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
austinksmith committed Oct 13, 2023
1 parent bf7f8d7 commit cf51f5f
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 43 deletions.
36 changes: 23 additions & 13 deletions build/hamsters.node.min.js

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

2 changes: 1 addition & 1 deletion build/hamsters.node.min.js.map

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions build/hamsters.web.min.js

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

2 changes: 1 addition & 1 deletion build/hamsters.web.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -3,7 +3,7 @@
"author": "Austin K Smith",
"description": "100% Vanilla Javascript Multithreading & Parallel Execution Library",
"homepage": "http://www.hamsters.io/",
"version": "5.4.3",
"version": "5.4.4",
"main": "build/hamsters.node.min.js",
"scripts": {
"build": "rm -rf ./build && webpack --config ./hamsters.webpack.config.js && npm run copy-common",
Expand Down
2 changes: 1 addition & 1 deletion src/core/data.js
Expand Up @@ -83,7 +83,7 @@ class data {
let i = 0;
let outputLength = output.length;
for (i; i < outputLength; i++) {
task.input.array[(index.start + i)] = output[i];
task.output[(index.start + i)] = output[i];
}
}

Expand Down
13 changes: 6 additions & 7 deletions src/core/pool.js
Expand Up @@ -37,7 +37,6 @@ class pool {
* @param {function} reject - onError method
*/
addWorkToPending(index, task, resolve, reject) {
debugger;
if(hamstersHabitat.debug) {
task.scheduler.metrics.threads[task.scheduler.count].enqueued_at = Date.now();
}
Expand Down Expand Up @@ -174,15 +173,15 @@ class pool {
* @param {function} resolve - onSuccess method
*/
returnOutputAndRemoveTask(task, resolve) {
if (task.sort) {
resolve(hamstersData.sortOutput(task.input.array, task.sort));
} else {
resolve(task.input.array);
}
if(hamstersHabitat.debug) {
task.scheduler.metrics.completed_at = Date.now();
console.info("Hamsters.js Task Completed: ", task);
}
if (task.sort) {
resolve(hamstersData.sortOutput(task.output, task.sort));
} else {
resolve(task.output);
}
}

removeFromRunning(task, threadId) {
Expand All @@ -200,7 +199,7 @@ class pool {
if(task.scheduler.threads !== 1) {
hamstersData.addThreadOutputWithIndex(task, index, output);
} else {
task.input.array = output;
task.output = output;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/hamsters.js
Expand Up @@ -22,7 +22,7 @@ class hamstersjs {
constructor() {
'use strict';

this.version = '5.4.3';
this.version = '5.4.4';
this.habitat = hamstersHabitat;
this.data = hamstersData;
this.pool = hamstersPool;
Expand Down Expand Up @@ -78,6 +78,7 @@ class hamstersjs {
hamstersTask(params, functionToRun) {
let task = {
input: params,
output: [],
scheduler: {
count: 0,
threads: (params.threads ? params.threads : 1),
Expand All @@ -91,7 +92,6 @@ class hamstersjs {
}
} else {
params.hamstersJob = this.data.prepareFunction(functionToRun);
debugger;
task.scheduler.indexes = params.indexes ? params.indexes : this.data.getSubArrayIndexes(params.array, task.scheduler.threads);
}
if(this.habitat.debug) {
Expand Down
7 changes: 3 additions & 4 deletions tests/hamsters.js
Expand Up @@ -40,8 +40,7 @@ describe("Hamsters.js", () => {
}
}, function (results) {
expect(typeof results).toBe('object');
debugger;
expect(results[i]).toEqual(params.array[i]);
expect(results[i]).toEqual(params.array[i] * 2);
done();
}, function (error) {
console.error(error);
Expand All @@ -57,11 +56,11 @@ describe("Hamsters.js", () => {

hamsters.promise(params, function () {
for (let j = 0; j < params.array.length; j++) {
rtn.data.push(params.array[j] * 2);
rtn.data.push(params.array[j] * 4);
}
}).then(function (results) {
expect(typeof results).toBe('object');
expect(results[i]).toEqual(params.array[i]);
expect(results[i]).toEqual(params.array[i] * 4);
done();
}).catch(function (error) {
console.error(error);
Expand Down

0 comments on commit cf51f5f

Please sign in to comment.