type2 fix (Channel)

Author: andreapasquale94

Project.toml

@@ -7,13 +7,15 @@ version = "1.2.1"
 JSMDInterfaces = "6b30ee2f-618e-4a15-bf4e-7df7b496e609"
 LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
 Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
+OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
 PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 
 [compat]
 JSMDInterfaces = "1.4"
 LazyArtifacts = "1"
+OhMyThreads = "0.8.1"
 PreallocationTools = "0.4"
 PrecompileTools = "1"
 StaticArraysCore = "1.4"

src/Ephemerides.jl

@@ -8,6 +8,7 @@ using PrecompileTools: PrecompileTools
 using StaticArraysCore
 
 import JSMDInterfaces.Ephemeris as jEph
+import OhMyThreads: Channel, take!, put!
 
 # Utilities
 include("utils.jl")

src/spk/spk2.jl

@@ -56,21 +56,22 @@ end
 Create the object representing an SPK segment of type 2.
 """
 function SPKSegmentType2(daf::DAF, desc::DAFSegmentDescriptor)
-
     # Initialise the segment header and cache
     header = SPKSegmentHeader2(daf, desc)
-    caches = [SPKSegmentCache2(header) for _ in 1:Threads.nthreads()]
-
-    SPKSegmentType2(header, caches)
-
+    nbuffers = Threads.nthreads()
+    caches = Channel{SPKSegmentCache2}(nbuffers)
+    foreach(1:nbuffers) do _
+        put!(caches, SPKSegmentCache2(header))
+    end
+    return SPKSegmentType2(header, caches)
 end
 
 @inline spk_field(::SPKSegmentType2) = SPK_SEGMENTLIST_MAPPING[2]
 
 function spk_vector3(daf::DAF, seg::SPKSegmentType2, time::Number) 
 
     head = header(seg)
-    data = cache(seg)
+    data = take!(seg)
 
     # Retrieve Chebyshev coefficients 
     get_coefficients!(daf, head, data, time)
@@ -79,6 +80,8 @@ function spk_vector3(daf::DAF, seg::SPKSegmentType2, time::Number)
     t = normalise_time(data, time)
 
     x, y, z = chebyshev(data.buff, data.A, t, 0, head.N)
+    put!(seg, data)
+
     return SVector{3}(x, y, z)
 
 end
@@ -87,7 +90,7 @@ end
 function spk_vector6(daf::DAF, seg::SPKSegmentType2, time::Number)
 
     head = header(seg)
-    data = cache(seg)
+    data = take!(seg)
 
     # Retrieve Chebyshev coefficients 
     get_coefficients!(daf, head, data, time)
@@ -101,6 +104,7 @@ function spk_vector6(daf::DAF, seg::SPKSegmentType2, time::Number)
         x, y, z = chebyshev(data.buff, data.A, t, 0, head.N)
         vx, vy, vz = chebyshev(data.buff, data.A, t, 3, head.N)
     end
+    put!(seg, data)
 
     return SVector{6}(x, y, z, vx, vy, vz)
 
@@ -109,7 +113,7 @@ end
 function spk_vector9(daf::DAF, seg::SPKSegmentType2, time::Number)
 
     head = header(seg)
-    data = cache(seg)
+    data = take!(seg)
 
     # Retrieve Chebyshev coefficients 
     get_coefficients!(daf, head, data, time)
@@ -126,6 +130,7 @@ function spk_vector9(daf::DAF, seg::SPKSegmentType2, time::Number)
         x, y, z = chebyshev(data.buff, data.A, t, 0, head.N)
         vx, vy, vz, ax, ay, az = ∂chebyshev(data.buff, data.A, t, 3, head.N, data.p[3])
     end
+    put!(seg, data)
 
     return SVector{9}(x, y, z, vx, vy, vz, ax, ay, az)
 
@@ -134,7 +139,7 @@ end
 function spk_vector12(daf::DAF, seg::SPKSegmentType2, time::Number)
 
     head = header(seg)
-    data = cache(seg)
+    data = take!(seg)
 
     # Retrieve Chebyshev coefficients 
     get_coefficients!(daf, head, data, time)
@@ -153,6 +158,7 @@ function spk_vector12(daf::DAF, seg::SPKSegmentType2, time::Number)
             data.buff, data.A, t, 3, head.N, data.p[3]
         )
     end
+    put!(seg, data)
 
     return SVector{12}(x, y, z, vx, vy, vz, ax, ay, az, jx, jy, jz)
 

src/spk/spktypes.jl

@@ -209,11 +209,12 @@ is normally used for planet barycenters, and for satellites whose ephemerides ar
 """
 struct SPKSegmentType2 <: AbstractSPKSegment
     head::SPKSegmentHeader2
-    cache::Vector{SPKSegmentCache2}
+    cache::Channel{SPKSegmentCache2}
 end
 
 @inline header(spk::SPKSegmentType2) = spk.head 
-@inline @inbounds cache(spk::SPKSegmentType2) = spk.cache[Threads.threadid()]
+@inline @inbounds take!(spk::SPKSegmentType2) = take!(spk.cache)
+@inline @inbounds put!(spk::SPKSegmentType2, cache::SPKSegmentCache2) = put!(spk.cache, cache)    
 
 
 # ----------------------------------