Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision ede87c6a5f0d54fbb88873625f5058e3f072cf1b)
+++ Jenkinsfile	(revision f15fe0a1f735a1835eace55776b7074833013644)
@@ -153,5 +153,5 @@
 		dir (BuildDir) {
 			//Append bench results
-			sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
+			sh "make --no-print-directory -C benchmark jenkins"
 		}
 	}
@@ -177,7 +177,33 @@
 
 		if( !Settings.Publish ) return
+		if( !Settings.RunBenchmark ) {
+			echo 'No results to publish!!!'
+			return
+		}
 
 		//Then publish the results
-		sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
+		plot csvFileName: "cforall-${env.BRANCH_NAME}-compilation.csv",
+			csvSeries: [[file: "${BuildDir}/benchmark/compile.csv"]],
+			group: 'Compilation',
+			title: 'Compilation',
+			style: 'line'
+
+		plot csvFileName: 'cforall-${env.BRANCH_NAME}-ctxswitch.csv',
+			csvSeries: [[file: "${BuildDir}/benchmark/ctxswitch.csv"]],
+			group: 'Concurrency',
+			title: 'Context Switching',
+			style: 'line'
+
+		plot csvFileName: 'cforall-${env.BRANCH_NAME}-mutex.csv',
+			csvSeries: [[file: "${BuildDir}/benchmark/mutex.csv"]],
+			group: 'Concurrency',
+			title: 'Mutual Exclusion',
+			style: 'line'
+
+		plot csvFileName: 'cforall-${env.BRANCH_NAME}-signal.csv',
+			csvSeries: [[file: "${BuildDir}/benchmark/signal.csv"]],
+			group: 'Concurrency',
+			title: 'Internal and External Scheduling',
+			style: 'line'
 	}
 }