profiling

Author: pgte

package.json

@@ -11,7 +11,7 @@
     "lint": "aegir-lint",
     "benchmarks": "node .",
     "benchmarks:report": "node src/report",
-    "benchmarks:report:profile": "node src/report --profile=true"
+    "benchmarks:report:profile": "sudo node src/report --profile=true"
   },
   "pre-commit": [
     "lint",

src/profile.js

@@ -1,17 +1,71 @@
 'use strict'
 
-const profiler = require('./profiler')
-const argv = require('yargs').argv
+const spawn = require('child_process').spawn
+const split = require('split')
+const url = require('url')
+const path = require('path')
+const mapSeries = require('async/mapSeries')
 
-const suites = argv._
-const outDir = argv.out
-if (!outDir) {
-  throw new Error('please provide an out dir')
+module.exports = profile
+
+function profile (outDir, suites, envs, callback) {
+  mapSeries(envs, (env, callback) => {
+    profileOneEnv(outDir, suites, env, (err, path) => {
+      if (err) {
+        callback(err)
+        return // early
+      }
+
+      callback(null, {
+        env: env,
+        path: path
+      })
+    })
+  }, callback)
 }
 
-profiler(outDir, suites, (err, resultLink) => {
-  if (err) {
-    throw err
-  }
-  process.stdout.write(resultLink)
-})
+function profileOneEnv (baseOutDir, suites, env, callback) {
+  const outDir = path.join(baseOutDir, env)
+  const args = ['--output-dir', outDir].concat([process.argv[0], __dirname].concat(suites).concat('--envs=' + env))
+
+  console.log('SPAWNING 0x', args.join(' '))
+  const child = spawn('0x', args, {})
+  let lastLine = ''
+  let error
+  let errorOut = ''
+  let ended = false
+
+  process.once('SIGINT', () => {
+    if (!ended) {
+      console.error('INT')
+      child.kill('SIGINT')
+    }
+  })
+
+  child.stdout.pipe(process.stdout, { end : false })
+
+  child.stderr.pipe(split())
+    .on('data', (line) => {
+      if (line) {
+        lastLine = line
+        errorOut += line + '\n'
+      }
+    })
+    .once('end', () => {
+      console.log('ENDED')
+      ended = true
+      if (!error) {
+        const matched = lastLine.match(/file:\/\/.*\/flamegraph.html/)
+        if (matched) {
+          const resultPath = url.parse(matched[0].replace('file://', 'file:///')).pathname
+          callback(null, path.relative(baseOutDir, resultPath))
+        } else {
+          callback(new Error('0x unexpected output:\n' + errorOut))
+        }
+      }
+    })
+    .once('error', (err) => {
+      error = err
+      callback(err)
+    })
+}

src/profiler.js

@@ -348,6 +348,25 @@ <h4 class="text-center">{{name}}</h4>
                     </div>
                   </div>
 
+                  <div class="panel panel-default">
+                    <div class="panel-heading" role="tab" id="{{suite}}-profile-headingOne">
+                      <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" href="#{{suite}}-profile" aria-expanded="true" aria-controls="{{suite}}-profile">
+                          Profile
+                        </a>
+                      </h4>
+                    </div>
+                    <div id="{{suite}}-profile" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{suite}}-profile-headingOne">
+                      <div class="panel-body container-fluid">
+                        {{#each results}}
+                          {{#if profile}}
+                            <p><a href="{{../suite}}/{{profile}}" target="_blank">{{env}}</a></p>
+                          {{/if}}
+                        {{/each}}
+                      </div>
+                    </div>
+                  </div>
+
                 </div>
               </div>
             </div>

src/report-templates/aggregate.html

@@ -8,9 +8,12 @@ const mkdirp = require('mkdirp')
 const fs = require('fs')
 const argv = require('yargs').argv
 const mapSeries = require('async/mapSeries')
+const eachSeries = require('async/eachSeries')
 const waterfall = require('async/waterfall')
 
 const aggregate = require('./aggregate')
+const profile = require('./profile')
+const envs = require('./run').allEnvironments
 
 const PATTERNS_TO_OBLITERATE = [
   /Swarm listening on .*\n/g,
@@ -27,17 +30,18 @@ if (!suites.length) {
 
 const prefix = (new Date()).toISOString() + '-report'
 const outDir = join(__dirname, '..', 'reports', 'out', prefix)
-mkdirp.sync(outDir)
 const out = join(outDir, 'report.html')
 const resultsJSONPath = join(outDir, 'results.json')
 
+mkdirp.sync(outDir)
+
 mapSeries(
   suites,
   (suite, callback) => {
     waterfall([
       (callback) => {
         // run suite
-        const command = 'node ' + __dirname + ' ' + suite + ' --json'
+        const command = ['node', __dirname, suite, ' --json'].join(' ')
         const child = exec(command, (err, stdout) => {
           console.log(stdout)
           if (err) {
@@ -60,21 +64,37 @@ mapSeries(
           callback(null, result)
           return
         }
-        process.stderr.write(('profiling ' + suite + '\n').yellow)
-        const command = ['node', join(__dirname, 'profile'), suite, '--out', join(outDir, suite)].join(' ')
-        const child = exec(command, (err, stdout) => {
-          if (err) {
-            callback(err)
-          } else {
+
+        eachSeries(envs, (env, callback) => {
+          if (env === 'go') {
+            callback()
+            return // early
+          }
+
+          process.stderr.write(('profiling ' + suite + ', env: ' + env + '\n').yellow)
+          mkdirp.sync(join(outDir, suite, env))
+
+          profile(join(outDir, suite), [suite], [env], (err, profileResults) => {
+            if (err) {
+              callback(err)
+              return // early
+            }
             process.stderr.write('done\n\n'.green)
-            result[0].profile = join(suite, stdout.trim())
+
+            // find suite
+
+            profileResults.forEach((profileResult) => {
+              const envResults = findEnvResultsInResult(result, suite, profileResult.env)
+              envResults.profile = profileResult.path
+            })
+
             callback(null, result)
-          }
+          })
+        }, (err) => {
+          callback(err, result)
         })
-        child.stderr.pipe(process.stderr, { end: false })
       }
-      ],
-      callback)
+    ], callback)
   },
   (err, _results) => {
     if (err) {
@@ -144,3 +164,18 @@ function generateReport (results, callback) {
 function cleanOutput (out) {
   return PATTERNS_TO_OBLITERATE.reduce((out, p) => out.replace(p, ''), out)
 }
+
+function findEnvResultsInResult (result, suite, env) {
+  let found
+  result.suites.forEach((s) => {
+    if (s.suite === suite) {
+      s.results.forEach((result) => {
+        if (result.env === env) {
+          found = result
+        }
+      })
+    }
+  })
+
+  return found
+}