diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out index f468d1b4d7e65db557c6be7b516132138e365ada..59c38dccd856485165cb36684b4098884610ad45 100644 --- a/basice2e/clients.goldoutput/client12.out +++ b/basice2e/clients.goldoutput/client12.out @@ -1,4 +1,4 @@ -Sending Message to 2: Hello, 2 -Message from 4 Received: Hello, 1 -Sending Message to 2: Hello, 2 -Message from 4 Received: Hello, 1 +Sending Message to 2, Jim: Hello, 2 +Message from 4, Rick Received: Hello, 1 +Sending Message to 2, Jim: Hello, 2 +Message from 4, Rick Received: Hello, 1 diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out index 05ffbe67823b4a779ad970d6c03cb67a13051304..f978dc80eb084c2bd1e13615b6ec08783c28639d 100644 --- a/basice2e/clients.goldoutput/client23.out +++ b/basice2e/clients.goldoutput/client23.out @@ -1,4 +1,4 @@ -Sending Message to 3: Hello, 3 -Message from 1 Received: Hello, 2 -Sending Message to 3: Hello, 3 -Message from 1 Received: Hello, 2 +Sending Message to 3, Ben: Hello, 3 +Message from 1, David Received: Hello, 2 +Sending Message to 3, Ben: Hello, 3 +Message from 1, David Received: Hello, 2 diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out index 00965b60420344fa3d69875a8896bc8d328070db..535a51fe4ef03ed501f55987dcf6ed99f7d0362e 100644 --- a/basice2e/clients.goldoutput/client34.out +++ b/basice2e/clients.goldoutput/client34.out @@ -1,4 +1,4 @@ -Sending Message to 4: Hello, 4 -Message from 2 Received: Hello, 3 -Sending Message to 4: Hello, 4 -Message from 2 Received: Hello, 3 +Sending Message to 4, Rick: Hello, 4 +Message from 2, Jim Received: Hello, 3 +Sending Message to 4, Rick: Hello, 4 +Message from 2, Jim Received: Hello, 3 diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out index a2493454d7641c3fe1aa68a20ef099ff22086729..df9a4f6bb47388814270f1889e198ecaec6c75fc 100644 --- a/basice2e/clients.goldoutput/client41.out +++ b/basice2e/clients.goldoutput/client41.out @@ -1,4 +1,4 @@ -Sending Message to 1: Hello, 1 -Message from 3 Received: Hello, 4 -Sending Message to 1: Hello, 1 -Message from 3 Received: Hello, 4 +Sending Message to 1, David: Hello, 1 +Message from 3, Ben Received: Hello, 4 +Sending Message to 1, David: Hello, 1 +Message from 3, Ben Received: Hello, 4 diff --git a/basice2e/run.sh b/basice2e/run.sh index ba1250247ff1357034c55c0368444476a5350311..10d5efb1c3c864a68ba5488d4189b69a8579492e 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -46,7 +46,10 @@ sleep 20 # FIXME: We should not need this, but the servers don't respond quickly # enough on boot right now. LASTNODE="localhost:50004" - +NICK1="David" +NICK2="Jim" +NICK3="Ben" +NICK4="Rick" echo "STARTING CLIENTS..." CTR=0 @@ -60,7 +63,8 @@ do for nid in 1 do nid=$((($cid % 4) + 1)) - CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\"" + NICK=NICK${cid} + CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}" eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 & RETVAL=$! eval CLIENTS${CTR}=$RETVAL @@ -86,7 +90,8 @@ do for nid in 1 do nid=$((($cid % 4) + 1)) - CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\"" + NICK=NICK${cid} + CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}" eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 & RETVAL=$! eval CLIENTS${CTR}=$RETVAL