Changeset 1003 for trunk/modules/system.tcl

Timestamp:

04/23/09 05:28:08 (3 years ago)

Author:

james

Message:

use wrapper function for bMotionLastEvent to try to get rid of more errors

File:

• trunk/modules/system.tcl (modified) (5 diffs)

trunk/modules/system.tcl

@@ -104 +104 @@
 }
 
+#
+# get the last event for a channel, or 0 if not available
+proc bMotion_get_last_event { channel } {
+        bMotion_putloglev 4 * "bMotion_get_last_event $channel"
+
+        global bMotionLastEvent
+
+        set last_event 0
+        catch {
+                set last_event $bMotionLastEvent($channel)
+        }
+        if {$last_event == 0} {
+                bMotion_putloglev 1 * "last event for $channel is not available, returning 0"
+        }
+
+        return $last_event
+}
+
+#
+# set the last event time for a channel to now
+proc bMotion_set_last_event { channel } {
+        bMotion_putloglev 4 * "bMotion_set_last_event $channel"
+
+        global bMotionLastEvent
+
+        set bMotionLastEvent($channel) [clock seconds]
+}
 
 #
@@ -109 +136 @@
 proc bMotion_is_active_enough { channel { limit 0 } } {
         global bMotionInfo 
-        global bMotionLastEvent 
 
         bMotion_putloglev 4 * "bMotion_is_active_enough $channel"
 
-        set last_event 0
-        catch {
-                set last_event $bMotionLastEvent($channel)
-        }
+        set last_event [bMotion_get_last_event $channel]
+
         if {$last_event == 0} {
                 bMotion_putloglev d * "last event info for $channel not available"
                 # force it to be now
-                set bMotionLastEvent($channel) [clock seconds]
+                bMotion_set_last_event $channel
                 # assume we're ok
                 return 1
@@ -140 +164 @@
 # check if every channel we can see is idle enough for us to go away
 proc bMotion_random_away {} {
-        global bMotionLastEvent bMotionChannels bMotionInfo
+        global bMotionChannels bMotionInfo
 
         set timeNow [clock seconds]
@@ -160 +184 @@
         foreach channel $bMotionChannels {
                 catch {
-                        append line "$channel=$bMotionLastEvent($channel) "
-                        if {$bMotionLastEvent($channel) > $mostRecent} {
-                                set mostRecent $bMotionLastEvent($channel)
+                        set last_event [bMotion_get_last_event $channel]
+                        append line "$channel=$last_event "
+                        if {$last_event > $mostRecent} {
+                                set mostRecent $last_event
                         }
                 }
@@ -192 +217 @@
 proc doRandomStuff {} {
         global bMotionInfo mood stonedRandomStuff bMotionSettings
-        global bMotionLastEvent bMotionOriginalNick bMotionChannels
+        global bMotionOriginalNick bMotionChannels
         global BMOTION_SLEEP