Improve streamer handling

Author: tamasgal

src/bootstrap.jl

@@ -1120,6 +1120,13 @@ function parsetobject(f, tkey::TKey, streamer)
     # simple custom streamers which instantiate the full objects data
     tkey.fClassName ∈ Base.keys(f.customstructs) && return readtype(io, f.customstructs[tkey.fClassName]; tkey=tkey, original_streamer=streamer)
 
+    if ismissing(streamer)
+        error("There is no streamer information for '$(tkey.fClassName)' stored in the ROOT file, " *
+            "consider providing a custom streamer by passing " *
+            "`customstreamer=Dict(\"$(tkey.fClassName)\" => TheStreamer)` to the `ROOTFile` " *
+            "and implement the struct `TheStreamer` and `UnROOT.readtype(io, ::Type{TheStreamer}; tkey, original_streamer)`.")
+    end
+
     # FIXME: this is just a hack, for TObject-derivatives which are subclassing map<string,string>
     s = streamer.streamer.fElements.elements[2]
     if s.fTypeName == "map<string,string>"

src/bootstrap.jl.rej

@@ -0,0 +1,25 @@
+diff a/src/bootstrap.jl b/src/bootstrap.jl	(rejected hunks)
+@@ -131,8 +131,23 @@ function readfields!(io, fields, T::Type{TAttAxis_4})
+ end
+ 
+ abstract type TAxis <: ROOTStreamedObject end
++struct TAxis_6 <: TAxis end
+ struct TAxis_9 <: TAxis end
+ struct TAxis_10 <: TAxis end
++function readfields!(io, fields, T::Type{TAxis_6})
++    # overrides things like fName,... that were set from the parent TH1 :(
++    stream!(io, fields, TNamed)
++    stream!(io, fields, TAttAxis)
++    fields[:fNbins] = readtype(io, Int32)
++    fields[:fXmin] = readtype(io, Float64)
++    fields[:fXmax] = readtype(io, Float64)
++    fields[:fXbins] = readtype(io, TArrayD)
++    fields[:fFirst] = readtype(io, Int16)
++    fields[:fLast] = readtype(io, Int16)
++    fields[:fBits2] = readtype(io, UInt16)
++    fields[:fTimeDisplay] = readtype(io, Bool)
++    fields[:fTimeFormat] = readtype(io, String)
++end
+ function readfields!(io, fields, T::Type{TAxis_9})
+     # overrides things like fName,... that were set from the parent TH1 :(
+     stream!(io, fields, TNamed)

src/precompile.jl

@@ -0,0 +1,30 @@
+# Use
+#    @warnpcfail precompile(args...)
+# if you want to be warned when a precompile directive fails
+macro warnpcfail(ex::Expr)
+    modl = __module__
+    file = __source__.file === nothing ? "?" : String(__source__.file)
+    line = __source__.line
+    quote
+        $(esc(ex)) || @warn """precompile directive
+     $($(Expr(:quote, ex)))
+ failed. Please report an issue in $($modl) (after checking for duplicates) or remove this directive.""" _file=$file _line=$line
+    end
+end
+
+
+function _precompile_()
+    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
+    Base.precompile(Tuple{Type{ROOTFile},String})
+    Base.precompile(Tuple{Type{TTree},IOStream,TKey32,Dict{Int32, Any}})
+    Base.precompile(Tuple{typeof(getindex),ROOTFile,String})
+    Base.precompile(Tuple{typeof(readfields!),Cursor,Dict{Symbol, Any},Type{TBranch_13}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TLeafF}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TLeafI}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TObjArray}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TStreamerBase}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TStreamerBasicPointer}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TStreamerBasicType}})
+    Base.precompile(Tuple{typeof(unpack),IOBuffer,TKey32,Dict{Int32, Any},Type{TStreamerSTL}})
+    Base.precompile(Tuple{var"##s446#126",Any,Any,Any})
+end

src/streamers.jl

@@ -240,8 +240,11 @@ function readobjany!(io, tkey::TKey, refs)
             try
                 streamer = getfield(@__MODULE__, Symbol(cname))
             catch UndefVarError
-                @warn "Could not get streamer for '$(cname)' (TKey: $(tkey))"
-                return missing
+                streamer = getfield(@__MODULE__, :TBranchElement)
+                # @show tkey.fClassName
+
+                # @warn "Could not get streamer for '$(cname)' (TKey: $(tkey))"
+                # return missing
             end
         end