Add alias to smart_str to be compatible with PHP7

Author: bigbes

src/php_tarantool.h

@@ -9,8 +9,15 @@
 #include <zend_exceptions.h>
 
 #include <ext/standard/info.h>
-#include <ext/standard/php_smart_str.h>
 
+#if PHP_VERSION_ID >= 70000
+#  include <ext/standard/php_smart_string.h>
+#else
+#  include <ext/standard/php_smart_str.h>
+   typedef smart_str smart_string;
+#  define smart_string_alloc4(...) smart_str_alloc4(__VA_ARGS__)
+#  define smart_string_free_ex(...) smart_str_free_ex(__VA_ARGS__)
+#endif
 
 extern zend_module_entry tarantool_module_entry;
 #define phpext_tarantool_ptr &tarantool_module_entry
@@ -33,9 +40,6 @@ extern zend_module_entry tarantool_module_entry;
 #include "TSRM.h"
 #endif
 
-#include <ext/standard/php_smart_str.h>
-#include <php_network.h>
-
 struct pool_manager;
 struct tarantool_schema;
 
@@ -79,17 +83,17 @@ ZEND_EXTERN_MODULE_GLOBALS(tarantool);
 
 typedef struct tarantool_object {
 	zend_object zo;
-	char       *host;
-	int         port;
-	char       *login;
-	char       *passwd;
-	php_stream *stream;
-	char       *persistent_id;
-	smart_str  *value;
-	struct tp  *tps;
-	char        auth;
-	char       *greeting;
-	char       *salt;
+	char         *host;
+	int           port;
+	char         *login;
+	char         *passwd;
+	php_stream   *stream;
+	char         *persistent_id;
+	smart_string *value;
+	struct tp    *tps;
+	char          auth;
+	char         *greeting;
+	char         *salt;
 	struct tarantool_schema *schema;
 } tarantool_object;
 

src/tarantool.c

@@ -21,7 +21,7 @@ now_gettimeofday(void)
 	return t.tv_sec * 1e9 + t.tv_usec * 1e3;
 }
 
-void smart_str_nullify(smart_str *str);
+void smart_string_nullify(smart_string *str);
 
 ZEND_DECLARE_MODULE_GLOBALS(tarantool)
 
@@ -111,7 +111,7 @@ tarantool_stream_send(tarantool_object *obj TSRMLS_DC) {
 				   SSTR_LEN(obj->value));
 	if (rv) return FAILURE;
 	SSTR_LEN(obj->value) = 0;
-	smart_str_nullify(obj->value);
+	smart_string_nullify(obj->value);
 	return SUCCESS;
 }
 
@@ -211,7 +211,7 @@ static void tarantool_free(tarantool_object *obj TSRMLS_DC) {
 	if (obj->host)   pefree(obj->host, 1);
 	if (obj->login)  pefree(obj->login, 1);
 	if (obj->passwd) efree(obj->passwd);
-	if (obj->value)  smart_str_free_ex(obj->value, 1);
+	if (obj->value)  smart_string_free_ex(obj->value, 1);
 	if (obj->tps)    tarantool_tp_free(obj->tps);
 	if (obj->value)  pefree(obj->value, 1);
 	pefree(obj, 1);
@@ -260,7 +260,7 @@ static int64_t tarantool_step_recv(
 		goto error;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
-	smart_str_ensure(obj->value, body_size);
+	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, SSTR_POS(obj->value),
 				  body_size) != body_size) {
 		THROW_EXC("Can't read query from server");
@@ -302,7 +302,7 @@ static int64_t tarantool_step_recv(
 	if (zend_hash_index_find(hash, TNT_CODE, (void **)&val) == SUCCESS) {
 		if (Z_LVAL_PP(val) == TNT_OK) {
 			SSTR_LEN(obj->value) = 0;
-			smart_str_nullify(obj->value);
+			smart_string_nullify(obj->value);
 			return SUCCESS;
 		}
 		HashTable *hash = HASH_OF(*body);
@@ -322,7 +322,7 @@ static int64_t tarantool_step_recv(
 	if (*header) zval_ptr_dtor(header);
 	if (*body) zval_ptr_dtor(body);
 	SSTR_LEN(obj->value) = 0;
-	smart_str_nullify(obj->value);
+	smart_string_nullify(obj->value);
 	return FAILURE;
 }
 
@@ -530,7 +530,7 @@ int get_spaceno_by_name(tarantool_object *obj, zval *id, zval *name TSRMLS_DC) {
 		return FAILURE;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
-	smart_str_ensure(obj->value, body_size);
+	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, obj->value->c,
 				body_size) != body_size) {
 		THROW_EXC("Can't read query from server");
@@ -590,7 +590,7 @@ int get_indexno_by_name(tarantool_object *obj, zval *id,
 		return FAILURE;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
-	smart_str_ensure(obj->value, body_size);
+	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, obj->value->c,
 				body_size) != body_size) {
 		THROW_EXC("Can't read query from server");
@@ -704,7 +704,7 @@ PHP_METHOD(tarantool_class, __construct) {
 	/* initialzie object structure */
 	obj->host = pestrdup(host, 1);
 	obj->port = port;
-	obj->value = (smart_str *)pemalloc(sizeof(smart_str), 1);
+	obj->value = (smart_string *)pemalloc(sizeof(smart_string), 1);
 	obj->auth = 0;
 	obj->greeting = (char *)pecalloc(sizeof(char), GREETING_SIZE, 1);
 	obj->salt = NULL;
@@ -715,7 +715,7 @@ PHP_METHOD(tarantool_class, __construct) {
 	obj->value->len = 0;
 	obj->value->a = 0;
 	obj->value->c = NULL;
-	smart_str_ensure(obj->value, GREETING_SIZE);
+	smart_string_ensure(obj->value, GREETING_SIZE);
 	obj->tps = tarantool_tp_new(obj->value);
 	return;
 }
@@ -763,7 +763,7 @@ int __tarantool_authenticate(tarantool_object *obj) {
 			return FAILURE;
 		}
 		size_t body_size = php_mp_unpack_package_size(pack_len);
-		smart_str_ensure(obj->value, body_size);
+		smart_string_ensure(obj->value, body_size);
 		if (tarantool_stream_read(obj, obj->value->c,
 					body_size) != body_size) {
 			THROW_EXC("Can't read query from server");

src/tarantool_manager.h

@@ -1,12 +1,7 @@
 #ifndef   PHP_MANAGER_H
 #define   PHP_MANAGER_H
 
-#include <php.h>
-#include <php_network.h>
-#include <zend_API.h>
-#include <ext/standard/php_smart_str.h>
-
-#include <sys/queue.h>
+#include <php_tarantool.h>
 
 #include "third_party/PMurHash.h"
 #define MUR_SEED 13

src/tarantool_msgpack.c

@@ -12,82 +12,82 @@
 
 /* UTILITES */
 
-int smart_str_ensure(smart_str *str, size_t len) {
+int smart_string_ensure(smart_string *str, size_t len) {
 	if (SSTR_AWA(str) > SSTR_LEN(str) + len)
 		return 0;
 	size_t needed = str->a * 2;
 	if (SSTR_LEN(str) + len > needed)
 		needed = SSTR_LEN(str) + len;
 	register size_t __n1;
-	smart_str_alloc4(str, needed, 1, __n1);
+	smart_string_alloc4(str, needed, 1, __n1);
 	return 0;
 }
 
-void smart_str_nullify(smart_str *str) {
+void smart_string_nullify(smart_string *str) {
 	memset(SSTR_BEG(str), 0, SSTR_AWA(str));
 }
 
 /* PACKING ROUTINES */
 
-void php_mp_pack_nil(smart_str *str) {
+void php_mp_pack_nil(smart_string *str) {
 	size_t needed = mp_sizeof_nil();
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_nil(SSTR_POS(str));
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_long_pos(smart_str *str, long val) {
+void php_mp_pack_long_pos(smart_string *str, long val) {
 	size_t needed = mp_sizeof_uint(val);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_uint(SSTR_POS(str), val);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_long_neg(smart_str *str, long val) {
+void php_mp_pack_long_neg(smart_string *str, long val) {
 	size_t needed = mp_sizeof_int(val);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_int(SSTR_POS(str), val);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_long(smart_str *str, long val) {
+void php_mp_pack_long(smart_string *str, long val) {
 	if (val >= 0)
 		php_mp_pack_long_pos(str, val);
 	else
 		php_mp_pack_long_neg(str, val);
 }
 
-void php_mp_pack_double(smart_str *str, double val) {
+void php_mp_pack_double(smart_string *str, double val) {
 	size_t needed = mp_sizeof_double(val);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_double(SSTR_POS(str), val);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_bool(smart_str *str, unsigned char val) {
+void php_mp_pack_bool(smart_string *str, unsigned char val) {
 	size_t needed = mp_sizeof_bool(val);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_bool(SSTR_POS(str), val);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_string(smart_str *str, char *c, size_t len) {
+void php_mp_pack_string(smart_string *str, char *c, size_t len) {
 	size_t needed = mp_sizeof_str(len);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_str(SSTR_POS(str), c, len);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_hash(smart_str *str, size_t len) {
+void php_mp_pack_hash(smart_string *str, size_t len) {
 	size_t needed = mp_sizeof_map(len);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_map(SSTR_POS(str), len);
 	SSTR_LEN(str) += needed;
 }
 
-void php_mp_pack_array(smart_str *str, size_t len) {
+void php_mp_pack_array(smart_string *str, size_t len) {
 	size_t needed = mp_sizeof_array(len);
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	mp_encode_array(SSTR_POS(str), len);
 	SSTR_LEN(str) += needed;
 }
@@ -111,7 +111,7 @@ int php_mp_is_hash(zval *val) {
 	return 0;
 }
 
-void php_mp_pack_array_recursively(smart_str *str, zval *val) {
+void php_mp_pack_array_recursively(smart_string *str, zval *val) {
 	HashTable *ht = Z_ARRVAL_P(val);
 	size_t n = zend_hash_num_elements(ht);
 
@@ -136,7 +136,7 @@ void php_mp_pack_array_recursively(smart_str *str, zval *val) {
 	}
 }
 
-void php_mp_pack_hash_recursively(smart_str *str, zval *val) {
+void php_mp_pack_hash_recursively(smart_string *str, zval *val) {
 	HashTable *ht = Z_ARRVAL_P(val);
 	size_t n = zend_hash_num_elements(ht);
 
@@ -182,7 +182,7 @@ void php_mp_pack_hash_recursively(smart_str *str, zval *val) {
 	}
 }
 
-void php_mp_pack(smart_str *str, zval *val) {
+void php_mp_pack(smart_string *str, zval *val) {
 	switch(Z_TYPE_P(val)) {
 	case IS_NULL:
 		php_mp_pack_nil(str);
@@ -558,9 +558,9 @@ size_t php_mp_check(const char *str, size_t str_size) {
 	return mp_check(&str, str + str_size);
 }
 
-void php_mp_pack_package_size(smart_str *str, size_t val) {
+void php_mp_pack_package_size(smart_string *str, size_t val) {
 	size_t needed = 5;
-	smart_str_ensure(str, needed);
+	smart_string_ensure(str, needed);
 	*(SSTR_POS(str)) = 0xce;
 	*(uint32_t *)(SSTR_POS(str) + 1) = mp_bswap_u32(val);
 	SSTR_LEN(str) += needed;

src/tarantool_msgpack.h

@@ -3,7 +3,7 @@
 
 #define PHP_TARANTOOL_DEBUG
 
-#include <ext/standard/php_smart_str.h>
+#include <php_tarantool.h>
 
 #define PHP_MP_SERIALIZABLE_PP(v) (Z_TYPE_PP(v) == IS_NULL  || \
 				  Z_TYPE_PP(v) == IS_LONG   || \
@@ -12,27 +12,27 @@
 				  Z_TYPE_PP(v) == IS_ARRAY  || \
 				  Z_TYPE_PP(v) == IS_STRING)
 
-size_t php_mp_check   (const char *str,  size_t str_size);
-void   php_mp_pack    (smart_str  *buf,  zval   *val    );
-ssize_t php_mp_unpack (zval      **oval, char   **str   );
+size_t php_mp_check   (const char   *str,  size_t str_size);
+void   php_mp_pack    (smart_string *buf,  zval   *val    );
+ssize_t php_mp_unpack (zval        **oval, char   **str   );
 size_t php_mp_sizeof  (zval *val);
 
-void   php_mp_pack_package_size   (smart_str *str, size_t val);
+void   php_mp_pack_package_size   (smart_string *str, size_t val);
 size_t php_mp_unpack_package_size (char *buf);
 
 int php_mp_is_hash(zval *val);
 
-void php_mp_pack_nil(smart_str *str);
-void php_mp_pack_long_pos(smart_str *str, long val);
-void php_mp_pack_long_neg(smart_str *str, long val);
-void php_mp_pack_long(smart_str *str, long val);
-void php_mp_pack_double(smart_str *str, double val);
-void php_mp_pack_bool(smart_str *str, unsigned char val);
-void php_mp_pack_string(smart_str *str, char *c, size_t len);
-void php_mp_pack_hash(smart_str *str, size_t len);
-void php_mp_pack_array(smart_str *str, size_t len);
-void php_mp_pack_array_recursively(smart_str *str, zval *val);
-void php_mp_pack_hash_recursively(smart_str *str, zval *val);
+void php_mp_pack_nil(smart_string *str);
+void php_mp_pack_long_pos(smart_string *str, long val);
+void php_mp_pack_long_neg(smart_string *str, long val);
+void php_mp_pack_long(smart_string *str, long val);
+void php_mp_pack_double(smart_string *str, double val);
+void php_mp_pack_bool(smart_string *str, unsigned char val);
+void php_mp_pack_string(smart_string *str, char *c, size_t len);
+void php_mp_pack_hash(smart_string *str, size_t len);
+void php_mp_pack_array(smart_string *str, size_t len);
+void php_mp_pack_array_recursively(smart_string *str, zval *val);
+void php_mp_pack_hash_recursively(smart_string *str, zval *val);
 
 size_t php_mp_sizeof_nil();
 size_t php_mp_sizeof_long_pos(long val);
@@ -46,6 +46,6 @@ size_t php_mp_sizeof_array(size_t len);
 size_t php_mp_sizeof_array_recursively(zval *val);
 size_t php_mp_sizeof_hash_recursively(zval *val);
 
-int smart_str_ensure(smart_str *str, size_t len);
+int smart_string_ensure(smart_string *str, size_t len);
 
 #endif /* PHP_MSGPACK_H */