Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: race condition on shutdown #175

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
dunglas merged 1 commit into from
Aug 6, 2023
Merged

fix: race condition on shutdown #175

Show file tree
Hide file tree
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
18 changes: 11 additions & 7 deletions frankenphp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ var (
ScriptExecutionError = errors.New("error during PHP script execution")

requestChan chan *http.Request
done chan struct{}
shutdownWG sync.WaitGroup

loggerMu sync.RWMutex
Expand Down Expand Up @@ -274,6 +275,7 @@ func Init(options ...Option) error {
}

shutdownWG.Add(1)
done = make(chan struct{})
requestChan = make(chan *http.Request)

if C.frankenphp_init(C.int(opt.numThreads)) != 0 {
Expand All @@ -295,7 +297,7 @@ func Init(options ...Option) error {
// Shutdown stops the workers and the PHP runtime.
func Shutdown() {
stopWorkers()
close(requestChan)
close(done)
shutdownWG.Wait()
requestChan = nil

Expand Down Expand Up @@ -410,8 +412,9 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
rc = v.(chan *http.Request)
}

if rc != nil {
rc <- request
select {
case <-done:
case rc <- request:
<-fc.done
}

Expand All @@ -420,12 +423,13 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error

//export go_fetch_request
func go_fetch_request() C.uintptr_t {
r, ok := <-requestChan
if !ok {
select {
case <-done:
return 0
}

return C.uintptr_t(cgo.NewHandle(r))
case r := <-requestChan:
return C.uintptr_t(cgo.NewHandle(r))
}
}

func maybeCloseContext(fc *FrankenPHPContext) {
Expand Down
3 changes: 0 additions & 3 deletions frankenphp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,13 +525,10 @@ func testFlush(t *testing.T, opts *testOptions) {
func TestTimeout_module(t *testing.T) {
testTimeout(t, &testOptions{})
}

func TestTimeout_worker(t *testing.T) {
testTimeout(t, &testOptions{workerScript: "timeout.php"})
}
func testTimeout(t *testing.T, opts *testOptions) {
t.Skip("config-dependant")

config := frankenphp.Config()
if !config.ZendMaxExecutionTimers {
t.Skip("Zend Timer is not enabled")
Expand Down
9 changes: 5 additions & 4 deletions worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ func startWorkers(fileName string, nbWorkers int) error {
func stopWorkers() {
workersRequestChans.Range(func(k, v any) bool {
workersRequestChans.Delete(k)
close(v.(chan *http.Request))

return true
})
Expand All @@ -135,12 +134,14 @@ func go_frankenphp_worker_handle_request_start(mrh C.uintptr_t) C.uintptr_t {
l := getLogger()

l.Debug("waiting for request", zap.String("worker", fc.Env["SCRIPT_FILENAME"]))
r, ok := <-rc
if !ok {
// channel closed, server is shutting down

var r *http.Request
select {
case <-done:
l.Debug("shutting down", zap.String("worker", fc.Env["SCRIPT_FILENAME"]))

return 0
case r = <-rc:
}

fc.currentWorkerRequest = cgo.NewHandle(r)
Expand Down