refactor: rely on context.Context for log/slog and others (#1969)

* refactor: rely on context.Context for log/slog and others

* optimize

* refactor

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix watcher-skip

* better globals handling

* fix

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Kévin Dunglas
2025-11-17 16:32:23 +01:00
committed by GitHub
parent 40cb42aace
commit 8341cc98c6
23 changed files with 425 additions and 183 deletions

View File

@@ -1,6 +1,7 @@
package frankenphp
import (
"context"
"sync"
)
@@ -8,15 +9,16 @@ import (
// executes PHP scripts in a web context
// implements the threadHandler interface
type regularThread struct {
state *threadState
thread *phpThread
requestContext *frankenPHPContext
contextHolder
state *threadState
thread *phpThread
}
var (
regularThreads []*phpThread
regularThreadMu = &sync.RWMutex{}
regularRequestChan chan *frankenPHPContext
regularRequestChan chan contextHolder
)
func convertToRegularThread(thread *phpThread) {
@@ -33,25 +35,33 @@ func (handler *regularThread) beforeScriptExecution() string {
case stateTransitionRequested:
detachRegularThread(handler.thread)
return handler.thread.transitionToNewHandler()
case stateTransitionComplete:
handler.state.set(stateReady)
return handler.waitForRequest()
case stateReady:
return handler.waitForRequest()
case stateShuttingDown:
detachRegularThread(handler.thread)
// signal to stop
return ""
}
panic("unexpected state: " + handler.state.name())
}
func (handler *regularThread) afterScriptExecution(int) {
func (handler *regularThread) afterScriptExecution(_ int) {
handler.afterRequest()
}
func (handler *regularThread) getRequestContext() *frankenPHPContext {
return handler.requestContext
func (handler *regularThread) frankenPHPContext() *frankenPHPContext {
return handler.contextHolder.frankenPHPContext
}
func (handler *regularThread) context() context.Context {
return handler.ctx
}
func (handler *regularThread) name() string {
@@ -64,32 +74,36 @@ func (handler *regularThread) waitForRequest() string {
handler.state.markAsWaiting(true)
var fc *frankenPHPContext
var ch contextHolder
select {
case <-handler.thread.drainChan:
// go back to beforeScriptExecution
return handler.beforeScriptExecution()
case fc = <-regularRequestChan:
case ch = <-regularRequestChan:
}
handler.requestContext = fc
handler.ctx = ch.ctx
handler.contextHolder.frankenPHPContext = ch.frankenPHPContext
handler.state.markAsWaiting(false)
// set the scriptFilename that should be executed
return fc.scriptFilename
return handler.contextHolder.frankenPHPContext.scriptFilename
}
func (handler *regularThread) afterRequest() {
handler.requestContext.closeContext()
handler.requestContext = nil
handler.contextHolder.frankenPHPContext.closeContext()
handler.contextHolder.frankenPHPContext = nil
handler.ctx = nil
}
func handleRequestWithRegularPHPThreads(fc *frankenPHPContext) error {
func handleRequestWithRegularPHPThreads(ch contextHolder) error {
metrics.StartRequest()
select {
case regularRequestChan <- fc:
case regularRequestChan <- ch:
// a thread was available to handle the request immediately
<-fc.done
<-ch.frankenPHPContext.done
metrics.StopRequest()
return nil
@@ -101,19 +115,19 @@ func handleRequestWithRegularPHPThreads(fc *frankenPHPContext) error {
metrics.QueuedRequest()
for {
select {
case regularRequestChan <- fc:
case regularRequestChan <- ch:
metrics.DequeuedRequest()
<-fc.done
<-ch.frankenPHPContext.done
metrics.StopRequest()
return nil
case scaleChan <- fc:
case scaleChan <- ch.frankenPHPContext:
// the request has triggered scaling, continue to wait for a thread
case <-timeoutChan(maxWaitTime):
// the request has timed out stalling
metrics.DequeuedRequest()
fc.reject(ErrMaxWaitTimeExceeded)
ch.frankenPHPContext.reject(ErrMaxWaitTimeExceeded)
return ErrMaxWaitTimeExceeded
}