Merge pull request #90 from daniel-thompson/dev/out-of-box-experience
Minor improvements to the out-of-box experience
diff --git a/ipynb/tutorial/05_TrappyUsage.ipynb b/ipynb/tutorial/05_TrappyUsage.ipynb
index 8b9ce44..02bc2d6 100644
--- a/ipynb/tutorial/05_TrappyUsage.ipynb
+++ b/ipynb/tutorial/05_TrappyUsage.ipynb
@@ -348,7 +348,7 @@
],
"source": [
"# Let's have a look at the generated file\n",
- "!ls -la"
+ "!ls -la example_results"
]
},
{
@@ -384,7 +384,7 @@
],
"source": [
"logging.info(\"Example of (formatted) 'sched_switch' event:\")\n",
- "with open('./trace.txt', 'r') as fh:\n",
+ "with open('./example_results/trace.txt', 'r') as fh:\n",
" for line in fh:\n",
" if line.find('sched_switch') == -1:\n",
" continue\n",
@@ -417,7 +417,7 @@
],
"source": [
"logging.info(\"Example of (raw) 'sched_switch' event:\")\n",
- "with open('./trace.raw.txt', 'r') as fh:\n",
+ "with open('./example_results/trace.raw.txt', 'r') as fh:\n",
" for line in fh:\n",
" if line.find('sched_switch') == -1:\n",
" continue\n",
@@ -4401,17 +4401,6 @@
]
},
{
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "trappy.ILinePlot()"
- ]
- },
- {
"cell_type": "markdown",
"metadata": {},
"source": [
@@ -4728,6 +4717,8 @@
}
],
"source": [
+ "import pandas as pd\n",
+ "\n",
"# Now we can get group by frequency and sum the partional residency times\n",
"freq_residencies = df.groupby('frequency')['delta'].sum()\n",
"logging.info(\"Residency time per OPP:\")\n",
@@ -4763,7 +4754,7 @@
"tot = sum(freq_residencies)\n",
"#df = df.apply(lambda delta : 100*delta/tot)\n",
"for f in freq_residencies.index:\n",
- " logging.info(\"Freq %10dHz : %5.1f%%\", f, 100*freqs[f]/tot)"
+ " logging.info(\"Freq %10dHz : %5.1f%%\", f, 100*freq_residencies[f]/tot)"
]
},
{
diff --git a/src/shell/lisa_shell b/src/shell/lisa_shell
index 5cce736..3b8098d 100644
--- a/src/shell/lisa_shell
+++ b/src/shell/lisa_shell
@@ -122,7 +122,7 @@
function _lisa-ipython-start {
# Get IP address for the specified interface
-IPADDR=$(ifconfig $NETIF 2>/dev/null | \
+IPADDR=$(/sbin/ifconfig $NETIF 2>/dev/null | \
awk '/inet / {print $2}' | \
sed 's/addr://')
if [ "x$IPADDR" == "x" ]; then