Changeset 53

Timestamp:

04/08/05 09:39:01 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Changed store functions, so that they will pop() data off list so experimenting with multiple storethreads can begin

File:

• trunk/daemon/togad.py (modified) (6 diffs)

trunk/daemon/togad.py

@@ -87 +87 @@
                 last_update = 0
 
+                debug_msg( 8, self.binary + ' info "' + filename + '"' )
+
                 for line in os.popen( self.binary + ' info "' + filename + '"' ).readlines():
 
@@ -377 +379 @@
                 # Store metrics somewhere between every 60 and 180 seconds
                 #
-                #STORE_INTERVAL = random.randint( 360, 640 )
-                STORE_INTERVAL = random.randint( 90, 120 )
+                STORE_INTERVAL = random.randint( 360, 640 )
 
                 storethread = threading.Thread( None, self.storeThread, 'storemetricthread' )
@@ -593 +594 @@
                         self.myMetrics[ host ][ metric['name'] ] = [ ]
 
-                # Ah, psst, push it
+                # <ATOMIC>
                 #
-                # <atomic>
                 self.slot.acquire()
 
@@ -601 +601 @@
 
                 self.slot.release()
-                # </atomic>
+                #
+                # </ATOMIC>
 
         def makeUpdateList( self, host, metriclist ):
@@ -610 +611 @@
                 while len( metriclist ) > 0:
 
-                        # Kabouter pop
-                        #
-                        # <atomic>      
-                        #self.slot.acquire()
-
-                        # len might have changed since loop start
-                        #
-                        if len( metriclist ) > 0:
-                                metric = metriclist.pop( 0 )
-
-                        #self.slot.release()
-                        # </atomic>
-
-                        if metric:
-                                if self.checkStoreMetric( host, metric ):
-                                        update_list.append( '%s:%s' %( metric['time'], metric['val'] ) )
+                        metric = metriclist.pop( 0 )
+
+                        if self.checkStoreMetric( host, metric ):
+                                update_list.append( '%s:%s' %( metric['time'], metric['val'] ) )
 
                 return update_list
@@ -668 +657 @@
                         for metricname, mymetric in mymetrics.items():
 
-                                # Atomic: Don't want other threads messing around now
+                                metrics_to_store = [ ]
+
+                                # <ATOMIC>
                                 #
                                 self.slot.acquire() 
 
+                                while len( mymetric ) > 0:
+
+                                        metrics_to_store.append( mymetric.pop( 0 ) )
+
+                                self.slot.release()
+                                #
+                                # </ATOMIC>
+
                                 # Create a mapping table, each metric to the period where it should be stored
                                 #
-                                metric_serial_table = self.determineSerials( hostname, metricname, mymetric )
+                                metric_serial_table = self.determineSerials( hostname, metricname, metrics_to_store )
                                 self.myMetrics[ hostname ][ metricname ] = [ ]
-
-                                self.slot.release() # Atomic end
 
                                 update_rets = [ ]