diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-05-11 10:38:45 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-05-11 10:38:45 -0700 |
| commit | e40b8e34c81349e12a373931ab01ec78f657d80d (patch) | |
| tree | 0e76aa909040776af68b036edc143a91b163833b /src/mem/ruby/network | |
| parent | 8b9f70b9e4315b2780d1bf0f5f5af1f275604a8c (diff) | |
| download | gem5-e40b8e34c81349e12a373931ab01ec78f657d80d.tar.xz | |
ruby: clean up a few warnings
Diffstat (limited to 'src/mem/ruby/network')
| -rw-r--r-- | src/mem/ruby/network/orion/NetworkPower.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/PerfectSwitch.cc | 1 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Topology.cc | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc index 9d10d5136..e9e1dc4ab 100644 --- a/src/mem/ruby/network/orion/NetworkPower.cc +++ b/src/mem/ruby/network/orion/NetworkPower.cc @@ -159,7 +159,7 @@ double SIM_reg_stat_energy(power_array_info *info, power_array *arr, double n_re //crossbar double SIM_crossbar_stat_energy(power_crossbar *crsbar, double n_data) { - double Eavg = 0, Eatomic, Estatic; + double Eavg = 0, Eatomic; if (n_data > crsbar->n_out) { n_data = crsbar->n_out; diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 02725148f..59f1d85ca 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/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index 7c52af1ce..177bf3929 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -57,7 +57,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); |