From 1a4b9076b3b7a2465eae017b7059a0e2227d133b Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Mon, 18 Sep 2023 13:30:22 -0700 Subject: [PATCH] addr stuff (?) --- datastore/threads/threadproxyds.nim | 6 +++--- tests/datastore/testthreadproxyds.nim | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/datastore/threads/threadproxyds.nim b/datastore/threads/threadproxyds.nim index 23e7f9d..b3647dd 100644 --- a/datastore/threads/threadproxyds.nim +++ b/datastore/threads/threadproxyds.nim @@ -35,12 +35,12 @@ type ThreadResult[T: ThreadTypes] = Result[T, DataBuffer] TaskCtx[T: ThreadTypes] = ref object - ds: ptr Datastore - res: ThreadResult[T] + ds*: ptr Datastore + res*: ThreadResult[T] cancelled: Atomic[bool] isActive: Atomic[bool] semaphore: AsyncSemaphore - signal: ThreadSignalPtr + signal*: ThreadSignalPtr ThreadDatastore* = ref object of Datastore tp: Taskpool diff --git a/tests/datastore/testthreadproxyds.nim b/tests/datastore/testthreadproxyds.nim index e85132e..02f9626 100644 --- a/tests/datastore/testthreadproxyds.nim +++ b/tests/datastore/testthreadproxyds.nim @@ -146,13 +146,11 @@ suite "Test ThreadDatastore cancelations": test "Should monitor signal and cancel": var signal = ThreadSignalPtr.new().tryGet() - res = ThreadResult[void]() ctx = TaskCtx[void]( ds: addr sqlStore, - res: addr res, signal: signal) fut = newFuture[void]("signalMonitor") - threadArgs = (addr ctx, addr fut) + threadArgs: (ptr TaskCtx, ptr Future[void]) = (unsafeAddr ctx[], addr fut) var thread: Thread[type threadArgs]