author | Junio C Hamano <gitster@pobox.com> | |
Sun, 17 Aug 2008 06:21:07 +0000 (23:21 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 17 Aug 2008 06:21:07 +0000 (23:21 -0700) |
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Allow safely calling nukefile from a run queue handler
gitk: Allow safely calling nukefile from a run queue handler
gitk-git/gitk | patch | blob | history |
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d093a39506798c750cc838f0085f6721e0f733a9..087c4ac733be4b788751d0bae5b7aad22ce0dd99 100644 (file)
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
# run before X event handlers, so reading from a fast source can
# make the GUI completely unresponsive.
proc run args {
- global isonrunq runq
+ global isonrunq runq currunq
set script $args
if {[info exists isonrunq($script)]} return
- if {$runq eq {}} {
+ if {$runq eq {} && ![info exists currunq]} {
after idle dorunq
}
lappend runq [list {} $script]
}
proc filereadable {fd script} {
- global runq
+ global runq currunq
fileevent $fd readable {}
- if {$runq eq {}} {
+ if {$runq eq {} && ![info exists currunq]} {
after idle dorunq
}
lappend runq [list $fd $script]
}
proc dorunq {} {
- global isonrunq runq
+ global isonrunq runq currunq
set tstart [clock clicks -milliseconds]
set t0 $tstart
while {[llength $runq] > 0} {
set fd [lindex $runq 0 0]
set script [lindex $runq 0 1]
+ set currunq [lindex $runq 0]
+ set runq [lrange $runq 1 end]
set repeat [eval $script]
+ unset currunq
set t1 [clock clicks -milliseconds]
set t [expr {$t1 - $t0}]
- set runq [lrange $runq 1 end]
if {$repeat ne {} && $repeat} {
if {$fd eq {} || $repeat == 2} {
# script returns 1 if it wants to be readded