diff --git a/test/testini.tcl b/test/testini.tcl index 27874023..b9c782be 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -344,10 +344,7 @@ proc farmparread {} { } set data [string range $rply 3 end] set node [sct] -# hupdate $node $data -# hdelprop $node geterror sct update $data - sct utime readtime return idle } #-------------------------- @@ -370,7 +367,6 @@ proc farmsetreply {} { if {[string first ERR $rply] >= 0} { sct print $rply } - sct utime settime return idle } #-------------------------- @@ -425,25 +421,28 @@ proc schneggechecklimits {} { } #----------------------------- proc schneggestatus {} { - set runtime [SICSValue "hgetprop /sics/farm/schneggerunning readtime"] - set status [catch {SICSValue "hgetprop /sics/farm/schnegge settime"} starttime] - if {$status != 0} { -#-------- not yet started! - return busy - } - if {$runtime > $starttime} { -#--------- only look at status values older then the starttime! - set tst [hval /sics/farm/schneggerunning] - if {$tst == 1} { + farmser queue /sics/farm/schneggerunning progress read + set status [sct writestatus] + switch $status { + commandsent { + set runtime [SICSValue "hgetprop /sics/farm/schneggerunning read_time"] + set starttime [sct write_time] + if {$runtime > $starttime} { + sct writestatus evalcheck + } return busy - } else { - farmser poll /sics/farm/schneggerunning 10 - hdelprop /sics/farm/schnegge settime - return idle } - } else { - farmser poll /sics/farm/schneggerunning .5 progress - return busy + evalcheck { + set tst [hval /sics/farm/schneggerunning] + if {$tst == 1} { + return busy + } else { + return idle + } + } + default { + error "schneggestatus called in bad state $status" + } } } #--------------------------------------------- @@ -453,6 +452,9 @@ makesctdrive schnecke /sics/farm/schnegge farmser #---------- test http +set httptest 0 + +if {$httptest == 1} { makesctcontroller amorhmsct sinqhttp amorhm data 60 spy 007 #makesctcontroller amorhmsct sinqhttp localhost:8080 data 60 spy 007 MakeSICSObj amorhm HttpTest @@ -488,6 +490,7 @@ hsetprop /sics/amorhm/collapse read readcollapse hsetprop /sics/amorhm/collapse colread colreply amorhmsct poll /sics/amorhm/collapse 60 +} #source sansdruck.tcl @@ -498,4 +501,6 @@ amorhmsct poll /sics/amorhm/collapse 60 #sadu sendterminator 0x04 #sadu timeout 1000 +#source ../sim/mars/julcho.tcl +