mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/gitk/gitk

Browse Source 
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow safely calling nukefile from a run queue handler
This commit is contained in:
Junio C Hamano 2008-08-16 23:21:07 -07:00
commit a0d74d160f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gitk-git/gitk
View File

@ -22,11 +22,11 @@ proc gitdir {} {
# run before X event handlers, so reading from a fast source can # run before X event handlers, so reading from a fast source can
# make the GUI completely unresponsive. # make the GUI completely unresponsive.
proc run args { proc run args {
global isonrunq runq global isonrunq runq currunq
set script $args set script $args
if {[info exists isonrunq($script)]} return if {[info exists isonrunq($script)]} return
if {$runq eq {}} { if {$runq eq {} && ![info exists currunq]} {
after idle dorunq after idle dorunq
} }
lappend runq [list {} $script] lappend runq [list {} $script]
@ -38,10 +38,10 @@ proc filerun {fd script} {
} }
proc filereadable {fd script} { proc filereadable {fd script} {
global runq global runq currunq
fileevent $fd readable {} fileevent $fd readable {}
if {$runq eq {}} { if {$runq eq {} && ![info exists currunq]} {
after idle dorunq after idle dorunq
} }
lappend runq [list $fd $script] lappend runq [list $fd $script]
@ -60,17 +60,19 @@ proc nukefile {fd} {
} }
proc dorunq {} { proc dorunq {} {
global isonrunq runq global isonrunq runq currunq
set tstart [clock clicks -milliseconds] set tstart [clock clicks -milliseconds]
set t0 $tstart set t0 $tstart
while {[llength $runq] > 0} { while {[llength $runq] > 0} {
set fd [lindex $runq 0 0] set fd [lindex $runq 0 0]
set script [lindex $runq 0 1] set script [lindex $runq 0 1]
set currunq [lindex $runq 0]
set runq [lrange $runq 1 end]
set repeat [eval $script] set repeat [eval $script]
unset currunq
set t1 [clock clicks -milliseconds] set t1 [clock clicks -milliseconds]
set t [expr {$t1 - $t0}] set t [expr {$t1 - $t0}]
set runq [lrange $runq 1 end]
if {$repeat ne {} && $repeat} { if {$repeat ne {} && $repeat} {
if {$fd eq {} || $repeat == 2} { if {$fd eq {} || $repeat == 2} {
# script returns 1 if it wants to be readded # script returns 1 if it wants to be readded