linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate templated drivers to get changes to logging and simulation tests

Browse Source
This commit is contained in:
Douglas Clowes
2014-06-16 10:37:10 +10:00
parent 18d40f69d9
commit 1010003d6c
13 changed files with 151 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
site_ansto/instrument/config/source/sct_reactor_status.tcl
View File

@@ -10,7 +10,7 @@ proc ::scobj::reactor_status::debug_log {tc_root debug_level debug_string} {
set catch_status [ catch {
set debug_threshold [hgetpropval ${tc_root} debug_threshold]
if {${debug_level} >= ${debug_threshold}} {
set fd [open "/tmp/reactor_status_[basename ${tc_root}].log" "a"]
set fd [open "../log/reactor_status_[basename ${tc_root}].log" "a"]
set line "[clock format [clock seconds] -format "%T"] ${debug_string}"
puts ${fd} "${line}"
close ${fd}
@@ -298,8 +298,10 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath} control "true"
hsetprop ${scobj_hpath} data "true"
if {[SplitReply [opal_simulation]]=="false"} {
if {[string equal -nocase [SplitReply [opal_simulation]] "false"]} {
${sct_controller} poll ${scobj_hpath}/status 30
} else {
::scobj::reactor_status::sics_log 9 "[opal_simulation] => No poll/write for reactor_status"
}
hsetprop ${scobj_hpath} klass NXsource
hsetprop ${scobj_hpath} debug_threshold 5
@@ -319,7 +321,7 @@ namespace eval ::scobj::reactor_status {
proc add_reactor_status {name IP port} {
set catch_status [ catch {
::scobj::reactor_status::sics_log 9 "add_reactor_status ${name} ${IP} ${port}"
if {[SplitReply [opal_simulation]]=="false"} {
if {[string equal -nocase [SplitReply [opal_simulation]] "false"]} {
if {[string equal -nocase "aqadapter" "${IP}"]} {
::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}"
makesctcontroller sct_${name} aqadapter ${port}
@@ -327,6 +329,8 @@ proc add_reactor_status {name IP port} {
::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}"
makesctcontroller sct_${name} std ${IP}:${port}
}
} else {
::scobj::reactor_status::sics_log 9 "[opal_simulation] => No sctcontroller for reactor_status"
}
::scobj::reactor_status::sics_log 1 "::scobj::reactor_status::mkDriver sct_${name} ${name}"
::scobj::reactor_status::mkDriver sct_${name} ${name}
@@ -345,7 +349,10 @@ proc ::scobj::reactor_status::read_config {} {
if { [dict get $v "driver"] == "reactor_status" } {
if { [dict get $v enabled] } {
set name [dict get $v name]
if { [dict exists $v "asyncqueue"] } {
if { ![string equal -nocase [SplitReply [opal_simulation]] "false"] } {
set asyncqueue "null"
${ns}::sics_log 9 "[opal_simulation] => using null asyncqueue"
} elseif { [dict exists $v "asyncqueue"] } {
set asyncqueue [dict get $v "asyncqueue"]
} else {
if { [dict exists $v "asyncprotocol"] } {