From b7076b2afbe1e62f3429228ec980843f18a63cba Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Fri, 29 Mar 2019 08:50:10 +0100
Subject: [PATCH] Julia debugging cleanup
---
adaptors/julia/AnalogIn.jl | 2 +-
adaptors/julia/AnalogOut.jl | 2 +-
adaptors/julia/DigitalIn.jl | 2 +-
adaptors/julia/DigitalOut.jl | 2 +-
adaptors/julia/EncoderIn.jl | 2 +-
adaptors/julia/MobergIO.jl | 2 ++
test/test_jl.jl | 37 ++++++++++++++++++++++--------------
7 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/adaptors/julia/AnalogIn.jl b/adaptors/julia/AnalogIn.jl
index 3b24b3a..1a2736e 100644
--- a/adaptors/julia/AnalogIn.jl
+++ b/adaptors/julia/AnalogIn.jl
@@ -20,7 +20,7 @@ mutable struct AnalogIn
end
function close(ain::AnalogIn)
- # println("closing $(ain)")
+ DEBUG && println("closing $(ain)")
checkOK(ccall((:moberg_analog_in_close, "libmoberg"),
Status,
(Moberg, Cint, AnalogInChannel),
diff --git a/adaptors/julia/AnalogOut.jl b/adaptors/julia/AnalogOut.jl
index f526862..938a562 100644
--- a/adaptors/julia/AnalogOut.jl
+++ b/adaptors/julia/AnalogOut.jl
@@ -20,7 +20,7 @@ mutable struct AnalogOut
end
function close(aout::AnalogOut)
- # println("closing $(aout)")
+ DEBUG && println("closing $(aout)")
checkOK(ccall((:moberg_analog_out_close, "libmoberg"),
Status,
(Moberg, Cint, AnalogOutChannel),
diff --git a/adaptors/julia/DigitalIn.jl b/adaptors/julia/DigitalIn.jl
index 66695e6..db66230 100644
--- a/adaptors/julia/DigitalIn.jl
+++ b/adaptors/julia/DigitalIn.jl
@@ -20,7 +20,7 @@ mutable struct DigitalIn
end
function close(din::DigitalIn)
- # println("closing $(din)")
+ DEBUG && println("closing $(din)")
checkOK(ccall((:moberg_digital_in_close, "libmoberg"),
Status,
(Moberg, Cint, DigitalInChannel),
diff --git a/adaptors/julia/DigitalOut.jl b/adaptors/julia/DigitalOut.jl
index f23d118..b76ffb7 100644
--- a/adaptors/julia/DigitalOut.jl
+++ b/adaptors/julia/DigitalOut.jl
@@ -20,7 +20,7 @@ mutable struct DigitalOut
end
function close(dout::DigitalOut)
- # println("closing $(dout)")
+ DEBUG && println("closing $(dout)")
checkOK(ccall((:moberg_digital_out_close, "libmoberg"),
Status,
(Moberg, Cint, DigitalOutChannel),
diff --git a/adaptors/julia/EncoderIn.jl b/adaptors/julia/EncoderIn.jl
index fd60f68..2b05def 100644
--- a/adaptors/julia/EncoderIn.jl
+++ b/adaptors/julia/EncoderIn.jl
@@ -20,7 +20,7 @@ mutable struct EncoderIn
end
function close(ein::EncoderIn)
- # println("closing $(ein)")
+ DEBUG && println("closing $(ein)")
checkOK(ccall((:moberg_encoder_in_close, "libmoberg"),
Status,
(Moberg, Cint, EncoderInChannel),
diff --git a/adaptors/julia/MobergIO.jl b/adaptors/julia/MobergIO.jl
index ec35eeb..bd65678 100644
--- a/adaptors/julia/MobergIO.jl
+++ b/adaptors/julia/MobergIO.jl
@@ -1,5 +1,6 @@
module MobergIO
+const DEBUG = false
struct Status
result::Clong
@@ -23,6 +24,7 @@ function Moberg()
end
function close(h::Moberg)
+ DEBUG && println("Destroy $(h)")
ccall((:moberg_free, "libmoberg"), Nothing, (Moberg,), h)
end
diff --git a/test/test_jl.jl b/test/test_jl.jl
index e34e46a..89a7f00 100644
--- a/test/test_jl.jl
+++ b/test/test_jl.jl
@@ -7,7 +7,7 @@ import MobergIO: read, write
function test()
m = MobergIO.Moberg()
- println(m)
+ println(stderr,m)
for v in -10.0:2.0:10
for i in 0:1
@@ -17,21 +17,23 @@ function test()
write(aout, value)
print("$value ")
catch ex
- println("analog_out $i does not exist $(ex)")
+ println(stderr,"analog_out $i does not exist $(ex)")
end
end
- println()
+ println(stderr)
+ flush(stderr)
sleep(0.01)
for j in 0:3
try
ain = MobergIO.AnalogIn(m, Unsigned(j))
- println(read(ain))
+ println(stderr,read(ain))
catch ex
- println("analog_in $j does not exist $(ex)")
+ println(stderr,"analog_in $j does not exist $(ex)")
end
+ flush(stderr)
end
- println()
-# GC.gc()
+ println(stderr)
+ flush(stderr)
end
for v in false:true
for i in 0:6
@@ -41,27 +43,34 @@ function test()
write(dout, value)
print("$value ")
catch ex
- println("digital_out $i does not exist $(ex)")
+ println(stderr,"digital_out $i does not exist $(ex)")
end
+ flush(stderr)
end
- println()
+ println(stderr)
+ flush(stderr)
for i in 0:6
try
din = MobergIO.DigitalIn(m, Unsigned(i))
print("$(read(din)) ")
catch ex
- println("digital_out $i does not exist $(ex)")
+ println(stderr,"digital_in $i does not exist $(ex)")
end
+ flush(stderr)
end
- println()
- println()
+ println(stderr)
+ println(stderr)
sleep(0.01)
end
end
test()
-println("DONE")
+println(stderr,"DONE")
+flush(stderr)
GC.gc()
+println(stderr,"....")
+flush(stderr)
GC.gc() # See https://github.com/JuliaCI/BenchmarkTools.jl/blob/af35d0513fe1e336ad0d8b9a35f924e8461aefa2/src/execution.jl#L1
-println("Really DONE")
+println(stderr,"Really DONE")
+flush(stderr)
--
GitLab