added some anti thrash code for crossing messages

diff --git a/Changes b/Changes
index 68be427915f2ba81d3901b1852b897befe8c168a..409c46efe68b8ba61f623b116c3ded6c20e691bd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 29Jun99=======================================================================
 1. fixed merge command that I broke.
 29Jun99=======================================================================
 1. fixed merge command that I broke.

+2. added some randomness in waittimes for aborted outgoing messages 
+3. made the queueing of messages asymetrical. Both of these to try to 
+minimise thrashing.

 28Jun99=======================================================================
 1. console.pl now works with history and editting.
 2. added scrolling to stuff sent by the cluster.
 28Jun99=======================================================================
 1. console.pl now works with history and editting.
 2. added scrolling to stuff sent by the cluster.

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index e5fa41a8f3bce122e574f0728660d31899875fe9..75b88abc8e450f3fb4934bd0dcae5e14cda262a0 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -134,7 +134,7 @@ sub process
                                $ref->stop_msg($node);
 
                                # delay any outgoing messages that fail
                                $ref->stop_msg($node);
 
                                # delay any outgoing messages that fail

-                               $ref->{waitt} = $main::systime + $waittime if $node ne $main::mycall;
+                               $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;

                        }
                }
                
                        }
                }
                


@@ -273,7 +273,7 @@ sub process
                        } else {
                                $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
                        }
                        } else {
                                $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
                        }

-                       queue_msg(0);
+                       # queue_msg(0);

                        last SWITCH;
                }
                
                        last SWITCH;
                }