refactor moduleID to uintptr for faster comparisons

Author: henderkes

caddy/caddy.go

@@ -12,6 +12,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unsafe"
 
 	"github.com/dunglas/frankenphp/internal/fastabs"
 
@@ -59,7 +60,7 @@ type workerConfig struct {
 	// Directories to watch for file changes
 	Watch []string `json:"watch,omitempty"`
 	// ModuleID identifies which module created this worker
-	ModuleID string `json:"module_id,omitempty"`
+	ModuleID uintptr `json:"module_id,omitempty"`
 }
 
 type FrankenPHPApp struct {
@@ -119,7 +120,7 @@ func (f *FrankenPHPApp) Start() error {
 		opts = append(opts, frankenphp.WithWorkers(w.Name, repl.ReplaceKnown(w.FileName, ""), w.Num, w.Env, w.Watch, w.ModuleID))
 	}
 
-	// Add workers from shared location (added by FrankenPHPModule)
+	// Add workers from FrankenPHPModule configurations
 	for _, w := range moduleWorkers {
 		opts = append(opts, frankenphp.WithWorkers(w.Name, repl.ReplaceKnown(w.FileName, ""), w.Num, w.Env, w.Watch, w.ModuleID))
 	}
@@ -147,7 +148,7 @@ func (f *FrankenPHPApp) Stop() error {
 	f.NumThreads = 0
 	f.MaxWaitTime = 0
 
-	// reset shared workers
+	// reset moduleWorkers
 	moduleWorkers = nil
 
 	return nil
@@ -376,7 +377,6 @@ func (FrankenPHPModule) CaddyModule() caddy.ModuleInfo {
 // Provision sets up the module.
 func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
 	f.logger = ctx.Logger()
-	f.logger.Info("FrankenPHPModule provisioning 🐘")
 
 	if f.Root == "" {
 		if frankenphp.EmbeddedAppPath == "" {
@@ -432,9 +432,8 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
 
 	if len(f.Workers) > 0 {
 		// Tag workers with a unique module ID based on the module's memory address
-		moduleID := fmt.Sprintf("%p", f)
 		for i := range f.Workers {
-			f.Workers[i].ModuleID = moduleID
+			f.Workers[i].ModuleID = uintptr(unsafe.Pointer(f))
 		}
 		moduleWorkers = append(moduleWorkers, f.Workers...)
 	}
@@ -474,7 +473,7 @@ func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ c
 		frankenphp.WithRequestSplitPath(f.SplitPath),
 		frankenphp.WithRequestPreparedEnv(env),
 		frankenphp.WithOriginalRequest(&origReq),
-		frankenphp.WithModuleID(fmt.Sprintf("%p", f)),
+		frankenphp.WithModuleID(uintptr(unsafe.Pointer(f))),
 	)
 
 	if err != nil {

context.go

@@ -33,7 +33,7 @@ type frankenPHPContext struct {
 	startedAt time.Time
 
 	// The module ID that created this request
-	moduleID string
+	moduleID uintptr
 }
 
 // fromContext extracts the frankenPHPContext from a context.

frankenphp.go

@@ -407,7 +407,7 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
 	// Detect if a worker is available to handle this request
 	if worker, ok := workers[fc.scriptFilename]; ok {
 		// can handle with a global worker, or a module worker from the matching module
-		if worker.moduleID == "" || worker.moduleID == fc.moduleID {
+		if worker.moduleID == 0 || worker.moduleID == fc.moduleID {
 			worker.handleRequest(fc)
 			return nil
 		}

options.go

@@ -28,7 +28,7 @@ type workerOpt struct {
 	num      int
 	env      PreparedEnv
 	watch    []string
-	moduleID string
+	moduleID uintptr
 }
 
 // WithNumThreads configures the number of PHP threads to start.
@@ -57,7 +57,7 @@ func WithMetrics(m Metrics) Option {
 }
 
 // WithWorkers configures the PHP workers to start, moduleID is used to identify the worker for a specific domain
-func WithWorkers(name string, fileName string, num int, env map[string]string, watch []string, moduleID string) Option {
+func WithWorkers(name string, fileName string, num int, env map[string]string, watch []string, moduleID uintptr) Option {
 	return func(o *opt) error {
 		o.workers = append(o.workers, workerOpt{name, fileName, num, PrepareEnv(env), watch, moduleID})
 

request_options.go

@@ -125,7 +125,7 @@ func WithRequestLogger(logger *zap.Logger) RequestOption {
 }
 
 // WithModuleID sets the module ID associated with the current request
-func WithModuleID(moduleID string) RequestOption {
+func WithModuleID(moduleID uintptr) RequestOption {
 	return func(o *frankenPHPContext) error {
 		o.moduleID = moduleID
 

worker.go

@@ -20,7 +20,7 @@ type worker struct {
 	requestChan chan *frankenPHPContext
 	threads     []*phpThread
 	threadMutex sync.RWMutex
-	moduleID    string
+	moduleID    uintptr
 }
 
 var (