diff --git a/tests/stress/codec.js b/tests/stress/codec.js index 29276cab8c..1a9ceb67ab 100644 --- a/tests/stress/codec.js +++ b/tests/stress/codec.js @@ -11,6 +11,6 @@ msgpack = { bison = require('bison'); -module.exports = json; +//module.exports = json; //module.exports = msgpack; module.exports = bison; diff --git a/tests/stress/pubsub/pub.js b/tests/stress/pubsub/pub.js index 731b4479c2..01e30e65aa 100644 --- a/tests/stress/pubsub/pub.js +++ b/tests/stress/pubsub/pub.js @@ -1,6 +1,7 @@ 'use strict'; var freemem = require('os').freemem; +var profiler = require('v8-profiler'); var codec = require('../codec'); var sent = 0; @@ -16,7 +17,7 @@ var pub = require('redis').createClient(null, null, { process.nextTick(exec); }); -var payload = '1'; for (var i = 0; i < 10; ++i) payload += payload; +var payload = '1'; for (var i = 0; i < 12; ++i) payload += payload; function exec() { pub.publish('timeline', codec.encode({ foo: payload })); @@ -26,8 +27,11 @@ function exec() { } } +profiler.takeSnapshot('s_0'); + exec(); setInterval(function() { - console.log('sent', sent, 'free', freemem(), 'cmdqlen', pub.command_queue.length, 'offqlen', pub.offline_queue.length); -}, 1000); + profiler.takeSnapshot('s_' + sent); + console.error('sent', sent, 'free', freemem(), 'cmdqlen', pub.command_queue.length, 'offqlen', pub.offline_queue.length); +}, 2000); diff --git a/tests/stress/pubsub/run b/tests/stress/pubsub/run index 5b50d70712..067cb71dd2 100755 --- a/tests/stress/pubsub/run +++ b/tests/stress/pubsub/run @@ -1,3 +1,5 @@ #!/bin/sh node server.js & -node pub.js +node server.js & +node server.js & +node --debug pub.js diff --git a/tests/stress/pubsub/server.js b/tests/stress/pubsub/server.js index 568e275c22..035e6b7440 100644 --- a/tests/stress/pubsub/server.js +++ b/tests/stress/pubsub/server.js @@ -3,6 +3,7 @@ var freemem = require('os').freemem; var codec = require('../codec'); +var id = Math.random(); var recv = 0; var sub = require('redis').createClient() @@ -18,5 +19,5 @@ var sub = require('redis').createClient() }); setInterval(function() { - console.log('received', recv, 'free', freemem()); -}, 1000); + console.error('id', id, 'received', recv, 'free', freemem()); +}, 2000); diff --git a/tests/stress/rpushblpop/pub.js b/tests/stress/rpushblpop/pub.js index 503ffb17dc..000458711f 100644 --- a/tests/stress/rpushblpop/pub.js +++ b/tests/stress/rpushblpop/pub.js @@ -1,6 +1,7 @@ 'use strict'; var freemem = require('os').freemem; +//var profiler = require('v8-profiler'); var codec = require('../codec'); var sent = 0; @@ -17,7 +18,8 @@ var pub = require('redis').createClient(null, null, { process.nextTick(exec); }); -var payload = '1'; for (var i = 0; i < 10; ++i) payload += payload; +var payload = '1'; for (var i = 0; i < 12; ++i) payload += payload; +console.log(payload.length); function exec() { pub.rpush('timeline', codec.encode({ foo: payload })); @@ -27,13 +29,21 @@ function exec() { } } +//profiler.takeSnapshot('s_0'); + exec(); setInterval(function() { + //var ss = profiler.takeSnapshot('s_' + sent); + //console.error(ss.stringify()); pub.llen('timeline', function(err, result) { - console.log('sent', sent, 'free', freemem(), + console.error('sent', sent, 'free', freemem(), 'cmdqlen', pub.command_queue.length, 'offqlen', pub.offline_queue.length, 'llen', result ); }); -}, 1000); +}, 2000); + +/*setTimeout(function() { + process.exit(); +}, 30000);*/ diff --git a/tests/stress/rpushblpop/run b/tests/stress/rpushblpop/run index 5b50d70712..5f9073074a 100755 --- a/tests/stress/rpushblpop/run +++ b/tests/stress/rpushblpop/run @@ -1,3 +1,6 @@ #!/bin/sh node server.js & -node pub.js +node server.js & +node server.js & +node server.js & +node --debug pub.js diff --git a/tests/stress/rpushblpop/server.js b/tests/stress/rpushblpop/server.js index 0af0b65624..9cbcdd9ed7 100644 --- a/tests/stress/rpushblpop/server.js +++ b/tests/stress/rpushblpop/server.js @@ -3,8 +3,10 @@ var freemem = require('os').freemem; var codec = require('../codec'); +var id = Math.random(); var recv = 0; +var cmd = require('redis').createClient(); var sub = require('redis').createClient() .on('ready', function() { this.emit('timeline'); @@ -22,5 +24,7 @@ var sub = require('redis').createClient() }); setInterval(function() { - console.log('received', recv, 'free', freemem()); -}, 1000); + cmd.llen('timeline', function(err, result) { + console.error('id', id, 'received', recv, 'free', freemem(), 'llen', result); + }); +}, 2000);