keep go array, only convert to c array in init function

Author: henderkes

caddy/caddy.go

@@ -30,9 +30,9 @@ func init() {
 	// Report Caddy version in phpinfo()
 	simpleVersion, fullVersion := caddy.Version()
 	if fullVersion != "" {
-		frankenphp.AddPhpinfoEntry("Caddy Version", fullVersion)
+		frankenphp.AddPhpinfoEntry("caddy", fullVersion)
 	} else if simpleVersion != "" {
-		frankenphp.AddPhpinfoEntry("Caddy Version", simpleVersion)
+		frankenphp.AddPhpinfoEntry("caddy", simpleVersion)
 	}
 
 	httpcaddyfile.RegisterGlobalOption("frankenphp", parseGlobalOption)

frankenphp.c

@@ -1106,7 +1106,7 @@ PHP_MINIT_FUNCTION(frankenphp) {
 
 PHP_MINFO_FUNCTION(frankenphp) {
   php_info_print_table_start();
-  php_info_print_table_row(2, "Version", TOSTRING(FRANKENPHP_VERSION));
+  php_info_print_table_row(2, "frankenphp", TOSTRING(FRANKENPHP_VERSION));
   if (frankenphp_phpinfo_entries) {
     for (int i = 0; frankenphp_phpinfo_entries[i] != NULL; i += 2) {
       php_info_print_table_row(2, frankenphp_phpinfo_entries[i], frankenphp_phpinfo_entries[i + 1]);

frankenphp.go

@@ -30,6 +30,7 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"sort"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -156,20 +157,47 @@ func Config() PHPConfig {
 	}
 }
 
-var phpinfoEntries []*C.char
+type phpinfoEntry struct {
+	key, value string
+}
+
+var (
+	phpinfoEntries []phpinfoEntry
+	cPhpinfoArr    []*C.char
+)
 
 func AddPhpinfoEntry(key, value string) {
-	cKey := C.CString(key)
-	cValue := C.CString(value)
-	phpinfoEntries = append(phpinfoEntries, cKey, cValue)
+	phpinfoEntries = append(phpinfoEntries, phpinfoEntry{key, value})
 }
 
 func initPhpinfoEntries() {
+	for _, cstr := range cPhpinfoArr {
+		if cstr != nil {
+			C.free(unsafe.Pointer(cstr))
+		}
+	}
+	if cPhpinfoArr != nil {
+		C.free(unsafe.Pointer(&cPhpinfoArr[0]))
+		cPhpinfoArr = nil
+		C.frankenphp_phpinfo_entries = nil
+	}
+
 	if len(phpinfoEntries) == 0 {
 		return
 	}
-	phpinfoEntries = append(phpinfoEntries, nil)
-	C.frankenphp_phpinfo_entries = (**C.char)(unsafe.Pointer(&phpinfoEntries[0]))
+
+	sort.Slice(phpinfoEntries, func(i, j int) bool {
+		return phpinfoEntries[i].key < phpinfoEntries[j].key
+	})
+
+	n := 2*len(phpinfoEntries) + 1
+	cPhpinfoArr = (*[1 << 28]*C.char)(C.malloc(C.size_t(n) * C.size_t(unsafe.Sizeof(uintptr(0)))))[:n:n]
+	for i, e := range phpinfoEntries {
+		cPhpinfoArr[2*i] = C.CString(e.key)
+		cPhpinfoArr[2*i+1] = C.CString(e.value)
+	}
+	cPhpinfoArr[n-1] = nil
+	C.frankenphp_phpinfo_entries = &cPhpinfoArr[0]
 }
 
 func calculateMaxThreads(opt *opt) (numWorkers int, _ error) {