Merge remote-tracking branch 'origin/mysql' into mysql

README.md

-# SkyAPM PHP sdk
+SkyAPM PHP
+==========
 
-SkyAPM PHP sdk is the PHP instrumentation agent, which is compatible with [Apache SkyWalking(Incubating) APM](https://github.com/apache/incubator-skywalking) backend and others compatible agents/SDKs
+<img src="https://skyapmtest.github.io/page-resources/SkyAPM/skyapm.png" alt="Sky Walking logo" height="90px" align="right" />
+
+**SkyAPM PHP** is the PHP instrumentation agent, which is compatible with [Apache SkyWalking](https://github.com/apache/skywalking) backend and others compatible agents/SDKs
 
 ## Documents
-* [Document in English](docs/README.md)
+* [Documents in English](docs/README.md)
+
+## Live Demo
+Host in Beijing. Go to [demo](http://106.75.237.45:8080/).
+- Username: admin
+- Password: admin
+
+**Video on youtube.com**
+
+[![RocketBot UI](http://img.youtube.com/vi/JC-Anlshqx8/0.jpg)](http://www.youtube.com/watch?v=JC-Anlshqx8)
 
 ## Support List
 1. CURL
+1. PDO
 
-# Contact Us
-* Submit an issue
-* [Gitter](https://gitter.im/openskywalking/Lobby)
-* QQ Group: 392443393
+## Contact Us
+* Submit an [issue](https://github.com/SkyAPM/SkyAPM-php-sdk/issues)
+* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
+* Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk)
+* QQ Group: 392443393(2000/2000, not available), 901167865(available)
 
-# Who Uses SkyAPM-PHP ?
+## Who Uses SkyAPM-PHP ?
 
 A wide variety of companies and organizations use SkyAPM-PHP for research, production and commercial product. Here is the **User Wall** of SkyAPM-PHP.
 
 ![Who Uses SkyAPM-PHP](./who-uses.jpg)
+
+## License
+[Apache 2.0](LICENSE)

skywalking.c

@@ -61,11 +61,11 @@ ZEND_DECLARE_MODULE_GLOBALS(skywalking)
 
 /* True global resources - no need for thread safety here */
 static int le_skywalking;
-static int application_instance = -100000;
-static int application_id = -100000;
+static int application_instance = 0;
+static int application_id = 0;
 static int sky_close = 0;
 static int sky_increment_id = 0;
-static int cli_debug = 1;
+static int cli_debug = 0;
 const char *sock_path = "/tmp/sky_agent.sock";
 
 /* {{{ PHP_INI
@@ -107,6 +107,11 @@ const zend_function_entry class_skywalking[] = {
 
 void sky_curl_exec_handler(INTERNAL_FUNCTION_PARAMETERS)
 {
+    if(sky_close == 1) {
+        orig_curl_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+        return;
+    }
+
 	zval		*zid;
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zid) == FAILURE) {
 		return;
@@ -326,6 +331,11 @@ void sky_curl_exec_handler(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 void sky_curl_setopt_handler(INTERNAL_FUNCTION_PARAMETERS) {
+    if(sky_close == 1) {
+        orig_curl_setopt(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+        return;
+    }
+
     zval *zid, *zvalue;
     zend_long options;
 
@@ -350,6 +360,12 @@ void sky_curl_setopt_handler(INTERNAL_FUNCTION_PARAMETERS) {
 }
 
 void sky_curl_setopt_array_handler(INTERNAL_FUNCTION_PARAMETERS) {
+
+    if(sky_close == 1) {
+        orig_curl_setopt_array(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+        return;
+    }
+
     zval *zid, *arr, *entry;
     zend_ulong option;
     zend_string *string_key;
@@ -371,6 +387,12 @@ void sky_curl_setopt_array_handler(INTERNAL_FUNCTION_PARAMETERS) {
 }
 
 void sky_curl_close_handler(INTERNAL_FUNCTION_PARAMETERS) {
+
+    if(sky_close == 1) {
+        orig_curl_close(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+        return;
+    }
+
     zval *zid;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zid) == FAILURE) {
@@ -419,7 +441,7 @@ static char *sky_json_encode(zval *parameter){
 
 
 static void write_log(char *text) {
-    if (application_instance != -100000) {
+    if (application_instance != 0) {
         // to file
 //        char *log_path;
 //        char logFilename[100];
@@ -895,7 +917,7 @@ static zval *get_spans() {
 
 
 static int sky_register() {
-    if (application_id == -100000 || application_instance == -100000) {
+    if (application_instance == 0) {
         struct sockaddr_un un;
         un.sun_family = AF_UNIX;
         strcpy(un.sun_path, sock_path);
@@ -908,27 +930,30 @@ static int sky_register() {
             struct timeval tv;
             tv.tv_sec = 0;
             tv.tv_usec = 100000;
-            setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
+            setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char *) &tv, sizeof tv);
             int conn = connect(fd, (struct sockaddr *) &un, sizeof(un));
 
             if (conn >= 0) {
                 bzero(message, sizeof(message));
-                sprintf(message, "0{\"app_code\":\"%s\",\"pid\":%d}\n", SKYWALKING_G(app_code), getppid());
+                sprintf(message, "0{\"app_code\":\"%s\",\"pid\":%d,\"version\":%d}\n", SKYWALKING_G(app_code),
+                        getppid(), SKYWALKING_G(version));
                 write(fd, message, strlen(message));
 
                 bzero(return_message, sizeof(return_message));
                 read(fd, return_message, sizeof(return_message));
 
-                char *ids[10];
+                char *ids[10] = {0};
                 int i = 0;
                 char *p = strtok(return_message, ",");
                 while (p != NULL) {
                     ids[i++] = p;
-                    p = strtok(NULL, "/");
+                    p = strtok(NULL, ",");
                 }
 
-                application_id = atoi(ids[0]);
-                application_instance = atoi(ids[1]);
+                if (ids[0] != NULL && ids[1] != NULL) {
+                    application_id = atoi(ids[0]);
+                    application_instance = atoi(ids[1]);
+                }
             }
 
             close(fd);
@@ -993,24 +1018,24 @@ PHP_RINIT_FUNCTION(skywalking)
 #if defined(COMPILE_DL_SKYWALKING) && defined(ZTS)
 	ZEND_TSRMLS_CACHE_UPDATE();
 #endif
-	if (SKYWALKING_G(enable)) {
+    if (SKYWALKING_G(enable)) {
         if (strcasecmp("cli", sapi_module.name) == 0 && cli_debug == 0) {
             return SUCCESS;
         }
-	    sky_register();
-        if (application_id == -100000 || application_instance == -100000) {
+        sky_register();
+        if (application_instance == 0) {
             sky_close = 1;
             return SUCCESS;
         } else {
             sky_close = 0;
         }
-		sky_increment_id++;
-		if (sky_increment_id >= 9999) {
-			sky_increment_id = 0;
-		}
+        sky_increment_id++;
+        if (sky_increment_id >= 9999) {
+            sky_increment_id = 0;
+        }
         request_init();
-	}
-	return SUCCESS;
+    }
+    return SUCCESS;
 }
 /* }}} */