non-procs

chronos/futures.nim

@@ -95,10 +95,10 @@ when chronosFutureTracking:
 
 when chronosFuturesInstrumentation:
   var
-    onFutureCreate* {.threadvar.}: proc (fut: FutureBase) {.gcsafe, raises: [].}
-    onFutureRunning* {.threadvar.}: proc (fut: FutureBase) {.gcsafe, raises: [].}
-    onFuturePause* {.threadvar.}: proc (fut, child: FutureBase) {.gcsafe, raises: [].}
-    onFutureStop* {.threadvar.}: proc (fut: FutureBase) {.gcsafe, raises: [].}
+    onFutureCreate*: proc (fut: FutureBase) {.gcsafe, nimcall, raises: [].}
+    onFutureRunning*: proc (fut: FutureBase) {.gcsafe, nimcall, raises: [].}
+    onFuturePause*: proc (fut, child: FutureBase) {.gcsafe, nimcall, raises: [].}
+    onFutureStop*: proc (fut: FutureBase) {.gcsafe, nimcall, raises: [].}
 
 # Internal utilities - these are not part of the stable API
 proc internalInitFutureBase*(

tests/config.nims

@@ -9,5 +9,5 @@ switch("threads", "on")
 switch("define", "nimRawSetjmp")
 
 ## REMOVE BEFORE MERGE!
---d:chronosFuturesInstrumentation
+# --d:chronosFuturesInstrumentation
 # --d:chronosFutureTracking

tests/testutils.nim

@@ -14,6 +14,29 @@ when chronosFuturesInstrumentation:
   import std/[tables, os, options, hashes]
   import ../chronos/timer
 
+type
+  FutureMetric = object
+    ## Holds average timing information for a given closure
+    closureLoc*: ptr SrcLoc
+    created*: Moment
+    start*: Option[Moment]
+    duration*: Duration
+    blocks*: int
+    initDuration*: Duration
+    durationChildren*: Duration
+
+  CallbackMetric = object
+    totalExecTime*: Duration
+    totalWallTime*: Duration
+    totalRunTime*: Duration
+    minSingleTime*: Duration
+    maxSingleTime*: Duration
+    count*: int64
+
+var
+  futureDurations: Table[uint, FutureMetric]
+  callbackDurations: Table[ptr SrcLoc, CallbackMetric]
+
 suite "Asynchronous utilities test suite":
   when chronosFutureTracking:
     proc getCount(): uint =
@@ -113,39 +136,18 @@ suite "Asynchronous utilities test suite":
 
     when chronosFuturesInstrumentation:
 
-      type
-        FutureMetric = object
-          ## Holds average timing information for a given closure
-          closureLoc*: ptr SrcLoc
-          created*: Moment
-          start*: Option[Moment]
-          duration*: Duration
-          blocks*: int
-          initDuration*: Duration
-          durationChildren*: Duration
-
-        CallbackMetric = object
-          totalExecTime*: Duration
-          totalWallTime*: Duration
-          totalRunTime*: Duration
-          minSingleTime*: Duration
-          maxSingleTime*: Duration
-          count*: int64
-
-      var
-        futureDurations: Table[uint, FutureMetric]
-        callbackDurations: Table[ptr SrcLoc, CallbackMetric]
-
-      proc setFutureCreate(fut: FutureBase) {.raises: [].} =
+      proc setFutureCreate(fut: FutureBase) {.nimcall, gcsafe, raises: [].} =
         ## used for setting the duration
+        {.cast(gcsafe).}:
           let loc = fut.internalLocation[Create]
           futureDurations[fut.id] = FutureMetric()
           futureDurations.withValue(fut.id, metric):
             metric.created = Moment.now()
             echo loc, "; future create "
 
-      proc setFutureStart(fut: FutureBase) {.raises: [].} =
+      proc setFutureStart(fut: FutureBase) {.nimcall, gcsafe, raises: [].} =
         ## used for setting the duration
+        {.cast(gcsafe).}:
           let loc = fut.internalLocation[Create]
           assert futureDurations.hasKey(fut.id)
           futureDurations.withValue(fut.id, metric):
@@ -154,8 +156,9 @@ suite "Asynchronous utilities test suite":
             metric.blocks.inc()
             echo loc, "; future start: ", metric.initDuration
 
-      proc setFuturePause(fut, child: FutureBase) {.raises: [].} =
+      proc setFuturePause(fut, child: FutureBase) {.nimcall, gcsafe, raises: [].} =
         ## used for setting the duration
+        {.cast(gcsafe).}:
           let loc = fut.internalLocation[Create]
           let childLoc = if child.isNil: nil else: child.internalLocation[Create]
           var durationChildren = ZeroDuration
@@ -181,8 +184,9 @@ suite "Asynchronous utilities test suite":
               metric.start = none Moment
             echo loc, "; future pause ", if childLoc.isNil: "" else: " child: " & $childLoc
 
-      proc setFutureDuration(fut: FutureBase) {.raises: [].} =
+      proc setFutureDuration(fut: FutureBase) {.nimcall, gcsafe, raises: [].} =
         ## used for setting the duration
+        {.cast(gcsafe).}:
           let loc = fut.internalLocation[Create]
           # assert  "set duration: " & $loc
           var fm: FutureMetric
@@ -206,16 +210,16 @@ suite "Asynchronous utilities test suite":
               metric.count = 0
 
       onFutureCreate =
-        proc (f: FutureBase) =
+        proc (f: FutureBase) {.nimcall, gcsafe, raises: [].} =
           f.setFutureCreate()
       onFutureRunning =
-        proc (f: FutureBase) =
+        proc (f: FutureBase) {.nimcall, gcsafe, raises: [].} =
           f.setFutureStart()
       onFuturePause =
-        proc (f, child: FutureBase) =
+        proc (f, child: FutureBase) {.nimcall, gcsafe, raises: [].} =
           f.setFuturePause(child)
       onFutureStop =
-        proc (f: FutureBase) =
+        proc (f: FutureBase) {.nimcall, gcsafe, raises: [].} =
           f.setFuturePause(nil)
           f.setFutureDuration()