Skip to content

fix(macos): do not allow server.Stop() to block in StopServer #3

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

Draft
sneurlax wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(macos): do not allow server.Stop() to block in StopServer #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"context"
"fmt"
"sync"
"time"

"github.com/ltcmweb/mwebd"
"github.com/ltcmweb/mwebd/proto"
Expand Down Expand Up @@ -65,11 +66,33 @@ func StartServer(id C.uintptr_t, port C.int) C.int {

//export StopServer
func StopServer(id C.uintptr_t) {
server := serverRegistry[uintptr(id)]
server.Stop()
serverRegistryMu.Lock()
server, exists := serverRegistry[uintptr(id)]
if !exists {
serverRegistryMu.Unlock()
return // Server was already stopped.
}
delete(serverRegistry, uintptr(id))
serverRegistryMu.Unlock()

// Implement timeout-based shutdown to prevent hanging.
done := make(chan struct{})
go func() {
defer close(done)
server.Stop()
}()

// Wait for graceful shutdown with timeout.
select {
case <-done:
// Graceful shutdown completed.
return
case <-time.After(2 * time.Second):
// Timeout reached - force return to prevent FFI hanging.
// The server goroutines will be cleaned up when the process exits.
fmt.Printf("Warning: Server stop timed out after 2 seconds, continuing with FFI return\n")
return
}
}

//export Status
Expand Down