Merge pull request #33 from lyrixx/fix

My 2 cents

Author: kitech

.gitignore

@@ -0,0 +1,2 @@
+/app**
+/examples.so

Makefile

@@ -1,15 +1,19 @@
-
 # Usage:
-# PHPCFG=/usr/bin/php-config55 make
-# PHPCFG=php-config55 make
-# PHPCFG=/usr/bin/php-config make
-# PHPCFG=php-config make
-# make
+#	Default config:
+#		make
+#	Use a specific php-config:
+#		PHPCFG=/usr/bin/php-config72 make
+#	Disable zend log (<error):
+#		CGO_CFLAGS="-DLOGLEVEL=error" make
 
 ifeq ($(PHPCFG),)
 	PHPCFG=/usr/bin/php-config
 endif
 
+ifeq ($(APP),)
+	APP=examples
+endif
+
 PHPEXE := $(shell $(PHPCFG) --php-binary)
 PHPDIR := $(shell $(PHPCFG) --prefix)
 
@@ -26,8 +30,8 @@ GOARCH := $(shell go env GOARCH)
 all:
 	go install ./zend
 	go install ./phpgo
-	go build -v -buildmode=c-shared -o hello.so examples/hello.go
-	# $(PHPEXE) -d extension=./hello.so examples/hello.php
+	go build -buildmode=c-shared -o $(APP).so $(APP)/main.go
+	# $(PHPEXE) -d extension=./$(APP).so $(APP)/main.php
 
 zdlib:
 	go install -v -x ./zend
@@ -43,6 +47,6 @@ quickbc:
 	go build -v -x -buildmode=c-archive -o php-grpc.c.a examples/hello.go
 
 clean:
-	rm -f $(GOPATH)/pkg/$(GOOS)_$(GOARCH)/zend.a
-	rm -f $(GOPATH)/pkg/$(GOOS)_$(GOARCH)/phpgo.a
+	rm -f $(GOPATH)/pkg/$(GOOS)_$(GOARCH)/github.com/kitech/php-go/zend.a
+	rm -f $(GOPATH)/pkg/$(GOOS)_$(GOARCH)/github.com/kitech/php-go/phpgo.a
 	rm -f hello.so

examples/hello.go renamed to examples/main.go

@@ -6,13 +6,6 @@ package phpgo
 import "C"
 import "unsafe"
 
-// import "runtime"
-
-// import "os"
-import "fmt"
-
-//
-// 给php加载扩展时调用的扩展入口函数。
 //export get_module
 func get_module() unsafe.Pointer {
 	if len(ExtName) == 0 {
@@ -22,7 +15,6 @@ func get_module() unsafe.Pointer {
 	addBuiltins()
 
 	mod := C.phpgo_get_module(C.CString(ExtName), C.CString(ExtVer))
-	fmt.Printf("mod=%p\n", mod)
 
 	return unsafe.Pointer(mod)
 }

examples/hello.php renamed to examples/main.php

@@ -52,7 +52,7 @@ void phpgo_function_map_add(const char *class_name, const char *func_name, zend_
     int id = UTHASH_CNT(hh, g_funcs_map);
     phpgo_function_map *m = (phpgo_function_map*)malloc(sizeof(phpgo_function_map));
     char *key = (char*)calloc(1, class_name == NULL ? 0 : strlen(class_name) + strlen(func_name) + 2 + 1);
-    sprintf(key, "%s::%s\0", class_name == NULL ? "" : class_name, func_name);
+    sprintf(key, "%s::%s%c", class_name == NULL ? "" : class_name, func_name, '\0');
     m->name = key;
     m->fe = fe;
     m->id = id;
@@ -63,7 +63,7 @@ zend_function_entry* phpgo_function_map_get(const char *class_name, const char *
 {
     phpgo_function_map *m = NULL;
     char key[(class_name == NULL ? 0 : strlen(class_name)) + strlen(func_name) + 2 + 1];
-    sprintf(key, "%s::%s\0", (class_name == NULL ? "" : class_name), func_name);
+    sprintf(key, "%s::%s%c", (class_name == NULL ? "" : class_name), func_name, '\0');
     UTHASH_FIND_STR(g_funcs_map, key, m);
     if (m == NULL) {
         return NULL;
@@ -97,7 +97,7 @@ void phpgo_callback_map_add(const char *class_name, const char *func_name, int c
     int id = UTHASH_CNT(hh, g_callbacks_map);
     phpgo_callback_map *m = (phpgo_callback_map*)malloc(sizeof(phpgo_callback_map));
     char *key = (char*)calloc(1, class_name == NULL ? 0 : strlen(class_name) + strlen(func_name) + 2 + 1);
-    sprintf(key, "%s::%s\0", class_name == NULL ? "" : class_name, func_name);
+    sprintf(key, "%s::%s%c", class_name == NULL ? "" : class_name, func_name, '\0');
     m->name = key;
     m->cbid = cbid;
     UTHASH_ADD_KEYPTR(hh, g_callbacks_map, key, strlen(key), m);
@@ -107,7 +107,7 @@ int phpgo_callback_map_get(const char *class_name, const char *func_name)
 {
     phpgo_callback_map *m = NULL;
     char key[(class_name == NULL ? 0 : strlen(class_name)) + strlen(func_name) + 2 + 1];
-    sprintf(key, "%s::%s\0", (class_name == NULL ? "" : class_name), func_name);
+    sprintf(key, "%s::%s%c", (class_name == NULL ? "" : class_name), func_name, '\0');
     UTHASH_FIND_STR(g_callbacks_map, key, m);
     if (m == NULL) {
         return -1;

phpgo/init.go

@@ -1,5 +1,3 @@
-
-
 [![GoDoc](https://godoc.org/github.com/kitech/php-go/phpgo?status.svg)](https://godoc.org/github.com/kitech/php-go/phpgo)
 [![GoDoc](https://godoc.org/github.com/kitech/php-go/zend?status.svg)](https://godoc.org/github.com/kitech/php-go/zend)
 
@@ -9,7 +7,6 @@ Write PHP extension using go/golang. Zend API wrapper for go/golang.
 
 Simple, easy, fun to write PHP extensions.
 
-
 ### Features
 
 * function support
@@ -19,7 +16,6 @@ Simple, easy, fun to write PHP extensions.
 * complex data type as parameters, map/slice/array
 * all can be done by programmatic
 
-
 ### Environment
 
 * Modern Linux/Unix system
@@ -39,7 +35,6 @@ cd $GOPATH/src/github.com/kitech/php-go
 PHPCFG=`which php-config` make
 ```
 
-
 manual:
 
     mkdir -p $GOPATH/src/github.com/kitech
@@ -76,7 +71,7 @@ func init() {
 // should not run this function
 // required for go build though.
 func main() { panic("wtf") }
-```    
+```
 
 ### TODO
 
@@ -97,4 +92,3 @@ Contributing
 3. Commit your changes (``git commit -am 'Add some feature'``)
 4. Push to the branch (``git push origin my-new-feature``)
 5. Create new Pull Request
-

phpgo/objectmap.c

@@ -7,46 +7,32 @@ package zend
 import "C"
 
 // import "unsafe"
-import "runtime"
-
-import "time"
-import "math/rand"
-
-// import "os"
-import "fmt"
-import "log"
+import (
+	"io/ioutil"
+	"log"
+	"math/rand"
+	"runtime"
+	"time"
+)
 
 const (
 	SINGLE_THREAD = 1
 )
 
-//
 func init() {
-	initSingleThread()
-	initCLog()
 	initRawLog()
-}
-
-func initSingleThread() {
-	if C.gozend_iszts() == 0 {
-		omp := runtime.GOMAXPROCS(0)
-		if omp > SINGLE_THREAD {
-			runtime.GOMAXPROCS(SINGLE_THREAD)
-			fmt.Printf("Adjust GOMAXPROCS %d => %d\n", omp, SINGLE_THREAD)
-		}
-	}
-
-	rand.Seed(time.Now().UnixNano())
+	initCLog()
+	initSingleThread()
 }
 
 func initRawLog() {
-	prefix := "phpgo"
-	// log.SetFlags(log.Llongfile | log.LstdFlags)
-	log.SetFlags(log.Lshortfile | log.LstdFlags)
-	oldPrefix := log.Prefix()
-	log.SetPrefix(fmt.Sprintf("[%s ] ", prefix))
-	if len(oldPrefix) > 0 {
-		log.Printf("Switch log prefix: %s => [%s ]\n", oldPrefix, prefix)
+	// To enable use true:
+	if false {
+		log.SetFlags(log.Lshortfile | log.LstdFlags)
+		log.SetPrefix("[phpgo] ")
+	} else {
+		log.SetFlags(0)
+		log.SetOutput(ioutil.Discard)
 	}
 }
 
@@ -57,6 +43,18 @@ func initCLog() {
 	C.dlog_set_level(C.STDERR_FILENO, 0)
 }
 
+func initSingleThread() {
+	if C.gozend_iszts() == 0 {
+		omp := runtime.GOMAXPROCS(0)
+		if omp > SINGLE_THREAD {
+			runtime.GOMAXPROCS(SINGLE_THREAD)
+			log.Printf("Adjust GOMAXPROCS %d => %d\n", omp, SINGLE_THREAD)
+		}
+	}
+
+	rand.Seed(time.Now().UnixNano())
+}
+
 const (
 	LOG_NONE  = int(-1)
 	LOG_ERROR = int(C.CLOG_ERROR)

readme.md

@@ -120,13 +120,13 @@ func (this *IniEntryDef) Fill3(name string, defaultValue interface{}, modifiable
 	}
 
 	if ZEND_ENGINE == ZEND_ENGINE_3 {
-		this.zie.name_length = C.uint(len(name))
-		this.zie.value_length = C.uint(len(value))
+		this.zie.name_length = C.uint32_t(len(name))
+		this.zie.value_length = C.uint32_t(len(value))
 	} else {
 		// why need +1 for php5?
 		// if not, zend_alter_ini_entry_ex:280行会出现zend_hash_find无结果失败
-		this.zie.name_length = C.uint(len(name) + 1)
-		this.zie.value_length = C.uint(len(value) + 1)
+		this.zie.name_length = C.uint32_t(len(name) + 1)
+		this.zie.value_length = C.uint32_t(len(value) + 1)
 	}
 	log.Println(name, len(name))