Adding support to the 64bit version of xxhash

README.md

@@ -1,25 +1,51 @@
 # php-xxhash
 
-PHP extension to add support for the [xxhash](http://code.google.com/p/xxhash/) fast hashing algorithm.  _xxhash_ is designed to be fast enough to use in real-time streaming applications.
+PHP extension to add support for the [xxhash - r42](https://github.com/Cyan4973/xxHash) extremely fast hashing algorithm.  _xxhash_ is designed to be fast enough to use in real-time streaming applications.
+
 
 ## How To Install
 
+Run
 ```
    phpize
    ./configure --enable-xxhash
    make
    sudo make install
+```  
+
+Add to the php.ini
+```  
+    extension=xxhash.so
 ```
 
+Restart apache
+```
+    sudo service apache2 restart  
+```
+
+
 ## How To Use
 
-This extension adds one new PHP function:
+This extension adds three new PHP functions:
 
 ```
+    // 32 bit version (all values are positive)
     int xxhash32(string $data);
+
+    // 64 bit version (can return negative values since PHP doesn't support unsigned long values)
+    long xxhash64(string $data);
+
+    // 64 bit version (all values are positive but returned as strings)
+    string xxhash64Unsigned(string $data);
 ```
 
-It will checksum the string, and return the checksum.
+They will checksum the string, and return the checksum.
+
+## Credits
+* Original implementation of [php-xxhash](https://github.com/stuartherbert/php-xxhash) by Stuart Herbert.
+* Original update to PHP 7 of [php-xxhash](https://github.com/eskimi/php-xxhash) by Eskimi.
+* [xxHash](https://github.com/Cyan4973/xxHash) by Yann Collet.
+
 
 ## License
 

config.m4

@@ -21,4 +21,4 @@ if test "$PHP_XXHASH" != "no"; then
   dnl Write more examples of tests here...
 
   PHP_NEW_EXTENSION(xxhash, php_xxhash.c, $ext_shared)
-fi
+fi

config.w32

@@ -1,11 +1,7 @@
 // $Id$
 // vim:ft=javascript
 
-// If your extension references something external, use ARG_WITH
-// ARG_WITH("xxhash", "for xxhash support", "no");
-
-// Otherwise, use ARG_ENABLE
-// ARG_ENABLE("xxhash", "enable xxhash support", "no");
+ARG_ENABLE("xxhash", "enable xxhash support", "no");
 
 if (PHP_XXHASH != "no") {
 	EXTENSION("xxhash", "php_xxhash.c");

php_xxhash.c

@@ -10,73 +10,98 @@
 #include "xxhash.c"
 
 #ifdef COMPILE_DL_XXHASH
-ZEND_GET_MODULE(xxhash)
+	ZEND_GET_MODULE(xxhash);
+	#ifdef ZTS
+		ZEND_TSRMLS_CACHE_DEFINE();
+	#endif
 #endif
 
-PHP_MINIT_FUNCTION(xxhash)
-{
-	return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(xxhash)
-{
-	return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(xxhash)
-{
-	return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(xxhash)
-{
-	return SUCCESS;
-}
-
 PHP_MINFO_FUNCTION(xxhash)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "xxhash support", "enabled");
 	php_info_print_table_row(2, "extension version", PHP_XXHASH_VERSION);
-	php_info_print_table_row(2, "xxhash release", "http://code.google.com/p/xxhash/source/detail?r=6");
+	php_info_print_table_row(2, "xxhash release", "r40");
 	php_info_print_table_end();
 }
 
 PHP_FUNCTION(xxhash32)
 {
-	char *arg1 = NULL;
-	char *ret1 = NULL;
-	int arg1_len;
+    char *arg = NULL;
+    size_t arg_len, len;
+    zend_string *strg;
 	unsigned int sum;
 
-	/* parse the parameters */
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE || arg1_len < 1)
-	{
-		RETURN_NULL();
-	}
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE || arg_len < 1) {
+        return;
+    }
 
-	/* compute the checksum */
-	sum = XXH32(arg1, arg1_len, 0);
+	// compute the checksum
+	sum = XXH32(arg, arg_len, 0);
+
+	/* return the checksum */
+	RETURN_LONG(sum);
+}
+
+PHP_FUNCTION(xxhash64)
+{
+	char *arg = NULL;
+    size_t arg_len, len;
+    zend_string *strg;
+	unsigned long long sum;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE || arg_len < 1) {
+        return;
+    }
+
+	// compute the checksum
+	sum = XXH64(arg, arg_len, 0);
 
 	/* return the checksum */
-	RETURN_LONG((long)sum);
+	/* Negative values can be returned since we cannot return  unsigned long to php */
+	RETURN_LONG(sum);
 }
 
-zend_function_entry xxhash_functions[] = {
-	PHP_FE(xxhash32, NULL)
-	{NULL, NULL, NULL}
+PHP_FUNCTION(xxhash64Unsigned)
+{
+	char *arg = NULL;
+    size_t arg_len, len;
+    zend_string *strg;
+	unsigned long long sum;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE || arg_len < 1) {
+        return;
+    }
+
+	// compute the checksum
+	sum = XXH64(arg, arg_len, 0);
+
+	//Since php doesn't have unsinged long values, the value will be returned as string
+	char numberAsAString[21];
+	sprintf(numberAsAString, "%llu",sum);
+	RETURN_STRING(numberAsAString);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xxhash, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+const zend_function_entry xxhash_functions[] = {
+	ZEND_FE(xxhash32, arginfo_xxhash)
+	ZEND_FE(xxhash64, arginfo_xxhash)
+	ZEND_FE(xxhash64Unsigned, arginfo_xxhash)
+	PHP_FE_END
 };
 
 zend_module_entry xxhash_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"xxhash",
 	xxhash_functions,
-	PHP_MINIT(xxhash),
-	PHP_MSHUTDOWN(xxhash),
+	NULL,
+	NULL,
 	NULL,
 	NULL,
 	PHP_MINFO(xxhash),
 	PHP_XXHASH_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
-

php_xxhash.h

@@ -1,28 +1,31 @@
 #ifndef PHP_XXHASH_H
 #define PHP_XXHASH_H
 
-#define PHP_XXHASH_VERSION "1.0.1"
-
 extern zend_module_entry xxhash_module_entry;
 #define phpext_xxhash_ptr &xxhash_module_entry
 
-#if defined(PHP_WIN32) && defined(XXHASH_EXPORTS)
-#define PHP_XXHASH_API __declspec(dllexport)
+#define PHP_XXHASH_VERSION "2.0"
+
+#ifdef PHP_WIN32
+#   define PHP_XXHASH_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#   define PHP_XXHASH_API __attribute__ ((visibility("default")))
 #else
-#define PHP_XXHASH_API PHPAPI
+#   define PHP_XXHASH_API
 #endif
 
 #ifdef ZTS
 #include "TSRM.h"
 #endif
 
-PHP_MINIT_FUNCTION(xxhash);
-PHP_MSHUTDOWN_FUNCTION(xxhash);
-PHP_RINIT_FUNCTION(xxhash);
-PHP_RSHUTDOWN_FUNCTION(xxhash);
-PHP_MINFO_FUNCTION(xxhash);
 
-PHP_FUNCTION(xxhash32);
-
-#endif /* PHP_XXHASH_H */
+#ifdef ZTS
+#define XXHASH_G(v) ZEND_TSRMG(xxhash_globals_id, zend_xxhash_globals *, v)
+#ifdef COMPILE_DL_XXHASH
+ZEND_TSRMLS_CACHE_EXTERN();
+#endif
+#else
+#define XXHASH_G(v) (xxhash_globals.v)
+#endif
 
+#endif  /* PHP_XXHASH_H */