refactor: simplify exponential backoff and refactor env (#1185)

Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
This commit is contained in:
Rob Landers
2024-11-23 11:29:56 +01:00
committed by GitHub
parent 449a0e7191
commit 1e279bc348
5 changed files with 178 additions and 130 deletions

View File

@@ -505,88 +505,6 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
return nil
}
//export go_putenv
func go_putenv(str *C.char, length C.int) C.bool {
// Create a byte slice from C string with a specified length
s := C.GoBytes(unsafe.Pointer(str), length)
// Convert byte slice to string
envString := string(s)
// Check if '=' is present in the string
if key, val, found := strings.Cut(envString, "="); found {
if os.Setenv(key, val) != nil {
return false // Failure
}
} else {
// No '=', unset the environment variable
if os.Unsetenv(envString) != nil {
return false // Failure
}
}
return true // Success
}
//export go_getfullenv
func go_getfullenv(threadIndex C.uintptr_t) (*C.go_string, C.size_t) {
thread := phpThreads[threadIndex]
env := os.Environ()
goStrings := make([]C.go_string, len(env)*2)
for i, envVar := range env {
key, val, _ := strings.Cut(envVar, "=")
k := unsafe.StringData(key)
v := unsafe.StringData(val)
thread.Pin(k)
thread.Pin(v)
goStrings[i*2] = C.go_string{C.size_t(len(key)), (*C.char)(unsafe.Pointer(k))}
goStrings[i*2+1] = C.go_string{C.size_t(len(val)), (*C.char)(unsafe.Pointer(v))}
}
value := unsafe.SliceData(goStrings)
thread.Pin(value)
return value, C.size_t(len(env))
}
//export go_getenv
func go_getenv(threadIndex C.uintptr_t, name *C.go_string) (C.bool, *C.go_string) {
thread := phpThreads[threadIndex]
// Create a byte slice from C string with a specified length
envName := C.GoStringN(name.data, C.int(name.len))
// Get the environment variable value
envValue, exists := os.LookupEnv(envName)
if !exists {
// Environment variable does not exist
return false, nil // Return 0 to indicate failure
}
// Convert Go string to C string
val := unsafe.StringData(envValue)
thread.Pin(val)
value := &C.go_string{C.size_t(len(envValue)), (*C.char)(unsafe.Pointer(val))}
thread.Pin(value)
return true, value // Return 1 to indicate success
}
//export go_sapi_getenv
func go_sapi_getenv(threadIndex C.uintptr_t, name *C.go_string) *C.char {
envName := C.GoStringN(name.data, C.int(name.len))
envValue, exists := os.LookupEnv(envName)
if !exists {
return nil
}
return phpThreads[threadIndex].pinCString(envValue)
}
//export go_handle_request
func go_handle_request(threadIndex C.uintptr_t) bool {
select {