Refactor profiling system

Author: Unitech

lib/probes/profiling.js

@@ -30,7 +30,7 @@ Profiling.exposeProfiling = function(pmx, profiler_path) {
    * Heap snapshot
    */
   pmx.action('km:heapdump', function(reply) {
-    var dump_file = path.join(os.tmpDir(), Date.now() + '.heapsnapshot');
+    var dump_file = path.join(os.tmpdir(), Date.now() + '.heapsnapshot');
 
     var snapshot = profiler.takeSnapshot('km-heap-snapshot');
     var buffer    = '';
@@ -64,7 +64,7 @@ Profiling.exposeProfiling = function(pmx, profiler_path) {
    * CPU profiling snapshot
    */
   var ns_cpu_profiling        = 'km-cpu-profiling';
-  var cpu_dump_file = path.join(os.tmpDir(), Date.now() + '.cpuprofile');
+  var cpu_dump_file = path.join(os.tmpdir(), Date.now() + '.cpuprofile');
 
   pmx.action('km:cpu:profiling:start', function(reply) {
     profiler.startProfiling(ns_cpu_profiling);
@@ -94,19 +94,24 @@ Profiling.exposeProfiling = function(pmx, profiler_path) {
 /**
  * Discover v8-profiler
  */
-Profiling.detectV8Profiler = function(cb) {
+Profiling.detectV8Profiler = function(module_name, cb) {
   var require_paths = require.main.paths.slice();
 
   (function look_for_profiler(require_paths) {
-    if (!require_paths[0])
-      return cb(new Error('Module not found'));
-
-    var profiler_path = path.join(require_paths[0], 'v8-profiler');
-
-    fs.exists(profiler_path, function(exist) {
-      if (exist)
+    if (!require_paths[0]) {
+      debug('[x] %s NOT FOUND', module_name);
+      return cb(new Error('v8-profiler not found'));
+    }
+    var profiler_path = path.join(require_paths[0], module_name);
+
+    debug('Checking %s in path %s', module_name, profiler_path);
+    fs.access(profiler_path, fs.R_OK || fs.constants.R_OK, function(err) {
+      if (!err) {
+        debug('[+] %s detected in path %s', module_name, profiler_path);
         return cb(null, profiler_path);
+      }
 
+      debug('[-] %s not found in path %s', module_name, profiler_path);
       require_paths.shift();
       return look_for_profiler(require_paths);
     });
@@ -115,9 +120,14 @@ Profiling.detectV8Profiler = function(cb) {
 };
 
 Profiling.v8Profiling = function(pmx) {
-  Profiling.detectV8Profiler(function(err, profiler_path) {
-    if (err)
-      return false;
+  Profiling.detectV8Profiler('v8-profiler', function(err, profiler_path) {
+    if (err) {
+      return Profiling.detectV8Profiler('v8-profiler-node8', function(err, profiler_path) {
+        if (err)
+          return false;
+        return Profiling.exposeProfiling(pmx, profiler_path);
+      });
+    }
     return Profiling.exposeProfiling(pmx, profiler_path);
   });
 };