change structure

Author: zeriyoshi

ext/random/php_random.h

@@ -96,79 +96,80 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max);
 PHPAPI int php_random_bytes(void *bytes, size_t size, bool should_throw);
 PHPAPI int php_random_int(zend_long min, zend_long max, zend_long *result, bool should_throw);
 
-typedef struct _php_random_numbergenerator_algo {
-	const size_t generate_size;
+typedef struct _php_random_engine_algo {
 	const size_t state_size;
+	size_t (*size)(void *state);
 	uint64_t (*generate)(void *state);
 	void (*seed)(void *state, const uint64_t seed);		/* nullable */
 	int (*serialize)(void *state, HashTable *data);		/* nullable */
 	int (*unserialize)(void *state, HashTable *data);	/* nullable */
-} php_random_numbergenerator_algo;
+} php_random_engine_algo;
 
-PHPAPI const php_random_numbergenerator_algo *php_random_numbergenerator_get_default_algo(void);
-PHPAPI void *php_random_numbergenerater_get_default_state(void);
+PHPAPI const php_random_engine_algo *php_random_engine_get_default_algo(void);
+PHPAPI void *php_random_engine_get_default_state(void);
 
-PHPAPI zend_long php_random_numbergenerator_range(const php_random_numbergenerator_algo *algo, void *state, zend_long min, zend_long max);
+PHPAPI zend_long php_random_engine_range(const php_random_engine_algo *algo, void *state, zend_long min, zend_long max);
 
 extern zend_module_entry random_module_entry;
 # define phpext_random_ptr &random_module_entry
 
-extern PHPAPI zend_class_entry *random_ce_Random_NumberGenerator;
-extern PHPAPI zend_class_entry *random_ce_Random_NumberGenerator_XorShift128Plus;
-extern PHPAPI zend_class_entry *random_ce_Random_NumberGenerator_MersenneTwister;
-extern PHPAPI zend_class_entry *random_ce_Random_NumberGenerator_CombinedLCG;
-extern PHPAPI zend_class_entry *random_ce_Random_NumberGenerator_Secure;
+extern PHPAPI zend_class_entry *random_ce_Random_Engine;
+extern PHPAPI zend_class_entry *random_ce_Random_Engine_XorShift128Plus;
+extern PHPAPI zend_class_entry *random_ce_Random_Engine_MersenneTwister;
+extern PHPAPI zend_class_entry *random_ce_Random_Engine_CombinedLCG;
+extern PHPAPI zend_class_entry *random_ce_Random_Engine_Secure;
 extern PHPAPI zend_class_entry *random_ce_Random_Randomizer;
 
-extern const php_random_numbergenerator_algo php_random_numbergenerator_algo_xorshift128plus;
-extern const php_random_numbergenerator_algo php_random_numbergenerator_algo_mersennetwister;
-extern const php_random_numbergenerator_algo php_random_numbergenerator_algo_combinedlcg;
-extern const php_random_numbergenerator_algo php_random_numbergenerator_algo_secure;
-extern const php_random_numbergenerator_algo php_random_numbergenerator_algo_user;
+extern const php_random_engine_algo php_random_engine_algo_xorshift128plus;
+extern const php_random_engine_algo php_random_engine_algo_mersennetwister;
+extern const php_random_engine_algo php_random_engine_algo_combinedlcg;
+extern const php_random_engine_algo php_random_engine_algo_secure;
+extern const php_random_engine_algo php_random_engine_algo_user;
 
-typedef struct _php_random_numbergenerator {
-	const php_random_numbergenerator_algo *algo;
+typedef struct _php_random_engine {
+	const php_random_engine_algo *algo;
 	void *state;
 	zend_object std;
-} php_random_numbergenerator;
+} php_random_engine;
 
 typedef struct _php_random_randomizer {
-	const php_random_numbergenerator_algo *algo;
+	const php_random_engine_algo *algo;
 	void *state;
 	bool self_allocate;
 	zend_object std;
 } php_random_randomizer;
 
-typedef struct _php_random_numbergenerator_state_xorshift128plus {
+typedef struct _php_random_engine_state_xorshift128plus {
 	uint64_t s[2];
-} php_random_numbergenerator_state_xorshift128plus;
+} php_random_engine_state_xorshift128plus;
 
-typedef struct _php_random_numbergenerator_state_mersennetwister {
+typedef struct _php_random_engine_state_mersennetwister {
 	uint32_t s[MT_N];
 	int cnt;
 	zend_long mode;
 	bool seeded;
-} php_random_numbergenerator_state_mersennetwister;
+} php_random_engine_state_mersennetwister;
 
-typedef struct _php_random_numbergenerator_state_combinedlcg {
+typedef struct _php_random_engine_state_combinedlcg {
 	int32_t s[2];
 	bool seeded;
-} php_random_numbergenerator_state_combinedlcg;
+} php_random_engine_state_combinedlcg;
 
-typedef struct _php_random_numbergenerator_state_user {
+typedef struct _php_random_engine_state_user {
 	zend_object *object;
-	zend_function *method;
-} php_random_numbergenerator_state_user;
+	zend_function *size_method;
+	zend_function *generate_method;
+} php_random_engine_state_user;
 
-static inline php_random_numbergenerator *php_random_numbergenerator_from_obj(zend_object *obj) {
-	return (php_random_numbergenerator *)((char *)(obj) - XtOffsetOf(php_random_numbergenerator, std));
+static inline php_random_engine *php_random_engine_from_obj(zend_object *obj) {
+	return (php_random_engine *)((char *)(obj) - XtOffsetOf(php_random_engine, std));
 }
 
 static inline php_random_randomizer *php_random_randomizer_from_obj(zend_object *obj) {
 	return (php_random_randomizer *)((char *)(obj) - XtOffsetOf(php_random_randomizer, std));
 }
 
-# define Z_RANDOM_NUMBERGENERATOR_P(zval) php_random_numbergenerator_from_obj(Z_OBJ_P(zval))
+# define Z_RANDOM_ENGINE_P(zval) php_random_engine_from_obj(Z_OBJ_P(zval))
 
 # define Z_RANDOM_RANDOMIZER_P(zval) php_random_randomizer_from_obj(Z_OBJ_P(zval))
 
@@ -177,8 +178,8 @@ PHP_MSHUTDOWN_FUNCTION(random);
 PHP_RINIT_FUNCTION(random);
 
 ZEND_BEGIN_MODULE_GLOBALS(random)
-	php_random_numbergenerator_state_combinedlcg clcg;		/* Combined LCG global state */
-	php_random_numbergenerator_state_mersennetwister mt;	/* MT global state */
+	php_random_engine_state_combinedlcg clcg;		/* Combined LCG global state */
+	php_random_engine_state_mersennetwister mt;	/* MT global state */
 	int random_fd;											/* random file discriptor */
 ZEND_END_MODULE_GLOBALS(random)