- Code instance now reports CPU usage

DependableSystemsLab · Jun 1, 2018 · 2f1d141 · 2f1d141
1 parent f3edda0
commit 2f1d141
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/core/CodeV3.js b/lib/core/CodeV3.js
@@ -1240,7 +1240,7 @@ var MasterIPCHandler = {
 		});
 	},
 	'stats': function(proc, payload){
-		proc.code.pubsub.publish(proc.code.name+'/'+proc.id+'/resource' , { memory: payload });
+		proc.code.pubsub.publish(proc.code.name+'/'+proc.id+'/resource' , payload);
 	},
 	'publish': function(proc, payload){
 		proc.code.pubsub.publish(payload.topic, payload.message);

diff --git a/lib/core/vm.js b/lib/core/vm.js
@@ -11,8 +11,18 @@ process.once('message', function(message){
 		}());
 
 		if (message.options.enableStats){
+			var pidusage = require('pidusage');
 			setInterval(function(){
-				process.send({ ctrl: 'stats', payload: process.memoryUsage() })
+				pidusage.stat(process.pid, function(err, stat) {
+					process.send({ 
+						ctrl: 'stats', 
+						payload: {
+							timestamp: Date.now(),
+							memory: process.memoryUsage(),
+							cpu: stat.cpu
+						}
+					});
+				});
 			}, 1000);
 		}
 	}