Skip to content
Snippets Groups Projects
Commit cb382b0a authored by Rick Carback's avatar Rick Carback
Browse files

Stop sorting client output, as we can control the order now

parent dd9c97ec
No related branches found
No related tags found
No related merge requests found
Message from 31, #general Received: Channel, Hello
Message from 4, Rick Received: Hello, 1
Sending Message to 2, Jim: Hello, 2
Message from 31, #general Received: Channel, Hello
Sending Message to 2, Jim: Hello, 2
Message from 4, Rick Received: Hello, 1
Message from 1, David Received: Hello, 2
Message from 31, #general Received: Channel, Hello
Sending Message to 3, Ben: Hello, 3
Message from 31, #general Received: Channel, Hello
Sending Message to 3, Ben: Hello, 3
Message from 1, David Received: Hello, 2
Message from 2, Jim Received: Hello, 3
Message from 31, #general Received: Channel, Hello
Sending Message to 4, Rick: Hello, 4
Message from 31, #general Received: Channel, Hello
Sending Message to 4, Rick: Hello, 4
Message from 2, Jim Received: Hello, 3
Message from 31, #general Received: Channel, Hello
Message from 3, Ben Received: Hello, 4
Sending Message to 1, David: Hello, 1
Message from 31, #general Received: Channel, Hello
Sending Message to 1, David: Hello, 1
Message from 3, Ben Received: Hello, 4
Message from 31, #general Received: Channel, Hello
Sending Message to 31, #general: Channel, Hello
Message from 31, #general Received: Channel, Hello
......@@ -93,15 +93,15 @@ runclients() {
CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#general\" --numnodes 5 -s $LASTNODE -f blobchannel --noratchet"
eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
PIDVAL=$!
echo "$CHANNELCMD -- $PIDVAL"
echo $PIDVAL >> results/serverpids
echo "$CHANNELCMD -- $PIDVAL"
# Start a dummy client
DUMMYCMD="../bin/client -i 35 -d 35 -s $LASTNODE --numnodes 5 -m \"dummy\" --nick \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy"
eval $DUMMYCMD >> $DUMMYOUT 2>&1 &
PIDVAL=$!
echo "$DUMMYCMD -- $PIDVAL"
echo $PIDVAL >> results/serverpids
echo "$DUMMYCMD -- $PIDVAL"
# Send a channel message that all clients will receive
CLIENTCMD="timeout 60s ../bin/client -f blob5 --numnodes 5 -s $LASTNODE -i 5 -d 31 -m \"Channel, Hello\" --nick Spencer --noratchet"
......@@ -121,9 +121,7 @@ runclients
for F in $(find results/clients -type f)
do
cat $F | grep -v "[Rr]atcheting" > $F.tmp
# Sort the messages, as we don't care if they arrive out of order
sort $F.tmp > $F
rm $F.tmp
mv $F.tmp $F
done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment