Changeset 939 for trunk

Timestamp:

01/07/2008 18:06:44 (5 months ago)

Author:

james

Message:

remove counters stuff, never really used it

Location:

trunk

Files:

• bMotion.tcl (modified) (1 diff)
• modules/abstract.tcl (modified) (4 diffs)
• modules/events.tcl (modified) (3 diffs)
• modules/flood.tcl (modified) (1 diff)
• modules/system.tcl (modified) (2 diffs)

trunk/bMotion.tcl

@@ -78 +78 @@
 source "$bMotionModules/variables.tcl"
 
-# load counters
-if {$bMotion_testing == 1} {
-  putlog "... loading counters"
-}
-source "$bMotionModules/counters.tcl"
-
 # load settings
 if {$bMotion_testing == 1} {

trunk/modules/abstract.tcl

@@ -89 +89 @@
 }
 
-#init our counters
-bMotion_counter_init "abstracts" "faults"
-bMotion_counter_init "abstracts" "pageouts"
-bMotion_counter_init "abstracts" "gc"
-bMotion_counter_init "abstracts" "gets"
-
 set bMotion_abstract_dir "$bMotionLocal/abstracts/$bMotionInfo(language)"
 
@@ -106 +100 @@
 
   bMotion_putloglev 2 * "Garbage collecting abstracts..."
-
-  bMotion_counter_incr "abstracts" "gc"
 
   set abstracts [array names bMotion_abstract_contents]
@@ -123 +115 @@
       set bMotion_abstract_timestamps($abstract) 0
       lappend bMotion_abstract_ondisk $abstract
-      bMotion_counter_incr "abstracts" "pageouts"
     }
   }
@@ -385 +376 @@
   }
 
-  bMotion_counter_incr "abstracts" "gets"
-
   if {$bMotion_abstract_timestamps($abstract) < [expr [clock seconds] - $bMotion_abstract_max_age]} {
     bMotion_putloglev d * "abstract $abstract has been unloaded, reloading..."
-    bMotion_counter_incr "abstracts" "faults"
     bMotion_abstract_load $abstract
   }

trunk/modules/events.tcl

@@ -227 +227 @@
   set bMotionLastEvent($channel) [clock seconds]
 
-  bMotion_counter_incr "events" "lines"
-
   #don't let people break us <<<2
   if {![matchattr $handle n]} {
@@ -285 +283 @@
     if [bMotion_flood_check $nick] { return 0 }
     set nick [bMotionGetRealName $nick $host]
-    bMotion_counter_incr "events" "simpleplugins"
     bMotionDoAction $channel $nick [pickRandom $response]
     return 0
@@ -301 +298 @@
       bMotion_putloglev 1 * "bMotion: `- running callback $callback"
                         set result 0
-                        bMotion_counter_incr "events" "complexplugins"
                         set result [$callback $nick $host $handle $channel $text]
                         set bMotionCache(lastPlugin) $callback

trunk/modules/flood.tcl

@@ -240 +240 @@
   if {!($r < $chance)} {
     putlog "bMotion: FLOOD check on $nick (http://www.bmotion.net:8000/bmotion/wiki/FAQDisableFlood)"
-    bMotion_counter_incr "flood" "checks"
     return 1
   }

trunk/modules/system.tcl

@@ -91 +91 @@
         set mem [llength [array names bMotion_abstract_contents]]
         set disk [llength $bMotion_abstract_ondisk]
-        set faults [bMotion_counter_get "abstracts" "faults"]
-        set pageouts [bMotion_counter_get "abstracts" "pageouts"]
         global bMotionFacts
         set items [lsort [array names bMotionFacts]]
@@ -102 +100 @@
         }
 
-        putchan $channel "abstracts: [expr $mem + $disk] total, $mem loaded, $disk on disk, $faults faults, $pageouts pageouts. [bMotion_counter_get abstracts gc] garbage collections, [bMotion_counter_get abstracts gets] fetches"
+        putchan $channel "abstracts: [expr $mem + $disk] total, $mem loaded, $disk on disk"
         putchan $channel "facts: $factcount facts about $itemcount items"
-        putchan $channel "plugins fired: simple [bMotion_counter_get events simpleplugins], complex [bMotion_counter_get events complexplugins]"
-        putchan $channel "output: lines sent to output: [bMotion_counter_get output lines], lines sent to irc: [bMotion_counter_get output irclines]"
-        putchan $channel "system: randomness: [bMotion_counter_get system randomstuff]"
-        putchan $channel "flood: checks: [bMotion_counter_get flood checks]"
 }