Skip to content

asyncdispatch: for NuttX, add destructor to clear global dispatcher. #21432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2023
Merged

asyncdispatch: for NuttX, add destructor to clear global dispatcher. #21432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ccf45
asyncdispatch: for NuttX, add destructor to clear global dispatcher u…
centurysys Feb 24, 2023
c52f921
std: exitprocs: remove "when defined(nuttx)" block.
centurysys Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/pure/asyncdispatch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,15 @@ else:

var gDisp{.threadvar.}: owned PDispatcher ## Global dispatcher

when defined(nuttx):
import std/exitprocs

proc cleanDispatcher() {.noconv.} =
gDisp = nil

proc addFinalyzer() =
addExitProc(cleanDispatcher)

proc setGlobalDispatcher*(disp: owned PDispatcher) =
if not gDisp.isNil:
assert gDisp.callbacks.len == 0
Expand All @@ -1225,6 +1234,8 @@ else:
proc getGlobalDispatcher*(): PDispatcher =
if gDisp.isNil:
setGlobalDispatcher(newDispatcher())
when defined(nuttx):
addFinalyzer()
result = gDisp

proc getIoHandler*(disp: PDispatcher): Selector[AsyncData] =
Expand Down Expand Up @@ -1591,7 +1602,7 @@ else:
owned(Future[tuple[address: string, client: AsyncFD]]) =
var retFuture = newFuture[tuple[address: string,
client: AsyncFD]]("acceptAddr")
proc cb(sock: AsyncFD): bool =
proc cb(sock: AsyncFD): bool {.gcsafe.} =
result = true
var sockAddress: Sockaddr_storage
var addrLen = sizeof(sockAddress).SockLen
Expand Down
1 change: 1 addition & 0 deletions lib/std/exitprocs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ proc callClosures() {.noconv.} =
case fun.kind
of kClosure: fun.fun1()
of kNoconv: fun.fun2()
gFuns.setLen(0)

template fun() =
if gFuns.len == 0:
Expand Down