@@ -18,10 +18,10 @@ swapPerfFile=${OUTDIR}/`date +%Y-%m-%d`"-sisoPerf_"$mach".csv"
18
18
19
19
# headers
20
20
cpuheader=' time(s)'
21
- head -n 33 /proc/stat | tail -n 32 | awk -F' ' ' OFS="," {print $1}' > tmpfile
21
+ head -n 33 /proc/stat | awk -F' ' ' OFS="," {print $1}' > tmpfile
22
22
cpuheader=$cpuheader ,` ./transpose.sh tmpfile`
23
23
rm tmpfile
24
- memheader=' time(s),MemTotal,MemFree,Cached,Writeback'
24
+ memheader=' time(s),MemTotal,MemFree,Cached,Writeback,RSS '
25
25
topheader=' time(s),PID,USER,RES,%CPU,%MEM,COMMAND'
26
26
netheader=' time(s),dev,bytes,packets,errs,drop'
27
27
sisoheader=' time(s),si,so'
@@ -48,14 +48,15 @@ function echoLine {
48
48
then
49
49
line=` cat $1 `
50
50
echo $(( `date +% s` - $2 )) ,$6 ,$line >> $3
51
+ else
52
+ line=` cat $1 `
53
+ echo $(( `date +% s` - $2 )) ,$line >> $3
51
54
fi
52
- line=` cat $1 `
53
- echo $(( `date +% s` - $2 )) ,$line >> $3
54
55
else
55
56
if [ $5 ]
56
57
then
57
58
line=` ./transpose.sh $1 | awk -F, ' OFS="," {print $1,$2,$4,$17}' `
58
- echo $(( `date +% s` - $2 )) ,$line >> $3
59
+ echo $(( `date +% s` - $2 )) ,$line , $6 >> $3
59
60
else
60
61
line=` ./transpose.sh $1 `
61
62
echo $(( `date +% s` - $2 )) ,$line >> $3
86
87
87
88
start=` cat starttime`
88
89
while : ; do
90
+ h2oPID=` ps -efww | grep h2o | grep 0xdiag| grep jar| awk ' {print $2}' | xargs`
91
+ if [ -z $h2oPID ]
92
+ then
93
+ continue
94
+ fi
95
+
89
96
# dump raw logs first
90
97
ts=` date +" %Y-%m-%d-%H-%M-%S" `
91
98
cat /proc/stat >> ${rawLogs} /procstat/${ts} _procstat_${mach}
@@ -94,13 +101,13 @@ while :; do
94
101
vmstat >> ${rawLogs} /vmstat/${ts} _vmstat_${mach}
95
102
top -b -n 1 >> ${rawLogs} /top/${ts} _top_${mach}
96
103
a=1
97
- for i in {0..34 }
104
+ for i in {0..35 }
98
105
do
99
106
TOTALS[$i ]=0
100
107
done
101
108
while read -a CPU
102
109
do a=$(( $a + 1 )) ;
103
- if [ $a -eq 34 ]
110
+ if [ $a -eq 35 ]
104
111
then
105
112
break
106
113
fi
@@ -128,7 +135,7 @@ while :; do
128
135
echo $(( `date +% s` - $start )) ,$linecpu >> $cpuPerfFile
129
136
echo $(( `date +% s` - $start )) ,$lineidle >> $idlePerfFile
130
137
echo $(( `date +% s` - $start )) ,$lineiowait >> $iowaitPerfFile
131
-
138
+ RSS= ` ps v $h2oPID | awk -F ' ' ' OFS="," {print $8} ' | tail -n 1 `
132
139
cat /proc/meminfo | awk -F' ' ' OFS="," {gsub(":","", $1); print $2}' > bmemTMP
133
140
echo $pwd
134
141
devstat=
@@ -140,13 +147,13 @@ while :; do
140
147
esac
141
148
grep $devstat /proc/net/dev | awk -F' ' ' OFS="," {print $2,$3,$4,$5}' > brecTMP
142
149
grep $devstat /proc/net/dev | awk -F' ' ' OFS="," {print $10,$11,$12,$13}' > btraTMP
143
- echoLine bmemTMP $start $memPerfFile 1 1
150
+ echoLine bmemTMP $start $memPerfFile 1 1 $RSS
144
151
echoLine brecTMP $start $netReceivePerfFile 0 1 $devstat
145
152
echoLine btraTMP $start $netTransmitPerfFile 0 1 $devstat
146
153
# get top 10 processes from top and then just store them, may/not be interesting...
147
154
ti=" $(( `date +% s` - ${start} )) "
148
155
top -b | head -n 17 | tail -n 10 | awk -v t=$ti -F' ' ' OFS="," {print t,$1,$2,$6,$9,$10,$12}' >> $topPerfFile
149
156
vmstat | tail -n 1 | awk -v t=$ti -F' ' ' OFS="," {print t,$7,$8}' >> $swapPerfFile
157
+ perf stat -x, -e instructions,cycles,cache-references,cache-misses,faults -a -o bTMP -p $h2oPID sleep 10
150
158
rm b* TMP
151
- sleep 10
152
159
done
0 commit comments