Merge iceaxe.:/Volumes/work/research/m5/head

into  iceaxe.:/Volumes/work/research/m5/merge

src/cpu/simple/base.cc:
src/kern/kernel_stats.cc:
src/kern/kernel_stats.hh:
src/kern/system_events.cc:
src/kern/system_events.hh:
src/python/m5/objects/System.py:
src/sim/system.cc:
src/sim/system.hh:
    hand merge

--HG--
rename : build/SConstruct => SConstruct
rename : SConscript => src/SConscript
rename : arch/alpha/freebsd/system.cc => src/arch/alpha/freebsd/system.cc
rename : arch/alpha/linux/system.cc => src/arch/alpha/linux/system.cc
rename : arch/alpha/linux/system.hh => src/arch/alpha/linux/system.hh
rename : arch/alpha/system.cc => src/arch/alpha/system.cc
rename : arch/alpha/tru64/system.cc => src/arch/alpha/tru64/system.cc
rename : base/statistics.cc => src/base/statistics.cc
rename : base/statistics.hh => src/base/statistics.hh
rename : base/stats/mysql.cc => src/base/stats/mysql.cc
rename : base/stats/mysql.hh => src/base/stats/mysql.hh
rename : base/stats/statdb.cc => src/base/stats/statdb.cc
rename : base/stats/statdb.hh => src/base/stats/statdb.hh
rename : base/stats/text.cc => src/base/stats/text.cc
rename : base/stats/text.hh => src/base/stats/text.hh
rename : cpu/simple/cpu.cc => src/cpu/simple/base.cc
rename : kern/kernel_stats.cc => src/kern/kernel_stats.cc
rename : kern/kernel_stats.hh => src/kern/kernel_stats.hh
rename : kern/system_events.cc => src/kern/system_events.cc
rename : kern/system_events.hh => src/kern/system_events.hh
rename : python/m5/objects/System.py => src/python/m5/objects/System.py
rename : sim/system.cc => src/sim/system.cc
rename : sim/system.hh => src/sim/system.hh
rename : test/stattest.cc => src/unittest/stattest.cc
extra : convert_revision : 4bb576a2bf5e32784efc48030bd776c6c7c29a7c

1 files changed, 2 insertions, 3 deletions

diff --git a/util/stats/info.py b/util/stats/info.py
index 4954b0519..193159b4c 100644
--- a/util/stats/info.py
+++ b/util/stats/info.py
@@ -176,7 +176,7 @@ def WrapValue(value):
 class Statistic(object):
     def __getattr__(self, attr):
         if attr in ('data', 'x', 'y'):
-            result = self.source.data(self, self.bins, self.ticks)
+            result = self.source.data(self, self.ticks)
             self.data = result.data
             self.x = result.x
             self.y = result.y
@@ -185,7 +185,7 @@ class Statistic(object):
     def __setattr__(self, attr, value):
         if attr == 'stat':
             raise AttributeError, '%s is read only' % stat
-        if attr in ('source', 'bins', 'ticks'):
+        if attr in ('source', 'ticks'):
             if getattr(self, attr) != value:
                 if hasattr(self, 'data'):
                     delattr(self, 'data')
@@ -761,7 +761,6 @@ def NewStat(source, data):
         stat = Formula()
 
     stat.__dict__['source'] = source
-    stat.__dict__['bins'] = None
     stat.__dict__['ticks'] = None
     stat.__dict__.update(data.__dict__)