[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/loolstat

[Henry Castro]

 loolwsd/loolstat |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 5c7071085160b0dd5d1404f6f4bf659445e01b8e
Author: Henry Castro <hcastro at collabora.com>
Date:   Fri Aug 7 08:10:53 2015 -0400

    loolwsd: update loolstat, socket client and  ...
    
    prisoner

diff --git a/loolwsd/loolstat b/loolwsd/loolstat
index 91e1550..c2f4706 100755
--- a/loolwsd/loolstat
+++ b/loolwsd/loolstat
@@ -75,35 +75,35 @@ $PSTREE -a -c -h -A -p $LOOLWSD_PID;
 # get the number of running processes.
 LOOLWSD=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '^loolwsd,' | $WC -l);
 
-# get the number of running threads.
-LOOLWSD_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '{loolwsd}' | $WC -l);
-
 # get the number of running processes.
 LOOLBROKER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '^loolbroker,' | $WC -l);
 
-# get the number of running threads.
-LOOLBROKER_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '{loolbroker}' | $WC -l);
-
 # get the number of running processes.
 LOOLKIT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '^loolkit,' | $WC -l);
 
-# get the number of running processes.
-LOOLKIT_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '{loolkit}' | $WC -l);
+# get the number of running threads.
+LOOLWSD_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{.*}' | $WC -l);
+
+# get the number of running client socket.
+LOOLWSD_CLIENT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{client_socket}' | $WC -l);
+
+# get the number of running client socket.
+LOOLWSD_PRISIONER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{prision_socket}' | $WC -l);
 
 # get the number of processes swapped out.
-LOOLKIT_SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' | $GREP -o '(loolkit,' | $WC -l);
+LOOLKIT_SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '(.*)' | $WC -l);
 
 # display report stats
 printf "\n %-10s\n" "LOOLWSD STATS";
 printf "==========================\n";
 printf " %-10s %d\n" "Running loolwsd process:" "$LOOLWSD";
 printf " %-10s %d\n" "Running loolwsd threads:" "$LOOLWSD_THREADS";
+printf " %-10s %d\n" "Socket Client   threads:" "$LOOLWSD_CLIENT";
+printf " %-10s %d\n" "Socket Prision  threads:" "$LOOLWSD_PRISIONER";
+printf " %-10s %d\n\n" "Process ... swapped out:" "$LOOLKIT_SWAPPEDOUT";
 $TOP -bn 1 -p $LOOLWSD_PID | $GREP -E 'loolwsd|COMMAND'
-printf " %-10s %d\n" "Running loolbroker process:" "$LOOLBROKER";
-printf " %-10s %d\n" "Running loolbroker threads:" "$LOOLBROKER_THREADS";
+printf "\n %-10s %d\n" "Running loolbroker process:" "$LOOLBROKER";
 $TOP -bn 1 | $GREP -E 'loolbroker|COMMAND'
-printf " %-10s %d\n" "Running LibreOfficeKit process:" "$LOOLKIT";
-printf " %-10s %d\n" "Running LibreOfficeKit threads:" "$LOOLKIT_THREADS";
-printf " %-10s %d\n" "Process LibreOfficeKit swapped out:" "$LOOLKIT_SWAPPEDOUT";
+printf "\n%-10s %d\n" "Running LibreOfficeKit process:" "$LOOLKIT";
 $TOP -bn 1 | $GREP -E 'loolkit|COMMAND'