diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
| commit | a7904e2cf341d5452c5622adfcbdcd268d4ab7d1 (patch) | |
| tree | 76c744e731c275b393130b869c2c2944807a77af /src/mem/ruby/network | |
| parent | 5b080ae0463c9644eb81bd923e25139dfe787e6e (diff) | |
| download | gem5-a7904e2cf341d5452c5622adfcbdcd268d4ab7d1.tar.xz | |
ruby: apply some fixes that were overwritten by the recent ruby import.
Diffstat (limited to 'src/mem/ruby/network')
| -rw-r--r-- | src/mem/ruby/network/simple/PerfectSwitch.cc | 1 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Throttle.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Topology.cc | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 4fd9af3eb..b617ae939 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -134,7 +134,6 @@ void PerfectSwitch::wakeup() int highest_prio_vnet = m_virtual_networks-1; int lowest_prio_vnet = 0; int decrementer = 1; - bool schedule_wakeup = false; NetworkMessage* net_msg_ptr = NULL; // invert priorities to avoid starvation seen in the component network diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc index 1cfe88987..ce69c47be 100644 --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -204,8 +204,6 @@ void Throttle::wakeup() // Update the predictor Time current_time = g_eventQueue_ptr->getTime(); while ((current_time - m_last_bandwidth_sample) > ADJUST_INTERVAL) { - double utilization = m_bandwidth_since_sample/double(ADJUST_INTERVAL * getLinkBandwidth()); - // Used less bandwidth m_bash_counter--; diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index 742bfe3cd..3535f790b 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -58,7 +58,7 @@ static const int DEFAULT_BW_MULTIPLIER = 1; // Just to be consistent with above // of the network. // Helper functions based on chapter 29 of Cormen et al. -static Matrix extend_shortest_path(const Matrix& current_dist, Matrix& latencies, Matrix& inter_switches); +static void extend_shortest_path(Matrix& current_dist, Matrix& latencies, Matrix& inter_switches); static Matrix shortest_path(const Matrix& weights, Matrix& latencies, Matrix& inter_switches); static bool link_is_shortest_path_to_node(SwitchID src, SwitchID next, SwitchID final, const Matrix& weights, const Matrix& dist); static NetDest shortest_path_to_node(SwitchID src, SwitchID next, const Matrix& weights, const Matrix& dist); |