Author: sleon
Date: 2006-01-07 18:54:35 +0000 (Sat, 07 Jan 2006)
New Revision: 7803
Modified:
trunk/apps/freeviz/db.py
trunk/apps/freeviz/gen.py
trunk/apps/freeviz/histdata.py
Log:
histogram ommits not updated nodes
Modified: trunk/apps/freeviz/db.py
===================================================================
--- trunk/apps/freeviz/db.py 2006-01-07 18:08:41 UTC (rev 7802)
+++ trunk/apps/freeviz/db.py 2006-01-07 18:54:35 UTC (rev 7803)
@@ -5,7 +5,7 @@
#mport pydot
-uri = 'mysql://twisted:severe at 127.0.0.1/twisted'
+uri = 'mysql://twisted:severe at 127.0.0.1/twisted?cache=False'
con = connectionForURI(uri)
sqlhub.processConnection = con
Modified: trunk/apps/freeviz/gen.py
===================================================================
--- trunk/apps/freeviz/gen.py 2006-01-07 18:08:41 UTC (rev 7802)
+++ trunk/apps/freeviz/gen.py 2006-01-07 18:54:35 UTC (rev 7803)
@@ -110,7 +110,7 @@
if not nstate:
print "got empty nstate list"
- g=pydot.Dot(type='digraph', labelloc='tl', label='Nodes: %s,
Edges: %s' % (nnum, enum) , size='9.0,10.0')
+ g=pydot.Dot(type='digraph', labelloc='tl', label='Nodes: %s,
Edges: %s' % (nnum, enum) )
lastver = self.regver.match( db.getLastVer()).group(1)
@@ -159,7 +159,7 @@
if node_pair.backoffcur_node1 != '0' or
node_pair.backoffcur_node2 != '0':
edgecolor= self.edgeBLOCKED
- gedge = pydot.Edge(node_pair.node1.name ,
node_pair.node2.name, color=edgecolor , fontcolor=edgecolor,
+ gedge = pydot.Edge(node_pair.node1.name ,
node_pair.node2.name, color=edgecolor , fontcolor=edgecolor,
label='d: %0.3f' %
distance, fontsize='9.5',arrowhead='none')
#node1 is tail, node2 is head
if edgecolor == self.edgeBLOCKED:
@@ -184,6 +184,7 @@
print "oldnstate empty!"
g.write_png('/tmp/output.png',prog='dot')
+
self.oldnstate = nstate
# g.write_dot('bla.dot')
@@ -199,22 +200,11 @@
# </body>
# </html>
# """
-
oldnstate={}
-while(True):
- generator = Generator(oldnstate)
- generator.gentopology()
- histogram.gen()
- oldnstate = generator.oldnstate
- del generator
- del histogram
-
- del handler
- del db
- time.sleep(100)
- print "iter"
- import histogram
- import db
- import handler
-
+#while(True):
+generator = Generator(oldnstate)
+generator.gentopology()
+histogram.gen()
+oldnstate = generator.oldnstate
+#time.sleep(60)
Modified: trunk/apps/freeviz/histdata.py
===================================================================
--- trunk/apps/freeviz/histdata.py 2006-01-07 18:08:41 UTC (rev 7802)
+++ trunk/apps/freeviz/histdata.py 2006-01-07 18:54:35 UTC (rev 7803)
@@ -1,19 +1,40 @@
import db
+import handler
#returns the list of the form
#[({'identity':'dasdas','location':'0.31231'},{:,:}),...]
def get():
data=[]
connections = list(db.NodePair.select())
+
+ nodes = list(handler.get_activenodes())
+ lastver = db.getLastVer()
+
+ goodnodes=[]
+ for node in nodes:
+ if node.version >= lastver:
+ goodnodes.append(node.id)
+ else:
+ print("%s is bad!" % node.name)
+
+ print "good nodes are:"
+ print goodnodes
for conn in connections:
- left={}
- right={}
- left['identity'] = conn.node1.identity
- left['location'] = conn.node1.location
+ if conn.node1.id in goodnodes and conn.node2.id in goodnodes:
- right['identity'] = conn.node2.identity
- right['location'] = conn.node2.location
- data.append( (left, right) )
+ left={}
+ right={}
+ left['identity'] = conn.node1.identity
+ left['location'] = conn.node1.location
+
+ right['identity'] = conn.node2.identity
+ right['location'] = conn.node2.location
+ data.append( (left, right) )
+ else:
+ print ('Droping conn: %s-%s' %
(conn.node1.name,conn.node2.name) )
+
return data
+
+
